Ignore:
Timestamp:
02/21/04 01:50:58 (21 years ago)
Author:
gaug
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mjobs
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

    r3205 r3253  
    4747
    4848#include "MPedestalCam.h"
    49 #include "MCalibrationCam.h"
     49#include "MCalibrationChargeCam.h"
     50#include "MCalibrationChargePINDiode.h"
    5051
    5152#include "MReadMarsFile.h"
     
    5657#include "MExtractBlindPixel.h"
    5758#include "MExtractSignal2.h"
    58 #include "MCalibrationCalc.h"
     59#include "MCalibrationChargeCalc.h"
    5960#include "MFCosmics.h"
    6061#include "MContinue.h"
     
    476477    static_cast<MRead&>(read).AddFiles(*fRuns);
    477478
     479    MCalibrationChargePINDiode pindiode;
     480    pindiode.SetColor(MCalibrationChargePINDiode::kECT1);
     481
     482    //
     483    // As long, as we don't have digital modules,
     484    // we have to set the color of the pulser LED by hand
     485    //
     486    fCalibrationCam.SetColor(MCalibrationChargeCam::kECT1);
     487
    478488    // Setup Tasklist
    479489    MParList plist;
    480490    plist.AddToList(&pedcam);
    481491    plist.AddToList(&fCalibrationCam);
     492    plist.AddToList(&pindiode);
    482493
    483494    MTaskList tlist;
    484495    plist.AddToList(&tlist);
    485496
    486     MGeomApply       apply;
    487     MBadPixelsMerge  merge(&fBadPixels);
     497    MGeomApply              apply;
     498    MBadPixelsMerge         merge(&fBadPixels);
    488499    // MExtractSignal   extract; // Do not use this at the moment...
    489     MExtractPINDiode   pinext;
    490     MExtractBlindPixel blindext;
    491     MExtractSignal2    extract;
    492     MCalibrationCalc   calcalc;
     500    MExtractPINDiode         pinext;
     501    MExtractBlindPixel       blindext;
     502    MExtractSignal2          extract;
     503    MCalibrationChargeCalc   calcalc;
    493504
    494505    MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
     
    501512    MContinue cont(&cosmics);
    502513
    503     //
    504     // As long, as we don't have digital modules,
    505     // we have to set the color of the pulser LED by hand
    506     //
    507     calcalc.SetPulserColor(MCalibrationCalc::kECT1);
    508514    //calcalc.SkipBlindPixelFit();
    509515
     
    515521    tlist.AddToList(&blindext);
    516522    tlist.AddToList(&cont);
     523    tlist.AddToList(&fillpin);
    517524    tlist.AddToList(&calcalc);
    518     tlist.AddToList(&fillpin);
    519525
    520526    // Create and setup the eventloop
  • trunk/MagicSoft/Mars/mjobs/MJExtractSignal.h

    r3069 r3253  
    1515class MParList;
    1616class MPedestalCam;
    17 class MCalibrationCam;
     17class MCalibrationChargeCam;
    1818
    1919class MJExtractSignal : public MParContainer
     
    3333
    3434    Bool_t ProcessFileD(MPedestalCam &pedcam);
    35     Bool_t ProcessFileP(MPedestalCam &pedcam, MCalibrationCam &calcam);
     35    Bool_t ProcessFileP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam);
    3636
    3737public:
     
    5050
    5151    Bool_t ProcessD(MPedestalCam &pedcam);
    52     Bool_t ProcessP(MPedestalCam &pedcam, MCalibrationCam &calcam);
     52    Bool_t ProcessP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam);
    5353
    5454    ClassDef(MJExtractSignal, 0) // Tool to create a pedestal file (MPedestalCam)
Note: See TracChangeset for help on using the changeset viewer.