Index: /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc (revision 8416) +++ /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc (revision 8417) @@ -32,10 +32,8 @@ // MCalibrationIntensityChargeCam // MCalibrationIntensityRelTimeCam -// MBadPixelsIntensityCam // // Output Containers: // MCalibrationIntensityChargeCam // MCalibrationIntensityRelTimeCam -// MBadPixelsIntensityCam // // Class version 2: @@ -64,5 +62,5 @@ //#include "MCalibrationIntensityRelTimeCam.h" -#include "MBadPixelsIntensityCam.h" +#include "MBadPixelsCam.h" #include "MCalibrationChargePix.h" @@ -88,6 +86,5 @@ MCalibCalcFromPast::MCalibCalcFromPast(const char *name, const char *title) : fGeom(NULL), fParList(NULL), fRunHeader(NULL), - fIntensCharge(NULL), fIntensBlind(NULL), fIntensRelTime(NULL), - fIntensBad(NULL), + fIntensCharge(NULL), fIntensBlind(NULL), fChargeCalc(NULL), fRelTimeCalc(NULL), fCalibrate(NULL), fNumCam(0), fNumEvents(0), fUpdateWithFFactorMethod(kTRUE), fUpdateNumPhes(kTRUE), @@ -131,10 +128,11 @@ // Look for the MBadPixels Intensity Cam // - fIntensBad = (MBadPixelsIntensityCam*)pList->FindCreateObj("MBadPixelsIntensityCam"); - if (fIntensBad) - *fLog << inf << "Found MBadPixelsIntensityCam ... " << flush; - else - return kFALSE; - + fBadPixels = (MBadPixelsCam*)pList->FindObject("MBadPixelsCam"); + if (!fBadPixels) + { + *fLog << err << "MBadPixelsCam not found... abort." << endl; + return kFALSE; + } + // // Look for the MFillH-class "MHCalibrationBlindCam". In case yes, initialize the @@ -209,6 +207,6 @@ { - fIntensRelTime = (MCalibrationIntensityRelTimeCam*)pList->FindCreateObj("MCalibrationIntensityRelTimeCam"); - if (!fIntensRelTime) + MParContainer *cont = pList->FindCreateObj("MCalibrationIntensityRelTimeCam"); + if (!cont) { *fLog << err << "Could not find nor create MCalibrationIntensityRelTimeCam abort... " << endl; @@ -276,4 +274,8 @@ return kTRUE; + // Replace the old cams by (empty) new ones + // MCalibrationChargeCam: fIntensCharge + // MCalibrationQECam: fIntensQE + // MCalibrationBlindCam: fIntensBlind fNumEvents = 0; ReInitialize(); @@ -382,13 +384,6 @@ // The "DeleteOldCam" function must not delete the first entry in // the array because it is a special cam from the MParList. (see above) - - if (fIntensBad) - { - *fLog << "MBadPixelsCam..."; - MBadPixelsCam *cold = fIntensBad->GetCam(); - fIntensBad->AddToList(Form("MBadPixelsCam%04d",fNumCam),*fGeom); - if (cold) - fIntensBad->DeleteOldCam(cold); - } + *fLog << "MBadPixelsCam..."; + fBadPixels->Clear(); // FIXME:::::: MERGE PreExcl!!!! if (fIntensCharge) Index: /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h (revision 8416) +++ /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h (revision 8417) @@ -20,6 +20,6 @@ class MCalibrationIntensityBlindCam; class MCalibrationIntensityQECam; -class MCalibrationIntensityRelTimeCam; -class MBadPixelsIntensityCam; + +class MBadPixelsCam; class MCalibCalcFromPast : public MTask @@ -35,7 +35,7 @@ MCalibrationIntensityBlindCam *fIntensBlind; //! Intensity Blind Cam (to be created) MCalibrationIntensityQECam *fIntensQE; //! Intensity QE Cam (to be created) - MCalibrationIntensityRelTimeCam *fIntensRelTime; //! Intensity Rel. Time Cam (to be created) - MBadPixelsIntensityCam *fIntensBad; //! Intensity Bad Pixels Cam (to be created) - + + MBadPixelsCam *fBadPixels; + MCalibrationChargeCalc *fChargeCalc; //! Charge Calibration Task MCalibrationRelTimeCalc *fRelTimeCalc; //! Rel. Times Calibratio Task Index: /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc (revision 8416) +++ /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc (revision 8417) @@ -35,10 +35,8 @@ // MCalibrationIntensityChargeCam // MCalibrationIntensityRelTimeCam -// MBadPixelsIntensityCam // // Output Containers: // MCalibrationIntensityChargeCam // MCalibrationIntensityRelTimeCam -// MBadPixelsIntensityCam // ////////////////////////////////////////////////////////////////////////////// @@ -50,8 +48,12 @@ #include "MParList.h" #include "MTaskList.h" + +#include "MGeomCam.h" +#include "MRawRunHeader.h" #include "MHCalibrationCam.h" #include "MCalibrationChargeCam.h" #include "MCalibrationBlindCam.h" +#include "MBadPixelsCam.h" #include "MCalibrationIntensityChargeCam.h" @@ -60,15 +62,9 @@ #include "MCalibrationIntensityRelTimeCam.h" -#include "MBadPixelsIntensityCam.h" - +#include "MCalibrationPattern.h" #include "MCalibrationChargeCam.h" #include "MCalibrationChargeCalc.h" #include "MCalibrationRelTimeCalc.h" -#include "MRawRunHeader.h" -#include "MCalibrationPattern.h" - -#include "MGeomCam.h" - ClassImp(MCalibColorSteer); @@ -81,5 +77,5 @@ MCalibColorSteer::MCalibColorSteer(const char *name, const char *title) : fCalibPattern(NULL), fGeom(NULL), fParList(NULL), - fIntensCharge(NULL), fIntensRelTime(NULL), fIntensBad(NULL), + fIntensCharge(NULL), fIntensRelTime(NULL), fBad(NULL), fChargeCalc(NULL), fRelTimeCalc(NULL), fHistCopy(kFALSE) { @@ -135,33 +131,22 @@ // - // Look for the MBadPixels Intensity Cam - // - fIntensBad = (MBadPixelsIntensityCam*)pList->FindCreateObj("MBadPixelsIntensityCam"); - if (fIntensBad) - *fLog << inf << "Found MBadPixelsIntensityCam ... " << flush; - else - return kFALSE; - - // - // Look for the MBadPixels Intensity Cam + // Look for the MBadPixelsCam // fBad = (MBadPixelsCam*)pList->FindObject("MBadPixelsCam"); - if (fBad) - { - *fLog << inf << "Found also MBadPixelsCam ... " << flush; - fIntensBad->GetCam()->Merge(*fBad); - } - else - return kFALSE; - + if (!fBad) + { + *fLog << err << "MBadPixelsCam not found... abort." << endl; + return kFALSE; + } + // // Look for the MCalibrationIntensityBlindCam // fIntensBlind = (MCalibrationIntensityBlindCam*)pList->FindCreateObj("MCalibrationIntensityBlindCam"); - - if (fIntensBlind) - *fLog << inf << "Found MCalibrationIntensityBlindCam ... " << flush; - else - return kFALSE; + if (!fIntensBlind) + { + *fLog << err << "MCalibrationIntensityBlindCam not found... abort." << endl; + return kFALSE; + } // @@ -341,11 +326,6 @@ TString namep = GetNamePattern(); - if (fIntensBad) - { - fIntensBad->AddToList(Form("MBadPixelsCam%s",namep.Data()),*fGeom); - *fLog << inf << "New MBadPixelsCam with " << namep << endl; - fIntensBad->GetCam()->Merge(*fBad); - *fLog << inf << "Merged new MBadPixelsCam with first of list" << endl; - } + fBad->Clear(); // FIXME:::::: MERGE PreExcl!!!! + if (fIntensCharge) { Index: /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h (revision 8416) +++ /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h (revision 8417) @@ -21,5 +21,4 @@ class MCalibrationIntensityQECam; class MCalibrationIntensityRelTimeCam; -class MBadPixelsIntensityCam; class MBadPixelsCam; @@ -35,5 +34,4 @@ MCalibrationIntensityQECam *fIntensQE; //! MCalibrationIntensityRelTimeCam *fIntensRelTime; //! - MBadPixelsIntensityCam *fIntensBad; //! MBadPixelsCam *fBad; //! Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (revision 8416) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (revision 8417) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.172 2007-04-12 11:47:19 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.173 2007-04-18 15:33:56 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -239,5 +239,4 @@ #include "MExtractedSignalPINDiode.h" -#include "MBadPixelsIntensityCam.h" #include "MBadPixelsCam.h" @@ -364,5 +363,4 @@ fNumProcessed = 0; - fIntensBad = NULL; fBadPixels = NULL; fIntensCam = NULL; @@ -447,5 +445,5 @@ // - MCalibrationIntensityChargeCam or MCalibrationChargeCam // - MCalibrationIntensityQECam or MCalibrationQECam -// - MBadPixelsIntensityCam or MBadPixelsCam +// - MBadPixelsCam // // Search for the following input containers and give a warning if not existing: @@ -535,16 +533,10 @@ *fLog << inf << "No MHCalibrationChargeBlindCam found... no Blind Pixel method!" << endl; - fIntensBad = (MBadPixelsIntensityCam*)pList->FindObject(AddSerialNumber("MBadPixelsIntensityCam")); - if (fIntensBad) - *fLog << inf << "Found MBadPixelsIntensityCam... " << flush; - else - { - fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam")); - if (!fBadPixels) - { - *fLog << err << "Cannot find MBadPixelsCam ... abort." << endl; - return kFALSE; - } - } + fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam")); + if (!fBadPixels) + { + *fLog << err << "Cannot find MBadPixelsCam ... abort." << endl; + return kFALSE; + } // @@ -559,6 +551,4 @@ MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; - MBadPixelsCam *badcam = fIntensBad - ? (MBadPixelsCam*) fIntensBad->GetCam() : fBadPixels; UInt_t npixels = fGeom->GetNumPixels(); @@ -569,5 +559,5 @@ MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; MCalibrationQEPix &pqe = (MCalibrationQEPix&) (*qecam) [i]; - MBadPixelsPix &bad = (*badcam) [i]; + MBadPixelsPix &bad = (*fBadPixels)[i]; if (bad.IsBad()) @@ -750,5 +740,4 @@ MCalibrationQECam *qecam = fIntensQE ? (MCalibrationQECam*) fIntensQE->GetCam() : fQECam; MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; - MBadPixelsCam *badcam = fIntensBad ? (MBadPixelsCam*) fIntensBad->GetCam() : fBadPixels; // @@ -768,5 +757,5 @@ MPedestalPix &ped = (*fPedestals)[pixid]; - MBadPixelsPix &bad = (*badcam) [pixid]; + MBadPixelsPix &bad = (*fBadPixels)[pixid]; const Int_t aidx = (*fGeom)[pixid].GetAidx(); @@ -919,5 +908,5 @@ chargecam->SetReadyToSave(); qecam ->SetReadyToSave(); - badcam ->SetReadyToSave(); + fBadPixels->SetReadyToSave(); if (blindcam) @@ -1158,10 +1147,8 @@ { - MBadPixelsCam *badcam = fIntensBad ? (MBadPixelsCam*)fIntensBad->GetCam() : fBadPixels; - - for (Int_t i=0; iGetSize(); i++) - { - - MBadPixelsPix &bad = (*badcam)[i]; + for (Int_t i=0; iGetSize(); i++) + { + + MBadPixelsPix &bad = (*fBadPixels)[i]; if (IsCheckDeadPixels()) @@ -1238,6 +1225,4 @@ Bool_t MCalibrationChargeCalc::FinalizeFFactorMethod() { - MBadPixelsCam *badcam = fIntensBad - ? (MBadPixelsCam*) fIntensBad->GetCam() : fBadPixels; MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; @@ -1266,5 +1251,6 @@ { MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; - MBadPixelsPix &bad = (*badcam)[i]; + + MBadPixelsPix &bad = (*fBadPixels)[i]; if (!pix.IsFFactorMethodValid()) @@ -1391,5 +1377,5 @@ continue; - MBadPixelsPix &bad = (*badcam)[i]; + MBadPixelsPix &bad = (*fBadPixels)[i]; if (bad.IsUncalibrated(MBadPixelsPix::kChargeSigmaNotValid)) @@ -1526,5 +1512,6 @@ MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; - MBadPixelsPix &bad = (*badcam)[i]; + + MBadPixelsPix &bad = (*fBadPixels)[i]; if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun)) @@ -1734,6 +1721,4 @@ MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; - MBadPixelsCam *badcam = fIntensBad - ? (MBadPixelsCam*) fIntensBad->GetCam() : fBadPixels; MCalibrationChargePix &avpix = (MCalibrationChargePix&)chargecam->GetAverageArea(0); @@ -1785,5 +1770,6 @@ MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; MCalibrationQEPix &qpix = (MCalibrationQEPix&) (*qecam) [i]; - MBadPixelsPix &bad = (*badcam) [i]; + + MBadPixelsPix &bad = (*fBadPixels)[i]; if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun)) @@ -1903,5 +1889,6 @@ MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; - MBadPixelsPix &bad = (*badcam) [i]; + + MBadPixelsPix &bad = (*fBadPixels)[i]; if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun)) @@ -1928,7 +1915,6 @@ MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; MCalibrationQEPix &qpix = (MCalibrationQEPix&) (*qecam) [i]; - MBadPixelsPix &bad = (*badcam) [i]; - - if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun)) + + if ((*fBadPixels)[i].IsUnsuitable(MBadPixelsPix::kUnsuitableRun)) { qpix.SetFFactorMethodValid(kFALSE,fPulserColor); @@ -1964,6 +1950,4 @@ MCalibrationBlindCam *blindcam = fIntensBlind ? (MCalibrationBlindCam*) fIntensBlind->GetCam(): fBlindCam; - MBadPixelsCam *badcam = fIntensBad - ? (MBadPixelsCam*) fIntensBad->GetCam() : fBadPixels; MCalibrationQECam *qecam = fIntensQE ? (MCalibrationQECam*) fIntensQE->GetCam() : fQECam; @@ -2007,5 +1991,5 @@ } - MBadPixelsPix &bad = (*badcam) [i]; + MBadPixelsPix &bad = (*fBadPixels)[i]; if (bad.IsUnsuitable (MBadPixelsPix::kUnsuitableRun)) @@ -2063,6 +2047,4 @@ MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; - MBadPixelsCam *badcam = fIntensBad - ? (MBadPixelsCam*) fIntensBad->GetCam() : fBadPixels; if (!fPINDiode) @@ -2090,5 +2072,5 @@ } - MBadPixelsPix &bad = (*badcam) [i]; + MBadPixelsPix &bad = (*fBadPixels)[i]; if (!bad.IsUnsuitable (MBadPixelsPix::kUnsuitableRun)) @@ -2130,6 +2112,4 @@ MCalibrationQECam *qecam = fIntensQE ? (MCalibrationQECam*) fIntensQE->GetCam() : fQECam; - MBadPixelsCam *badcam = fIntensBad - ? (MBadPixelsCam*) fIntensBad->GetCam() : fBadPixels; for (UInt_t i=0; iGetCam() : fBadPixels; MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; @@ -2176,7 +2154,7 @@ for (Int_t aidx=0; aidxGetNumSuitable(MBadPixelsPix::kUnsuitableRun, fGeom, aidx); - unsuit[aidx] = badcam->GetNumUnsuitable(MBadPixelsPix::kUnsuitableRun, fGeom, aidx); - unrel[aidx] = badcam->GetNumUnsuitable(MBadPixelsPix::kUnreliableRun, fGeom, aidx); + suit[aidx] = fBadPixels->GetNumSuitable(MBadPixelsPix::kUnsuitableRun, fGeom, aidx); + unsuit[aidx] = fBadPixels->GetNumUnsuitable(MBadPixelsPix::kUnsuitableRun, fGeom, aidx); + unrel[aidx] = fBadPixels->GetNumUnsuitable(MBadPixelsPix::kUnreliableRun, fGeom, aidx); unsuitcnt += unsuit[aidx]; @@ -2237,12 +2215,7 @@ UInt_t countouter = 0; - MBadPixelsCam *badcam = fIntensBad - ? (MBadPixelsCam*)fIntensBad->GetCam() : fBadPixels; - - for (Int_t i=0; iGetSize(); i++) - { - MBadPixelsPix &bad = (*badcam)[i]; - - if (bad.IsUncalibrated(typ)) + for (Int_t i=0; iGetSize(); i++) + { + if ((*fBadPixels)[i].IsUncalibrated(typ)) { if (fGeom->GetPixRatio(i) == 1.) Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h (revision 8416) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h (revision 8417) @@ -33,5 +33,4 @@ class MGeomCam; class MExtractedSignalCam; -class MBadPixelsIntensityCam; class MBadPixelsCam; class MExtractor; @@ -85,5 +84,5 @@ // Pointers - MBadPixelsIntensityCam *fIntensBad; //! Bad Pixels +// MBadPixelsIntensityCam *fIntensBad; //! Bad Pixels MBadPixelsCam *fBadPixels; //! Bad Pixels MCalibrationIntensityChargeCam *fIntensCam; //! Intensity Calibration results of all pixels Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc (revision 8416) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc (revision 8417) @@ -75,5 +75,4 @@ #include "MCalibrationRelTimePix.h" -#include "MBadPixelsIntensityCam.h" #include "MBadPixelsCam.h" #include "MBadPixelsPix.h" @@ -124,5 +123,4 @@ { - fIntensBad = NULL; fBadPixels = NULL; fCam = NULL; @@ -136,5 +134,5 @@ // - MGeomCam // - MCalibrationIntensityRelTimeCam or MCalibrationRelTimeCam -// - MBadPixelsIntensityCam or MBadPixelsCam +// - MBadPixelsCam // // It defines the PixId of every pixel in: @@ -156,16 +154,10 @@ } - fIntensBad = (MBadPixelsIntensityCam*)pList->FindObject(AddSerialNumber("MBadPixelsIntensityCam")); - if (fIntensBad) - *fLog << inf << "Found MBadPixelsIntensityCam ... " << endl; - else - { - fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam")); - if (!fBadPixels) - { - *fLog << err << "Cannot find MBadPixelsCam ... abort." << endl; - return kFALSE; - } - } + fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam")); + if (!fBadPixels) + { + *fLog << err << "Cannot find MBadPixelsCam ... abort." << endl; + return kFALSE; + } fIntensCam = (MCalibrationIntensityRelTimeCam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityRelTimeCam")); @@ -187,6 +179,4 @@ MCalibrationRelTimeCam *relcam = fIntensCam ? (MCalibrationRelTimeCam*)fIntensCam->GetCam() : fCam; - MBadPixelsCam *badcam = fIntensBad - ? (MBadPixelsCam*) fIntensBad->GetCam() : fBadPixels; for (UInt_t i=0; iSetReadyToSave(); - if (fIntensBad) - fIntensBad->SetReadyToSave(); - else - fBadPixels->SetReadyToSave(); + fBadPixels->SetReadyToSave(); *fLog << inf << endl; @@ -293,6 +279,4 @@ MCalibrationRelTimeCam *relcam = fIntensCam ? (MCalibrationRelTimeCam*)fIntensCam->GetCam() : fCam; - MBadPixelsCam *badcam = fIntensBad - ? (MBadPixelsCam*) fIntensBad->GetCam() : fBadPixels; const UInt_t npixels = fGeom->GetNumPixels(); @@ -311,5 +295,5 @@ for (UInt_t i=0; iGetCam() : fCam; - MBadPixelsCam *badcam = fIntensBad - ? (MBadPixelsCam*) fIntensBad->GetCam() : fBadPixels; - - for (Int_t i=0; iGetSize(); i++) - { - - MBadPixelsPix &bad = (*badcam)[i]; + + for (Int_t i=0; iGetSize(); i++) + { + MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*relcam)[i]; + + MBadPixelsPix &bad = (*fBadPixels)[i]; if (IsCheckDeviatingBehavior()) @@ -460,5 +443,4 @@ MCalibrationRelTimeCam *relcam = fIntensCam ? (MCalibrationRelTimeCam*)fIntensCam->GetCam() : fCam; - const MBadPixelsCam *badcam = fIntensBad ? (MBadPixelsCam*)fIntensBad->GetCam() : fBadPixels; const Int_t nareas = fGeom->GetNumAreas(); @@ -469,6 +451,6 @@ for (int aidx=0; aidxGetNumUnsuitable(MBadPixelsPix::kUnsuitableRun, fGeom, aidx); - unrel[aidx] += badcam->GetNumUnsuitable(MBadPixelsPix::kUnreliableRun, fGeom, aidx); + unsuit[aidx] += fBadPixels->GetNumUnsuitable(MBadPixelsPix::kUnsuitableRun, fGeom, aidx); + unrel[aidx] += fBadPixels->GetNumUnsuitable(MBadPixelsPix::kUnreliableRun, fGeom, aidx); relcam->SetNumUnsuitable(unsuit[aidx], aidx); relcam->SetNumUnreliable(unrel[aidx], aidx); @@ -488,11 +470,9 @@ void MCalibrationRelTimeCalc::PrintUncalibrated(MBadPixelsPix::UncalibratedType_t typ, const char *text) const { - const MBadPixelsCam *badcam = fIntensBad ? (MBadPixelsCam*)fIntensBad->GetCam() : fBadPixels; - UInt_t countinner = 0; UInt_t countouter = 0; - for (Int_t i=0; iGetSize(); i++) - { - if ((*badcam)[i].IsUncalibrated(typ)) + for (Int_t i=0; iGetSize(); i++) + { + if ((*fBadPixels)[i].IsUncalibrated(typ)) { if (fGeom->GetPixRatio(i) == 1.) Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.h (revision 8416) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.h (revision 8417) @@ -22,5 +22,5 @@ class MCalibrationRelTimeCam; class MGeomCam; -class MBadPixelsIntensityCam; +//class MBadPixelsIntensityCam; class MBadPixelsCam; @@ -35,5 +35,5 @@ // Pointers - MBadPixelsIntensityCam *fIntensBad; // Bad Pixels Intensity Cam + //MBadPixelsIntensityCam *fIntensBad; // Bad Pixels Intensity Cam MBadPixelsCam *fBadPixels; // Bad Pixels MCalibrationIntensityRelTimeCam *fIntensCam; // Calibrated RelTimes for different intensities Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc (revision 8416) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc (revision 8417) @@ -68,5 +68,4 @@ #include "MCalibrationTestPix.h" -#include "MBadPixelsIntensityCam.h" #include "MBadPixelsCam.h" #include "MBadPixelsPix.h" @@ -90,6 +89,5 @@ // MCalibrationTestCalc::MCalibrationTestCalc(const char *name, const char *title) - : fIntensBad(NULL), fBadPixels(NULL), - fTestCam(NULL), fIntensCam(NULL), fCam(NULL), + : fBadPixels(NULL), fTestCam(NULL), fIntensCam(NULL), fCam(NULL), fGeom(NULL) { @@ -112,5 +110,5 @@ // - MHCalibrationTestCam // - MCalibrationIntensityTestCam or MCalibrationTestCam -// - MBadPixelsIntensityCam or MBadPixelsCam +// - MBadPixelsCam // Bool_t MCalibrationTestCalc::ReInit(MParList *pList ) @@ -146,27 +144,11 @@ } - fIntensBad = (MBadPixelsIntensityCam*)pList->FindObject(AddSerialNumber("MBadPixelsIntensityCam")); - if (fIntensBad) - *fLog << inf << "Found MBadPixelsIntensityCam ... " << endl; - else - { - fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam")); - if (!fBadPixels) - { - *fLog << err << "Cannot find MBadPixelsCam ... abort." << endl; - return kFALSE; - } - } - - - return kTRUE; -} - -// ---------------------------------------------------------------------------------- -// -// Nothing to be done in Process, but have a look at MHCalibrationTestCam, instead -// -Int_t MCalibrationTestCalc::Process() -{ + fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam")); + if (!fBadPixels) + { + *fLog << err << "Cannot find MBadPixelsCam ... abort." << endl; + return kFALSE; + } + return kTRUE; } @@ -241,6 +223,4 @@ MCalibrationTestCam *testcam = fIntensCam ? (MCalibrationTestCam*)fIntensCam->GetCam() : fCam; - MBadPixelsCam *badcam = fIntensBad - ? (MBadPixelsCam*) fIntensBad->GetCam() : fBadPixels; TArrayD lowlim (nareas); @@ -409,5 +389,5 @@ << Form("%8.2f out of %3.1f sigma limit: ",nphot,fPhotErrLimit) << Form("[%8.2f,%8.2f] pixel%4i",lowlim[aidx],upplim[aidx],i) << endl; - MBadPixelsPix &bad = (*badcam)[i]; + MBadPixelsPix &bad = (*fBadPixels)[i]; bad.SetUncalibrated( MBadPixelsPix::kDeviatingNumPhots ); bad.SetUnsuitable ( MBadPixelsPix::kUnsuitableRun ); Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.h (revision 8416) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.h (revision 8417) @@ -22,5 +22,4 @@ class MCalibrationIntensityTestCam; class MCalibrationTestCam; -class MBadPixelsIntensityCam; class MBadPixelsCam; class MGeomCam; @@ -39,5 +38,4 @@ // Pointers - MBadPixelsIntensityCam *fIntensBad; //! Bad Pixels MBadPixelsCam *fBadPixels; //! Bad Pixels MHCalibrationTestCam *fTestCam; //! Calibrated Photons in the camera @@ -55,5 +53,4 @@ Bool_t ReInit (MParList *pList); - Int_t Process (); Int_t PostProcess(); Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc (revision 8416) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc (revision 8417) @@ -82,5 +82,4 @@ #include "MCalibrationPix.h" -#include "MBadPixelsIntensityCam.h" #include "MBadPixelsCam.h" #include "MBadPixelsPix.h" @@ -144,6 +143,5 @@ fHistName(gsHistName),fHistTitle(gsHistTitle), fHistXTitle(gsHistXTitle),fHistYTitle(gsHistYTitle), - fCurrentNumEvts(0), - fColor(MCalibrationCam::kNONE), fIntensBad(NULL), + fCurrentNumEvts(0), fColor(MCalibrationCam::kNONE), fBadPixels(NULL), fIntensCam(NULL), fCam(NULL), fGeom(NULL), fRunHeader(NULL) @@ -568,5 +566,4 @@ // // Gets or creates the pointers to: -// - MBadPixelsIntensityCam // - MBadPixelsCam // @@ -606,21 +603,14 @@ const Int_t nareas = fGeom->GetNumAreas(); - fIntensBad = (MBadPixelsIntensityCam*)pList->FindObject(AddSerialNumber("MBadPixelsIntensityCam")); - if (fIntensBad) - *fLog << inf << "Found MBadPixelsIntensityCam ... " << endl; - else - { - fBadPixels = (MBadPixelsCam*)pList->FindObject("MBadPixelsCam"); + fBadPixels = (MBadPixelsCam*)pList->FindObject("MBadPixelsCam"); + if (!fBadPixels) + { + fBadPixels = (MBadPixelsCam*)pList->FindCreateObj(AddSerialNumber("MBadPixelsCam")); if (!fBadPixels) - { - - fBadPixels = (MBadPixelsCam*)pList->FindCreateObj(AddSerialNumber("MBadPixelsCam")); - if (!fBadPixels) - return kFALSE; - - fBadPixels->InitSize(npixels); - } - } - + return kFALSE; + + fBadPixels->InitSize(npixels); + } + if (IsAverageing()) { @@ -644,7 +634,6 @@ for (Int_t i=0; iGetCam() : fBadPixels; - TH1F *h; @@ -450,5 +446,5 @@ pix.SetBinningAbsTime(higainsamples, -0.5, higainsamples-0.5); - InitHists(pix,(*badcam)[i],i); + InitHists(pix,(*fBadPixels)[i], i); h = pix.GetHAbsTime(); @@ -541,7 +537,4 @@ - MBadPixelsCam *badcam = fIntensBad - ? (MBadPixelsCam*) fIntensBad->GetCam() : fBadPixels; - const Int_t logainsamples = fRunHeader->GetNumSamplesLoGain(); @@ -564,5 +557,5 @@ pix.SetBlackoutLimit(fgLoGainBlackoutLimit); - InitHists(pix,(*badcam)[i],i); + InitHists(pix,(*fBadPixels)[i], i); h = pix.GetHAbsTime(); @@ -870,5 +863,4 @@ MCalibrationCam *chargecam = fIntensCam ? fIntensCam->GetCam() : fCam; - MBadPixelsCam *badcam = fIntensBad ? fIntensBad->GetCam() : fBadPixels; const Int_t hifirst = fSignal->GetFirstUsedSliceHiGain(); @@ -899,5 +891,5 @@ } - MBadPixelsPix &bad = (*badcam)[i]; + MBadPixelsPix &bad = (*fBadPixels)[i]; h = histhi.GetHGausHist(); @@ -929,9 +921,9 @@ MHCalibrationChargePix &histlo = (MHCalibrationChargePix&)(*this)(i); - MBadPixelsPix &bad = (*badcam)[i]; if (histlo.IsExcluded()) continue; + MBadPixelsPix &bad = (*fBadPixels)[i]; if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries()) { @@ -1055,5 +1047,5 @@ // Perform the fitting for the High Gain (done in MHCalibrationCam) // - FitHiGainArrays(*chargecam, *badcam, + FitHiGainArrays(*chargecam, *fBadPixels, MBadPixelsPix::kHiGainNotFitted, MBadPixelsPix::kHiGainOscillating); @@ -1063,5 +1055,5 @@ // if (IsLoGain()) - FitLoGainArrays(*chargecam, *badcam, + FitLoGainArrays(*chargecam, *fBadPixels, MBadPixelsPix::kLoGainNotFitted, MBadPixelsPix::kLoGainOscillating); @@ -1090,5 +1082,5 @@ continue; - MBadPixelsPix &bad = (*badcam)[i]; + MBadPixelsPix &bad = (*fBadPixels)[i]; bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun); bad.SetUncalibrated(MBadPixelsPix::kLoGainBlackout); @@ -1151,11 +1143,10 @@ { - MBadPixelsCam *badcam = fIntensBad ? fIntensBad->GetCam() : fBadPixels; MCalibrationCam *chargecam = fIntensCam ? fIntensCam->GetCam() : fCam; - for (Int_t i=0; iGetSize(); i++) + for (Int_t i=0; iGetSize(); i++) { - MBadPixelsPix &bad = (*badcam)[i]; + MBadPixelsPix &bad = (*fBadPixels)[i]; MCalibrationPix &pix = (*chargecam)[i]; Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc (revision 8416) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc (revision 8417) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MHCalibrationHiLoCam.cc,v 1.20 2006-10-19 14:01:49 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MHCalibrationHiLoCam.cc,v 1.21 2007-04-18 15:33:56 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -116,5 +116,4 @@ #include "MGeomPix.h" -#include "MBadPixelsIntensityCam.h" #include "MBadPixelsCam.h" #include "MBadPixelsPix.h" @@ -718,5 +717,4 @@ MCalibrationCam *hilocam = fCam; - MBadPixelsCam *badcam = fIntensBad ? fIntensBad->GetCam() : fBadPixels; const Int_t nareas = fAverageHiGainAreas->GetSize(); @@ -766,5 +764,5 @@ - FitHiGainArrays(*hilocam,*badcam, + FitHiGainArrays(*hilocam, *fBadPixels, MBadPixelsPix::kHiLoNotFitted, MBadPixelsPix::kHiLoOscillating); @@ -843,5 +841,5 @@ } - FitLoGainArrays(*hilocam,*badcam, + FitLoGainArrays(*hilocam, *fBadPixels, MBadPixelsPix::kHiLoNotFitted, MBadPixelsPix::kHiLoOscillating); @@ -859,9 +857,7 @@ { - MBadPixelsCam *badcam = fIntensBad ? fIntensBad->GetCam() : fBadPixels; - - for (Int_t i=0; iGetSize(); i++) - { - MBadPixelsPix &bad = (*badcam)[i]; + for (Int_t i=0; iGetSize(); i++) + { + MBadPixelsPix &bad = (*fBadPixels)[i]; if (bad.IsUncalibrated( MBadPixelsPix::kHiLoNotFitted )) Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc (revision 8416) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc (revision 8417) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.34 2007-03-04 11:55:55 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.35 2007-04-18 15:33:56 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -124,5 +124,4 @@ #include "MHCalibrationPix.h" #include "MCalibrationIntensityCam.h" -#include "MBadPixelsIntensityCam.h" #include "MGeomCam.h" @@ -308,6 +307,5 @@ pix.SetBinning(fNbins, fFirst, fLast); - MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i]; - InitHists(pix,bad,i); + InitHists(pix, (*fBadPixels)[i], i); if (fCam) Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc (revision 8416) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc (revision 8417) @@ -107,5 +107,4 @@ #include "MGeomPix.h" -#include "MBadPixelsIntensityCam.h" #include "MBadPixelsCam.h" #include "MBadPixelsPix.h" @@ -448,5 +447,4 @@ MCalibrationCam *relcam = fIntensCam ? fIntensCam->GetCam() : fCam; - MBadPixelsCam *badcam = fIntensBad ? fIntensBad->GetCam() : fBadPixels; const Int_t nareas = fAverageHiGainAreas->GetSize(); @@ -542,10 +540,10 @@ } - FitHiGainArrays(*relcam,*badcam, + FitHiGainArrays(*relcam, *fBadPixels, MBadPixelsPix::kRelTimeNotFitted, MBadPixelsPix::kRelTimeOscillating); if (IsLoGain()) - FitLoGainArrays(*relcam,*badcam, + FitLoGainArrays(*relcam, *fBadPixels, MBadPixelsPix::kRelTimeNotFitted, MBadPixelsPix::kRelTimeOscillating); @@ -563,9 +561,7 @@ { - MBadPixelsCam *badcam = fIntensBad ? fIntensBad->GetCam() : fBadPixels; - - for (Int_t i=0; iGetSize(); i++) - { - MBadPixelsPix &bad = (*badcam)[i]; + for (Int_t i=0; iGetSize(); i++) + { + MBadPixelsPix &bad = (*fBadPixels)[i]; if (bad.IsUncalibrated( MBadPixelsPix::kRelTimeNotFitted )) Index: /trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.cc (revision 8416) +++ /trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.cc (revision 8417) @@ -104,5 +104,4 @@ #include "MCalibrationPix.h" -#include "MBadPixelsIntensityCam.h" #include "MBadPixelsCam.h" @@ -127,4 +126,5 @@ const TString MHPedestalCam::gsHistYTitle = "Nr. events"; const TString MHPedestalCam::fgNamePedestalCam = "MPedestalCam"; + // -------------------------------------------------------------------------- // @@ -375,6 +375,5 @@ pix.SetProbLimit(fProbLimit); - MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i]; - InitHists(pix,bad,i); + InitHists(pix, (*fBadPixels)[i], i); } } Index: /trunk/MagicSoft/Mars/mjobs/MJCalibration.h =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJCalibration.h (revision 8416) +++ /trunk/MagicSoft/Mars/mjobs/MJCalibration.h (revision 8417) @@ -5,12 +5,6 @@ #include "MJCalib.h" #endif -#ifndef MARS_MCalibrationIntensityChargeCam -#include "MCalibrationIntensityChargeCam.h" -#endif #ifndef MARS_MCalibrationChargeCam #include "MCalibrationChargeCam.h" -#endif -#ifndef MARS_MCalibrationIntensityBlindCam -#include "MCalibrationIntensityBlindCam.h" #endif #ifndef MARS_MCalibrationBlindCam @@ -20,18 +14,9 @@ #include "MCalibrationChargePINDiode.h" #endif -#ifndef MARS_MCalibrationIntensityRelTimeCam -#include "MCalibrationIntensityRelTimeCam.h" -#endif #ifndef MARS_MCalibrationRelTimeCam #include "MCalibrationRelTimeCam.h" #endif -#ifndef MARS_MCalibrationIntensityQECam -#include "MCalibrationIntensityQECam.h" -#endif #ifndef MARS_MCalibrationQECam #include "MCalibrationQECam.h" -#endif -#ifndef MARS_MBadPixelsIntensityCam -#include "MBadPixelsIntensityCam.h" #endif #ifndef MARS_MBadPixelsCam @@ -102,14 +87,9 @@ MExtractTime *fTimeExtractor; // Arrival Time extractor - MBadPixelsIntensityCam fIntensBadCam; // Bad Pixels cam, can be set from previous runs MBadPixelsCam fBadPixels; // Bad Pixels cam, can be set from previous runs - MCalibrationIntensityChargeCam fIntensCalibCam; // Calibration conversion factors FADC2Phe for diff. intens. MCalibrationChargeCam fCalibrationCam; // Calibration conversion factors FADC2Phe - MCalibrationIntensityBlindCam fIntensBlindCam; // Calibration from Blind Pixel(s) MCalibrationBlindCam fCalibrationBlindCam; // Calibration from Blind Pixel(s) MCalibrationChargePINDiode fCalibrationPINDiode; // Calibration from PIN Diode - MCalibrationIntensityQECam fIntensQECam; // Quantum efficiency for diff. intensities, MCalibrationQECam fQECam; // Quantum efficiency, can be set from previous runs - MCalibrationIntensityRelTimeCam fIntensRelTimeCam; // Calibration constants rel. times for diff. intensities MCalibrationRelTimeCam fRelTimeCam; // Calibration constants rel. times @@ -127,5 +107,5 @@ Display_t fDisplayType; // Chosen Display type - enum { kRelTimes, kDebug, kIntensity }; // Possible flags + enum { kRelTimes, kDebug }; // Possible flags Byte_t fFlags; // Bit-field for the flags @@ -135,5 +115,4 @@ Bool_t IsRelTimes () const { return TESTBIT(fFlags,kRelTimes); } Bool_t IsDebug () const { return TESTBIT(fFlags,kDebug); } - Bool_t IsIntensity () const { return TESTBIT(fFlags,kIntensity); } void DrawTab(MParList &plist, const char *cont, const char *name, Option_t *opt); @@ -162,14 +141,9 @@ public: MJCalibration(const char *name=NULL, const char *title=NULL); - - MCalibrationIntensityChargeCam &GetIntensCalibrationCam() { return fIntensCalibCam; } - MCalibrationIntensityRelTimeCam &GetIntensRelTimeCam() { return fIntensRelTimeCam; } - MCalibrationIntensityQECam &GetIntensQECam() { return fIntensQECam; } - MBadPixelsIntensityCam &GetIntensBadCam() { return fIntensBadCam; } - MCalibrationChargeCam &GetCalibrationCam() { return fCalibrationCam; } - MCalibrationRelTimeCam &GetRelTimeCam() { return fRelTimeCam; } - MCalibrationQECam &GetQECam() { return fQECam; } - MBadPixelsCam &GetBadPixels() { return fBadPixels; } + const MCalibrationChargeCam &GetCalibrationCam() const { return fCalibrationCam; } + const MCalibrationRelTimeCam &GetRelTimeCam() const { return fRelTimeCam; } + const MCalibrationQECam &GetQECam() const { return fQECam; } + const MBadPixelsCam &GetBadPixels() const { return fBadPixels; } // Containers and pointers @@ -192,5 +166,5 @@ void SetRelTimeCalibration( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kRelTimes) : CLRBIT(fFlags,kRelTimes); } void SetDebug ( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kDebug) : CLRBIT(fFlags,kDebug); } - void SetIntensity ( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kIntensity) : CLRBIT(fFlags,kIntensity); } + //void SetIntensity ( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kIntensity) : CLRBIT(fFlags,kIntensity); } // Files