Changeset 3253 for trunk/MagicSoft/Mars/mjobs
- Timestamp:
- 02/21/04 01:50:58 (21 years ago)
- Location:
- trunk/MagicSoft/Mars/mjobs
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
r3205 r3253 47 47 48 48 #include "MPedestalCam.h" 49 #include "MCalibrationCam.h" 49 #include "MCalibrationChargeCam.h" 50 #include "MCalibrationChargePINDiode.h" 50 51 51 52 #include "MReadMarsFile.h" … … 56 57 #include "MExtractBlindPixel.h" 57 58 #include "MExtractSignal2.h" 58 #include "MCalibrationC alc.h"59 #include "MCalibrationChargeCalc.h" 59 60 #include "MFCosmics.h" 60 61 #include "MContinue.h" … … 476 477 static_cast<MRead&>(read).AddFiles(*fRuns); 477 478 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 478 488 // Setup Tasklist 479 489 MParList plist; 480 490 plist.AddToList(&pedcam); 481 491 plist.AddToList(&fCalibrationCam); 492 plist.AddToList(&pindiode); 482 493 483 494 MTaskList tlist; 484 495 plist.AddToList(&tlist); 485 496 486 MGeomApply apply;487 MBadPixelsMerge merge(&fBadPixels);497 MGeomApply apply; 498 MBadPixelsMerge merge(&fBadPixels); 488 499 // MExtractSignal extract; // Do not use this at the moment... 489 MExtractPINDiode pinext;490 MExtractBlindPixel blindext;491 MExtractSignal2 extract;492 MCalibrationC alc calcalc;500 MExtractPINDiode pinext; 501 MExtractBlindPixel blindext; 502 MExtractSignal2 extract; 503 MCalibrationChargeCalc calcalc; 493 504 494 505 MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode"); … … 501 512 MContinue cont(&cosmics); 502 513 503 //504 // As long, as we don't have digital modules,505 // we have to set the color of the pulser LED by hand506 //507 calcalc.SetPulserColor(MCalibrationCalc::kECT1);508 514 //calcalc.SkipBlindPixelFit(); 509 515 … … 515 521 tlist.AddToList(&blindext); 516 522 tlist.AddToList(&cont); 523 tlist.AddToList(&fillpin); 517 524 tlist.AddToList(&calcalc); 518 tlist.AddToList(&fillpin);519 525 520 526 // Create and setup the eventloop -
trunk/MagicSoft/Mars/mjobs/MJExtractSignal.h
r3069 r3253 15 15 class MParList; 16 16 class MPedestalCam; 17 class MCalibrationC am;17 class MCalibrationChargeCam; 18 18 19 19 class MJExtractSignal : public MParContainer … … 33 33 34 34 Bool_t ProcessFileD(MPedestalCam &pedcam); 35 Bool_t ProcessFileP(MPedestalCam &pedcam, MCalibrationC am &calcam);35 Bool_t ProcessFileP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam); 36 36 37 37 public: … … 50 50 51 51 Bool_t ProcessD(MPedestalCam &pedcam); 52 Bool_t ProcessP(MPedestalCam &pedcam, MCalibrationC am &calcam);52 Bool_t ProcessP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam); 53 53 54 54 ClassDef(MJExtractSignal, 0) // Tool to create a pedestal file (MPedestalCam)
Note:
See TracChangeset
for help on using the changeset viewer.