Changeset 5136
- Timestamp:
- 09/25/04 13:56:33 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r5135 r5136 21 21 2004/09/23: Markus Gaug 22 22 23 * msignal/MExtractBlindPixel.[h,cc] 24 - added enum DataType_t to set in which MRawEvtData container the 25 blind pixel is found. The container of the blind pixel has changed 26 from MRawEvtData to MRawEvtData2 27 23 28 * mcalib/MCalibrationBlindCam.[h,cc] 24 29 - added function SetPulserColor which was only available in -
trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.h
r5047 r5136 14 14 #endif 15 15 16 class TGraphErrors; 17 class TH2D; 16 18 class MCalibrationQECam : public MCalibrationCam 17 19 { … … 34 36 35 37 MArrayD fCorningBlues; // Corning blues of the pixels (if available) 36 MArrayD fCorningReds; // oCorning reds of the pixels (if available)38 MArrayD fCorningReds; // Corning reds of the pixels (if available) 37 39 38 40 public: … … 42 44 void Clear( Option_t *o="" ); 43 45 void Copy ( TObject& object ) const; 46 47 TGraphErrors *GetGraphQEvsCorningBlues() const; 48 TGraphErrors *GetGraphQEvsCorningReds() const; 49 50 TH2D *GetHistQEvsCorningBlues( const Int_t nbins=50, const Axis_t first=6., const Axis_t last=17.) const; 51 TH2D *GetHistQEvsCorningReds( const Int_t nbins=50, const Axis_t first=0., const Axis_t last=25.) const; 44 52 45 53 // Others -
trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc
r4984 r5136 94 94 : fHiGainSignal(NULL), 95 95 fHiGainFirstDeriv(NULL), 96 fHiGainSecondDeriv(NULL) 96 fHiGainSecondDeriv(NULL), 97 fDataType(0) 97 98 { 98 99 … … 213 214 return kFALSE; 214 215 215 216 if (IsDataType(kRawEvt2)) 217 fRawEvt = (MRawEvtData*)pList->FindObject(AddSerialNumber("MRawEvtData2")); 218 else 219 fRawEvt = (MRawEvtData*)pList->FindObject(AddSerialNumber("MRawEvtData")); 220 221 if (!fRawEvt) 222 { 223 *fLog << err << "MRawEvtData2 or MRawEvtData not found... aborting." << endl; 224 return kFALSE; 225 } 216 226 return kTRUE; 217 227 } … … 718 728 // ------------------------------------------------------------------------------------ 719 729 // 730 // Returns true if the Data type. Available are: kAmplitude, kIntegral and kFilter 731 // The flags kIntegral and kFilter may be set both. 732 // 733 Bool_t MExtractBlindPixel::IsDataType( const DataType_t typ ) 734 { 735 736 return TESTBIT( fDataType, typ ); 737 738 } 739 740 // ------------------------------------------------------------------------------------ 741 // 720 742 // Returns true if the extraction type. Available are: kAmplitude, kIntegral and kFilter 721 743 // The flags kIntegral and kFilter may be set both. … … 730 752 // -------------------------------------------------------------------------- 731 753 // 754 // Sets the Data type. Available are: kAmplitude and kIntegral 755 // 756 void MExtractBlindPixel::SetDataType( const DataType_t typ ) 757 { 758 SETBIT( fDataType, typ ); 759 } 760 761 // -------------------------------------------------------------------------- 762 // 732 763 // Sets the extraction type. Available are: kAmplitude and kIntegral 733 764 //
Note:
See TracChangeset
for help on using the changeset viewer.