Changeset 5531 for trunk/MagicSoft/Mars/mjobs
- Timestamp:
- 11/30/04 20:38:44 (20 years ago)
- Location:
- trunk/MagicSoft/Mars/mjobs
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
r5511 r5531 1685 1685 fTimeExtractor = ×pline; 1686 1686 1687 // 1688 // Look if the extractor is a pure charge or also a time extractor 1689 // 1690 if (fExtractor->InheritsFrom("MExtractTimeAndCharge")) 1691 { 1692 SetTimeAndCharge(); 1693 if (fExtractorCam.GetSize() == pedcam.GetSize()) 1694 { 1695 plist.AddToList(&fExtractorCam); 1696 calcalc.SetNamePedestalCam(fExtractorCam.GetName()); 1697 } 1698 else 1699 *fLog << warn << "Used Extractor derives from MExtractTimeAndCharge, " 1700 << "but no MExtractorCam has been handed over! " << endl; 1701 } 1702 1687 1703 MTaskEnv taskenv("ExtractSignal"); 1688 1704 taskenv.SetDefault(fExtractor); -
trunk/MagicSoft/Mars/mjobs/MJCalibration.h
r5308 r5531 37 37 #ifndef MARS_MBadPixelsCam 38 38 #include "MBadPixelsCam.h" 39 #endif 40 #ifndef MARS_MPedestalCam 41 #include "MPedestalCam.h" 39 42 #endif 40 43 … … 98 101 MCalibrationRelTimeCam fRelTimeCam; // Calibration constants rel. times 99 102 103 MPedestalCam fExtractorCam; // Pedestal Cam with extractor resolution 104 100 105 MCalibrationCam::PulserColor_t fColor; // Colour of the pulsed LEDs 101 106 … … 143 148 Bool_t IsHistsStorage () const { return TESTBIT(fStorage,kHistsStorage); } 144 149 145 void DrawTab(MParList &plist, const char *cont, const char *name, Option_t *opt); 150 void SetTimeAndCharge( const Bool_t b=kTRUE ) { b 151 ? SETBIT(fFlags,kTimeAndCharge) 152 : CLRBIT(fFlags,kTimeAndCharge); } 153 154 void DrawTab(MParList &plist, const char *cont, const char *name, Option_t *opt); 146 155 147 156 void DisplayResult ( MParList &plist ); … … 177 186 MBadPixelsCam &GetBadPixels() { return fBadPixels; } 178 187 179 void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); } 180 void SetExtractor(MExtractor* ext) { fExtractor = ext; } 181 void SetTimeExtractor(MExtractTime* ext) { fTimeExtractor = ext; } 182 void SetQECam(const MCalibrationQECam &qe) { qe.Copy(fQECam); } 183 void SetColor(const MCalibrationCam::PulserColor_t color) { fColor = color; } 184 void SetInput(MRunIter *iter) { fRuns = iter; } 188 // Containers and pointers 189 void SetBadPixels ( const MBadPixelsCam &bad) { bad.Copy(fBadPixels); } 190 void SetColor ( const MCalibrationCam::PulserColor_t color) { fColor = color; } 191 void SetExtractor ( MExtractor* ext) { fExtractor = ext; } 192 void SetExtractorCam ( const MPedestalCam &ped) { ped.Copy(fExtractorCam); } 193 void SetInput ( MRunIter *iter) { fRuns = iter; } 194 void SetQECam ( const MCalibrationQECam &qe) { qe.Copy(fQECam); } 195 void SetTimeExtractor( MExtractTime* ext) { fTimeExtractor = ext; } 185 196 186 197 // Displays … … 198 209 void SetDebug ( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kDebug) : CLRBIT(fFlags,kDebug); } 199 210 void SetIntensity ( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kIntensity) : CLRBIT(fFlags,kIntensity); } 200 void SetTimeAndCharge ( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kTimeAndCharge) : CLRBIT(fFlags,kTimeAndCharge); }201 211 202 212 // Devices
Note:
See TracChangeset
for help on using the changeset viewer.