Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 4623) +++ /trunk/MagicSoft/Mars/Changelog (revision 4624) @@ -21,4 +21,12 @@ + 2004/08/16: Thomas Bretz + + * mcalib/MCalibrateData.[h,cc]: + - change to support also 'No calibration of data' + - removed obsolete dependancie on *'FromData' containers + + + 2004/08/16: Markus Gaug @@ -29,4 +37,5 @@ + 2004/08/14: Markus Gaug @@ -38,4 +47,60 @@ - some small modifications in the data-check display, discussed with Florian + + + + 2004/08/13: Thomas Bretz + + * macros/readraw.C: + - updated to get it working with MC data + + * mbase/MTaskEnv.cc: + - fixed a typo + + * mcalib/MCalibrationChargeCalc.[h,cc], + mcalib/MHCalibrationCam.[h,cc]: + - added ReadEnv + - changed some output slightly to match into a typical + 80-column console + + * mjobs/MJCalibration.[h,cc]: + - changed to support Sequences + - added SetEnv + - added possibility to change extractors from a resource file + - put MBadPixelsMerge into the tasklist - for strange reasons + it was missing + + * mjobs/MJPedestal.[h,cc]: + - fixed the output name for sequences + - added possibility to set output from resource file + + * mpedestal/MPedCalcFromLoGain.[h,cc]: + - changed handling of sanity check for setup + - removed obsolete variables + - changed output slightly to fit into a typical 80-column + console + - added some sanity checks to PostProcess + - added some info-output to PostProcess + - calculate a mean number of total events + - call ReCalc to calc mean values of sectors and areas + + * mpedestal/MPedCalcPedRun.[h,cc]: + - changed to use ReCalc instead of doing the calculation itself + for convinience I left the old code as a comment inside - + will be removed later + + * mpedestal/MPedPhotCam.[h,cc]: + - slight changes in ReCalc + + * mpedestal/MPedestalCam.[h,cc]: + - added ReCalc function (maily taken from PedPhotCamReCalc) + + * mpedestal/MPedestalPix.h: + - added Getter for fNumEvents + + * mraw/MRawEvtHeader.[h,cc]: + - started adding support for calibration pattern. Please don't + take the current implementation to serious + Index: /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc (revision 4623) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc (revision 4624) @@ -108,8 +108,6 @@ using namespace std; -const TString MCalibrateData::fgNamePedADCRunContainer = "MPedestalCam" ; -const TString MCalibrateData::fgNamePedADCEventContainer = "MPedestalCamFromData"; -const TString MCalibrateData::fgNamePedPhotRunContainer = "MPedPhotCam" ; -const TString MCalibrateData::fgNamePedPhotEventContainer = "MPedPhotCamFromData" ; +const TString MCalibrateData::fgNamePedADCContainer = "MPedestalCam"; +const TString MCalibrateData::fgNamePedPhotContainer = "MPedPhotCam"; // -------------------------------------------------------------------------- // @@ -122,12 +120,10 @@ // - fPedestalFlag to kRun // - fNamePedADCRunContainer to "MPedestalCam" -// - fNamePedADCEventContainer to "MPedestalCamFromData" // - fNamePedPhotRunContainer to "MPedPhotCam" -// - fNamePedPhotEventContainer to "MPedPhotCamFromData" // MCalibrateData::MCalibrateData(CalibrationMode_t calmode,const char *name, const char *title) - : fGeomCam(NULL), fPedestal(NULL), fPedestalFromData(NULL), + : fGeomCam(NULL), fPedestal(NULL), fBadPixels(NULL), fCalibrations(NULL), fQEs(NULL), fSignals(NULL), - fPedPhot(NULL), fPedPhotFromData(NULL), fCerPhotEvt(NULL) + fPedPhot(NULL), fCerPhotEvt(NULL) { @@ -136,10 +132,8 @@ SetCalibrationMode(); - SetPedestalType(); - - SetNamePedADCRunContainer (); - SetNamePedADCEventContainer (); - SetNamePedPhotRunContainer (); - SetNamePedPhotEventContainer(); + SetPedestalFlag(); + + SetNamePedADCContainer(); + SetNamePedPhotContainer(); } @@ -164,53 +158,35 @@ Int_t MCalibrateData::PreProcess(MParList *pList) { - - // input containers - - if (TestFlag(kRun)) - { - fPedestal = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedADCRunContainer), "MPedestalCam"); + // input containers + + fPedestal = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedADCContainer), "MPedestalCam"); if (!fPedestal) - { - *fLog << err << "container 'MPedestalCam'" - << " not found ... aborting" << endl; - return kFALSE; - } - } - - - if (TestFlag(kEvent)) - { - fPedestalFromData = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedADCEventContainer), "MPedestalCam"); - if (!fPedestalFromData) - { - *fLog << err << "container 'MPedestalCamFromData'" - << " not found ... aborting" << endl; - return kFALSE; - } - } - - - fSignals = (MExtractedSignalCam*)pList->FindObject(AddSerialNumber("MExtractedSignalCam")); - if (!fSignals) - { - *fLog << err << AddSerialNumber("MExtractedSignalCam") << " not found ... aborting" << endl; - return kFALSE; - } - - fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam")); - if (!fBadPixels) - { - *fLog << err << AddSerialNumber("MBadPixelsCam") << " not found ... aborting" << endl; - return kFALSE; - } - - if (fCalibrationMode>kNone) + { + *fLog << err << AddSerialNumber(fNamePedADCContainer) << " [MPedestalCam] not found ... aborting" << endl; + return kFALSE; + } + + fSignals = (MExtractedSignalCam*)pList->FindObject(AddSerialNumber("MExtractedSignalCam")); + if (!fSignals) + { + *fLog << err << AddSerialNumber("MExtractedSignalCam") << " not found ... aborting" << endl; + return kFALSE; + } + + fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam")); + if (!fBadPixels) + { + *fLog << err << AddSerialNumber("MBadPixelsCam") << " not found ... aborting" << endl; + return kFALSE; + } + + if (fCalibrationMode>kNone) { fCalibrations = (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam")); if (!fCalibrations) - { + { *fLog << err << AddSerialNumber("MCalibrationChargeCam") << " not found ... aborting." << endl; return kFALSE; - } + } fQEs = (MCalibrationQECam*)pList->FindObject(AddSerialNumber("MCalibrationQECam")); @@ -221,29 +197,16 @@ } } - - // output containers - - if (TestFlag(kRun)) - { - fPedPhot = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam", AddSerialNumber(fNamePedPhotRunContainer)); - if (!fPedPhot) - return kFALSE; - - } - - - if (TestFlag(kEvent)) - { - fPedPhotFromData = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam", AddSerialNumber(fNamePedPhotEventContainer)); - if (!fPedPhotFromData) - return kFALSE; - - } - - fCerPhotEvt = (MCerPhotEvt*)pList->FindCreateObj(AddSerialNumber("MCerPhotEvt")); - if (!fCerPhotEvt) - return kFALSE; - - return kTRUE; + + // output containers + + fPedPhot = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam", AddSerialNumber(fNamePedPhotContainer)); + if (!fPedPhot) + return kFALSE; + + fCerPhotEvt = (MCerPhotEvt*)pList->FindCreateObj(AddSerialNumber("MCerPhotEvt")); + if (!fCerPhotEvt) + return kFALSE; + + return kTRUE; } @@ -329,8 +292,7 @@ } - if (TestFlag(kRun)) - if (!CalibratePedestal(fPedestal,fPedPhot)) - return kFALSE; - + if (TestPedestalFlag(kRun)) + if (!CalibratePedestal()) + return kFALSE; return kTRUE; @@ -343,56 +305,53 @@ // Calibrate the Pedestal values // -Bool_t MCalibrateData::CalibratePedestal(MPedestalCam *pedADCCam, MPedPhotCam *pedPhotCam) -{ - - // - // Fill MPedPhot container using the informations from - // MPedestalCam, MExtractedSignalCam and MCalibrationCam - // - const Float_t slices = fSignals->GetNumUsedHiGainFADCSlices(); - - // is pixid equal to pixidx ? - if ( (Int_t)(pedADCCam->GetSize()) != fSignals->GetSize()) - { - *fLog << err << "MCalibrateData::ReInit(); sizes of MPedestalCam and MCalibrationCam are different" - << endl; - } - - - for (Int_t pixid=0; pixidGetSize(); pixid++) - { - - const MPedestalPix &ped = (*pedADCCam)[pixid]; - - // pedestals/(used FADC slices) in [ADC] counts - Float_t pedes = ped.GetPedestal() * slices; - Float_t pedrms = ped.GetPedestalRms() * TMath::Sqrt(slices); - +Bool_t MCalibrateData::CalibratePedestal() +{ // - // get phe/ADC conversion factor + // Fill MPedPhot container using the informations from + // MPedestalCam, MExtractedSignalCam and MCalibrationCam // - Float_t hiloconv; - Float_t hiloconverr; - Float_t calibConv; - Float_t calibConvVar; - Float_t calibFFactor; - - if ( !GetConversionFactor(pixid, hiloconv, hiloconverr, - calibConv, calibConvVar, calibFFactor )) - continue; - - // - // pedestals/(used FADC slices) in [number of photons] - // - Float_t pedphot = pedes * calibConv; - Float_t pedphotrms = pedrms * calibConv; - - (*pedPhotCam)[pixid].Set(pedphot, pedphotrms); - - } - - pedPhotCam->SetReadyToSave(); - - return kTRUE; + const Float_t slices = fSignals->GetNumUsedHiGainFADCSlices(); + + // is pixid equal to pixidx ? + if ((Int_t)fPedestal->GetSize() != fSignals->GetSize()) + { + *fLog << err << "MCalibrateData::ReInit(); sizes of MPedestalCam and MCalibrationCam are different" + << endl; + } + + const Int_t n = fPedestal->GetSize(); + for (Int_t pixid=0; pixidSetReadyToSave(); + + return kTRUE; } @@ -401,9 +360,7 @@ // Get conversion factor and its error from MCalibrationCam // -Bool_t MCalibrateData::GetConversionFactor(UInt_t pixidx, - Float_t &hiloconv, Float_t &hiloconverr, - Float_t &calibConv, Float_t &calibConvVar, Float_t &calibFFactor) -{ - +Bool_t MCalibrateData::GetConversionFactor(UInt_t pixidx, Float_t &hiloconv, Float_t &hiloconverr, + Float_t &calibConv, Float_t &calibConvVar, Float_t &calibFFactor) +{ // // For the moment, we use only a dummy zenith for the calibration: @@ -523,4 +480,66 @@ } +void MCalibrateData::CalibrateData() +{ + UInt_t npix = fSignals->GetSize(); + + Float_t hiloconv; + Float_t hiloconverr; + Float_t calibrationConversionFactor; + Float_t calibrationConversionFactorErr; + Float_t calibFFactor; + + for (UInt_t pixidx=0; pixidx 9999.) + { + signal = 0.; + signalErr = 0.; + } + else + signal = sig.GetExtractedSignalHiGain(); + } + + nphot = signal*calibrationConversionFactor; + nphotErr = calibFFactor*TMath::Sqrt(TMath::Abs(nphot)); + // + // The following part is the commented first version of the error calculation + // Contact Markus Gaug for questions (or wait for the next documentation update...) + // + /* + nphotErr = signal > 0 ? signalErr*signalErr / (signal * signal) : 0. + + calibConv > 0 ? calibConvVar / (calibConv * calibConv ) : 0.; + nphotErr = TMath::Sqrt(nphotErr) * nphot; + */ + + MCerPhotPix *cpix = fCerPhotEvt->AddPixel(pixidx, nphot, nphotErr); + + if (sig.GetNumHiGainSaturated() > 0) + cpix->SetPixelHGSaturated(); + + if (sig.GetNumLoGainSaturated() > 0) + cpix->SetPixelSaturated(); + } + + fCerPhotEvt->FixSize(); + fCerPhotEvt->SetReadyToSave(); +} // -------------------------------------------------------------------------- @@ -531,143 +550,22 @@ Int_t MCalibrateData::Process() { - - /* - if (fCalibrations->GetNumPixels() != (UInt_t)fSignals->GetSize()) - { - // FIXME: MExtractedSignal must be of variable size - - // like MCerPhotEvt - because we must be able - // to reduce size by zero supression - // For the moment this check could be done in ReInit... - *fLog << err << "MExtractedSignal and MCalibrationCam have different sizes... abort." << endl; - return kFALSE; - } - */ - - UInt_t npix = fSignals->GetSize(); - - Float_t hiloconv; - Float_t hiloconverr; - Float_t calibrationConversionFactor; - Float_t calibrationConversionFactorErr; - Float_t calibFFactor; - - for (UInt_t pixidx=0; pixidx 9999.) - { - signal = 0.; - signalErr = 0.; - } - else - signal = sig.GetExtractedSignalHiGain(); - } - - nphot = signal*calibrationConversionFactor; - nphotErr = calibFFactor*TMath::Sqrt(TMath::Abs(nphot)); - // - // The following part is the commented first version of the error calculation - // Contact Markus Gaug for questions (or wait for the next documentation update...) - // - /* - nphotErr = signal > 0 ? signalErr*signalErr / (signal * signal) : 0. - + calibConv > 0 ? calibConvVar / (calibConv * calibConv ) : 0.; - nphotErr = TMath::Sqrt(nphotErr) * nphot; - */ - - MCerPhotPix *cpix = fCerPhotEvt->AddPixel(pixidx, nphot, nphotErr); - - if (sig.GetNumHiGainSaturated() > 0) - cpix->SetPixelHGSaturated(); - - if (sig.GetNumLoGainSaturated() > 0) - cpix->SetPixelSaturated(); - } - - fCerPhotEvt->FixSize(); - fCerPhotEvt->SetReadyToSave(); - - if(TestFlag(kEvent)) - if (!CalibratePedestal(fPedestalFromData,fPedPhotFromData)) - return kFALSE; - - /* - // - // fill MPedPhot(FromData) container using the informations from - // MPedestalCam, MExtractedSignalCam and MCalibrationCam - // - fNumUsedHiGainFADCSlices = fSignals->GetNumUsedHiGainFADCSlices(); - - // is pixid equal to pixidx ? - if ( (Int_t)(fPedestal->GetSize()) != fSignals->GetSize()) - { - *fLog << err << "MCalibrateData::ReInit(); sizes of MPedestalCam and MCalibrationCam are different" - << endl; - } - */ - - /* - *fLog << all << "MCalibrateData::ReInit(); fill MPedPhotCam container" - << endl; - *fLog << all << " fNumUsedHiGainADCSlices = " - << fNumUsedHiGainFADCSlices << endl; - *fLog << all << " pixid, calibrationConversionFactor, ped, pedRMS, pedphot, pedphotRMS :" - << endl; - */ /* - for (Int_t pixid=0; pixidGetSize(); pixid++) - { - const MPedestalPix &ped = (*fPedestalFromData)[pixid]; - - // pedestals/(used FADC slices) in [ADC] counts - Float_t pedes = ped.GetPedestal() * fNumUsedHiGainFADCSlices; - Float_t pedrms = ped.GetPedestalRms() * sqrt(fNumUsedHiGainFADCSlices); - - //---------------------------------- - // get phe/ADC conversion factor - - Float_t hiloconv; - Float_t hiloconverr; - Float_t calibConv; - Float_t calibFFactor; - - if ( !GetConversionFactor(pixid, hiloconv, hiloconverr, - calibConv, calibFFactor )) - continue; - - //---------------------------------- - - // pedestals/(used FADC slices) in [number of photons] - Float_t pedphot = pedes * calibConv; - Float_t pedphotrms = pedrms * calibConv; - - (*fPedPhotFromData)[pixid].Set(pedphot, pedphotrms); - - // *fLog << all << pixid << ", " << calibConv << ", " - // << ped.GetPedestal() << ", " << ped.GetPedestalRms() << ", " - // << pedphot << ", " << pedphotrms << endl; - } - - //--------------------------------------------- - - fPedPhotFromData->SetReadyToSave(); - - } + /* + if (fCalibrations->GetNumPixels() != (UInt_t)fSignals->GetSize()) + { + // FIXME: MExtractedSignal must be of variable size - + // like MCerPhotEvt - because we must be able + // to reduce size by zero supression + // For the moment this check could be done in ReInit... + *fLog << err << "MExtractedSignal and MCalibrationCam have different sizes... abort." << endl; + return kFALSE; + } */ + + if (fCalibrationMode!=kSkip) + CalibrateData(); + + if (TestPedestalFlag(kEvent)) + if (!CalibratePedestal()) + return kFALSE; return kTRUE; @@ -686,39 +584,22 @@ out << "\"" << fName << "\", \"" << fTitle << "\");" << endl; - if (TestFlag(kEvent)) + if (TestPedestalFlag(kEvent)) out << " " << GetUniqueName() << ".EnablePedestalType(kEvent)" << endl; - if (TestFlag(kRun)) + if (TestPedestalFlag(kRun)) out << " " << GetUniqueName() << ".EnablePedestalType(kRun)" << endl; if (fCalibrationMode != kDefault) - out << " " << GetUniqueName() << ".SetCalibrationMode(fCalibrationMode)" << endl; - - if (fNamePedADCRunContainer != fgNamePedADCRunContainer) - { - out << " " << GetUniqueName() << ".SetNamePedADCRunContainer("; - out << fNamePedADCRunContainer.Data() << ");" << endl; + out << " " << GetUniqueName() << ".SetCalibrationMode(" << fCalibrationMode << ")" << endl; + + if (fNamePedADCContainer != fgNamePedADCContainer) + { + out << " " << GetUniqueName() << ".SetNamePedADCContainer("; + out << fNamePedADCContainer.Data() << ");" << endl; } - if (fNamePedADCEventContainer != fgNamePedADCEventContainer) - { - out << " " << GetUniqueName() << ".SetNamePedADCEventContainer("; - out << fNamePedADCEventContainer.Data() << ");" << endl; - } - - - if (fNamePedPhotRunContainer != fgNamePedPhotRunContainer) - { - out << " " << GetUniqueName() << ".SetNamePedPhotRunContainer("; - out << fNamePedPhotRunContainer.Data() << ");" << endl; - } - - - if (fNamePedPhotEventContainer != fNamePedPhotEventContainer) - { - out << " " << GetUniqueName() << ".SetNamePedPhotEventContainer("; - out << fNamePedPhotEventContainer.Data() << ");" << endl; - } - -} - - + if (fNamePedPhotContainer != fgNamePedPhotContainer) + { + out << " " << GetUniqueName() << ".SetNamePedPhotContainer("; + out << fNamePedPhotContainer.Data() << ");" << endl; + } +} Index: /trunk/MagicSoft/Mars/mcalib/MCalibrateData.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrateData.h (revision 4623) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrateData.h (revision 4624) @@ -35,12 +35,9 @@ private: - static const TString fgNamePedADCRunContainer; //! "MPedestalCam" - static const TString fgNamePedADCEventContainer; //! "MPedestalCamFromData" - static const TString fgNamePedPhotRunContainer; //! "MPedPhotCam" - static const TString fgNamePedPhotEventContainer; //! "MPedPhotCamFromData" + static const TString fgNamePedADCContainer; //! "MPedestalCam" + static const TString fgNamePedPhotContainer; //! "MPedPhotCam" MGeomCam *fGeomCam; //! Camera geometry container MPedestalCam *fPedestal; //! Pedestals/slice [ADC counts] - MPedestalCam *fPedestalFromData; //! Pedestals/slice [ADC counts] MBadPixelsCam *fBadPixels; //! Bad Pixels information MCalibrationChargeCam *fCalibrations; //! Calibration constants @@ -49,5 +46,4 @@ MPedPhotCam *fPedPhot; // Pedestals/(used slices) [photons] - MPedPhotCam *fPedPhotFromData; // Pedestals/(used slices) [photons] MCerPhotEvt *fCerPhotEvt; // Cerenkov Photon Event used for calculation @@ -55,51 +51,58 @@ Byte_t fPedestalFlag; // Flags defining to calibrate the pedestal each event or each run - TString fNamePedADCRunContainer; // name of fPedestal - TString fNamePedADCEventContainer; // name of fPedestalFromData - TString fNamePedPhotRunContainer; // name of fPedPhot - TString fNamePedPhotEventContainer; // name of fPedPhotFromData + TString fNamePedADCContainer; // name of fPedestal + TString fNamePedPhotContainer; // name of fPedPhot - Bool_t CalibratePedestal ( MPedestalCam *, MPedPhotCam * ); + Bool_t CalibratePedestal(); + void CalibrateData(); - Bool_t GetConversionFactor(UInt_t, - Float_t &, Float_t &, Float_t &, - Float_t &, Float_t &); + Bool_t GetConversionFactor(UInt_t, Float_t &, Float_t &, Float_t &, Float_t &, Float_t &); - Int_t PreProcess( MParList *pList ); - Bool_t ReInit ( MParList *pList ); - Int_t Process ( ); + Int_t PreProcess(MParList *pList); + Bool_t ReInit(MParList *pList); + Int_t Process(); - void StreamPrimitive( ofstream &out ) const; + void StreamPrimitive( ofstream &out ) const; public: - enum CalibrationMode_t { kNone=0,kFlatCharge=1, - kBlindPixel=2,kFfactor=3,kPinDiode=4,kCombined=5, kDummy=6 }; + enum CalibrationMode_t + { + kNone = 0, + kFlatCharge = 1, + kBlindPixel = 2, + kFfactor = 3, + kPinDiode = 4, + kCombined = 5, + kDummy = 6, + kSkip = 7 + }; static const CalibrationMode_t kDefault = kFfactor; - enum PedestalType_t { - kNo = BIT(0), - kRun = BIT(1), - kEvent = BIT(2) + enum PedestalType_t + { + kNo = BIT(0), + kRun = BIT(1), + kEvent = BIT(2) }; - MCalibrateData( CalibrationMode_t calmode=kDefault, - const char *name=NULL, const char *title=NULL); + MCalibrateData(CalibrationMode_t calmode=kDefault, + const char *name=NULL, const char *title=NULL); - void EnablePedestalType ( PedestalType_t i ) { fPedestalFlag |= i; } - void SetPedestalType ( PedestalType_t i=kRun ) { fPedestalFlag = i; } - Bool_t TestFlag ( PedestalType_t i ) const { return fPedestalFlag & i; } + void EnablePedestalType(PedestalType_t i) { fPedestalFlag |= i; } + void SetPedestalFlag(PedestalType_t i=kRun) { fPedestalFlag = i; } + Bool_t TestPedestalFlag(PedestalType_t i) const { return fPedestalFlag & i; } void SetCalibrationMode ( CalibrationMode_t calmode=kDefault ) { fCalibrationMode=calmode; } - void SetNamePedADCRunContainer ( const char *name=fgNamePedADCRunContainer.Data() ) { - fNamePedADCRunContainer = name; } - void SetNamePedADCEventContainer ( const char *name=fgNamePedADCEventContainer.Data() ) { - fNamePedADCEventContainer = name; } - void SetNamePedPhotRunContainer ( const char *name=fgNamePedPhotRunContainer.Data() ) { - fNamePedPhotRunContainer = name; } - void SetNamePedPhotEventContainer( const char *name=fgNamePedPhotEventContainer.Data()) { - fNamePedPhotEventContainer = name; } + void SetNamePedADCContainer(const char *name=fgNamePedADCContainer.Data()) + { + fNamePedADCContainer = name; + } + void SetNamePedPhotContainer(const char *name=fgNamePedPhotContainer.Data()) + { + fNamePedPhotContainer = name; + } ClassDef(MCalibrateData, 0) // Task to calibrate FADC counts into Cherenkov photons