Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 8424) +++ /trunk/MagicSoft/Mars/Changelog (revision 8425) @@ -43,4 +43,21 @@ - removed the obsolete definition of kItemsLegend + * mbadpixels/MBadPixelsIntensityCam.cc, mcalib/MCalibrationIntensityCam.cc: + - removed obsolete reference in comment to MCalibrationINtensityQECam + + * mcalib/CalibLinkDef.h, mcalib/Makefile, mjobs/MJCalibrateSignal.cc: + - removed obsolete MCalibrationIntensityQECam + + * mcalib/MCalibCalcFromPast.[h,cc], mcalib/MCalibColorSteer.[h,cc], + mcalib/MCalibrateData.[h,cc]: + - replaced data member fIntensQE by fQECam + - removed references to obsolete MCalibrationIntensityQECam + - added some comments + + * mcalib/MCalibrationChargeCalc.[h,cc]: + - replaced references to fIntensQE by direct access to fQECam + - adde some comments + - removed data member fIntensQECam + Index: /trunk/MagicSoft/Mars/NEWS =================================================================== --- /trunk/MagicSoft/Mars/NEWS (revision 8424) +++ /trunk/MagicSoft/Mars/NEWS (revision 8425) @@ -24,6 +24,6 @@ for further simplification - - callisto: for simplification removed references to MBadPixelsIntensityCam, - this also removes support for previously excluded pixels (TO BE FIXED) + - callisto: for simplification removed references to MBadPixelsIntensityCam + and MCalibrationIntensityQECam, - callisto: Added the option to write an event movie. Please use Index: /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsIntensityCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsIntensityCam.cc (revision 8424) +++ /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsIntensityCam.cc (revision 8425) @@ -23,18 +23,16 @@ \* ======================================================================== */ ///////////////////////////////////////////////////////////////////////////// -// -// MBadPixelsIntensityCam -// -// Base class for intensity calibration results +// +// MBadPixelsIntensityCam +// +// Base class for intensity calibration results // // Contains TClonesArrays for the following objects: -// - fCams: Array of classes derived from MBadPixelsCam, one entry +// - fCams: Array of classes derived from MBadPixelsCam, one entry // per calibration camera result. Has to be created // -// See also: MCalibrationIntensityChargeCam, MCalibrationIntensityQECam, -// MCalibrationIntensityRelTimeCam, -// MCalibrationCam, MCalibrationPix, -// MCalibrationQECam, MCalibrationQEPix, -// MHCalibrationChargePix, MHCalibrationChargeCam +// See also: MCalibrationIntensityChargeCam, MCalibrationIntensityRelTimeCam, +// MCalibrationCam, MCalibrationPix, +// MHCalibrationChargePix, MHCalibrationChargeCam // MCalibrationChargeBlindPix, MCalibrationChargePINDiode // Index: /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h (revision 8424) +++ /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h (revision 8425) @@ -20,5 +20,4 @@ #pragma link C++ class MCalibrationIntensityChargeCam+; #pragma link C++ class MCalibrationIntensityBlindCam+; -#pragma link C++ class MCalibrationIntensityQECam+; #pragma link C++ class MCalibrationIntensityRelTimeCam+; #pragma link C++ class MCalibrationIntensityTestCam+; Index: /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc (revision 8424) +++ /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc (revision 8425) @@ -59,9 +59,10 @@ #include "MCalibrationIntensityChargeCam.h" #include "MCalibrationIntensityBlindCam.h" -#include "MCalibrationIntensityQECam.h" //#include "MCalibrationIntensityRelTimeCam.h" #include "MBadPixelsCam.h" +#include "MCalibrationQECam.h" +#include "MCalibrationQEPix.h" #include "MCalibrationChargePix.h" #include "MCalibrationChargeCalc.h" @@ -126,5 +127,5 @@ // - // Look for the MBadPixels Intensity Cam + // Look for the MBadPixels Cam // fBadPixels = (MBadPixelsCam*)pList->FindObject("MBadPixelsCam"); @@ -132,4 +133,14 @@ { *fLog << err << "MBadPixelsCam not found... abort." << endl; + return kFALSE; + } + + // + // Look for the MBadPixels Intensity Cam + // + fQECam = (MCalibrationQECam*)pList->FindObject("MCalibrationQECam"); + if (!fQECam) + { + *fLog << err << "MCalibrationQECam not found... abort." << endl; return kFALSE; } @@ -160,13 +171,8 @@ fIntensCharge = (MCalibrationIntensityChargeCam*)pList->FindCreateObj("MCalibrationIntensityChargeCam"); - fIntensQE = (MCalibrationIntensityQECam*) pList->FindCreateObj("MCalibrationIntensityQECam"); - if (!fIntensCharge) return kFALSE; - if (!fIntensQE) - return kFALSE; MCalibrationChargeCam *chargeinit = (MCalibrationChargeCam*)pList->FindObject("MCalibrationChargeCam"); - MCalibrationQECam *qeinit = (MCalibrationQECam*) pList->FindObject("MCalibrationQECam"); if (chargeinit) @@ -174,9 +180,4 @@ else *fLog << "Could not find initial MCalibrationChargeCam, cannot initialize intensity cam" << endl; - - if (qeinit) - fIntensQE->SetCam(qeinit,0); - else - *fLog << "Could not find initial MCalibrationQECam, cannot initialize intensity cam" << endl; if (!fChargeCalc) @@ -386,4 +387,12 @@ *fLog << "MBadPixelsCam..."; fBadPixels->Clear(); // FIXME:::::: MERGE PreExcl!!!! + // IS IT REALLY NECESSARY? + + *fLog << "MCalibrationQECam..."; + fQECam->Clear(); + fQECam->SetRunNumber(runnumber); + // IS IT REALLY NECESSARY? + + // IF SIMPLE ENOUGH, REMOVE THE FUNCTION! if (fIntensCharge) @@ -404,13 +413,4 @@ } - if (fIntensQE) - { - *fLog << "MCalibrationQECam..."; - MCalibrationCam *cold = fIntensQE->GetCam(); - fIntensQE->AddToList(Form("MCalibrationQECam%04d",fNumCam),*fGeom); - fIntensQE->GetCam()->SetRunNumber(runnumber); - if (cold) - fIntensQE->DeleteOldCam(cold); - } if (fIntensBlind) { Index: /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h (revision 8424) +++ /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h (revision 8425) @@ -19,5 +19,5 @@ class MCalibrationIntensityChargeCam; class MCalibrationIntensityBlindCam; -class MCalibrationIntensityQECam; +class MCalibrationQECam; class MBadPixelsCam; @@ -34,7 +34,7 @@ MCalibrationIntensityChargeCam *fIntensCharge; //! Intensity Charge Cam (to be created) MCalibrationIntensityBlindCam *fIntensBlind; //! Intensity Blind Cam (to be created) - MCalibrationIntensityQECam *fIntensQE; //! Intensity QE Cam (to be created) - MBadPixelsCam *fBadPixels; + MCalibrationQECam *fQECam; //! QE Cam + MBadPixelsCam *fBadPixels; //! Bad Pixels Cam MCalibrationChargeCalc *fChargeCalc; //! Charge Calibration Task Index: /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc (revision 8424) +++ /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc (revision 8425) @@ -59,8 +59,8 @@ #include "MCalibrationIntensityChargeCam.h" #include "MCalibrationIntensityBlindCam.h" -#include "MCalibrationIntensityQECam.h" #include "MCalibrationIntensityRelTimeCam.h" #include "MCalibrationPattern.h" +#include "MCalibrationQECam.h" #include "MCalibrationChargeCam.h" #include "MCalibrationChargeCalc.h" @@ -156,31 +156,22 @@ if (pList->FindObject(AddSerialNumber("MHCalibrationChargeCam"))) { - - fIntensCharge = (MCalibrationIntensityChargeCam*)pList->FindCreateObj("MCalibrationIntensityChargeCam"); - fIntensQE = (MCalibrationIntensityQECam*) pList->FindCreateObj("MCalibrationIntensityQECam"); - - fChargeCalc = (MCalibrationChargeCalc*)tlist->FindObject("MCalibrationChargeCalc"); - - *fLog << inf << "Found MHCalibrationChargeCam ... " << flush; - - if (!fIntensCharge) + *fLog << inf << "Found MHCalibrationChargeCam ... " << flush; + + fIntensCharge = (MCalibrationIntensityChargeCam*)pList->FindCreateObj("MCalibrationIntensityChargeCam"); + if (!fIntensCharge) + return kFALSE; + + fQECam = (MCalibrationQECam*)pList->FindCreateObj("MCalibrationQECam"); + if (!fQECam) + return kFALSE; + + fChargeCalc = (MCalibrationChargeCalc*)tlist->FindObject("MCalibrationChargeCalc"); + if (!fChargeCalc) { - *fLog << err << "Could not find nor create MCalibrationIntensityChargeCam abort... " << endl; - return kFALSE; - } - - if (!fIntensQE) - { - *fLog << err << "Could not find nor create MCalibrationIntensityQECam abort... " << endl; - return kFALSE; - } - - if (!fChargeCalc) - { - *fLog << err << "Could not find MCalibrationChargeCalc abort... " << endl; - return kFALSE; + *fLog << err << "Could not find MCalibrationChargeCalc abort... " << endl; + return kFALSE; } } - + // // Look for the MFillH name "FillRelTimeCam". In case yes, initialize the @@ -327,4 +318,5 @@ fBad->Clear(); // FIXME:::::: MERGE PreExcl!!!! + fQECam->Clear(); if (fIntensCharge) @@ -337,9 +329,4 @@ return kFALSE; *fLog << inf << "New MCalibrationChargeCam with name: " << cam->GetName() << endl; - } - if (fIntensQE) - { - fIntensQE->AddToList(Form("MCalibrationQECam%s",namep.Data()),*fGeom); - *fLog << inf << "New MCalibrationQECam with: " << namep << endl; } Index: /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h (revision 8424) +++ /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h (revision 8425) @@ -19,6 +19,6 @@ class MCalibrationIntensityChargeCam; class MCalibrationIntensityBlindCam; -class MCalibrationIntensityQECam; class MCalibrationIntensityRelTimeCam; +class MCalibrationQECam; class MBadPixelsCam; @@ -32,6 +32,6 @@ MCalibrationIntensityChargeCam *fIntensCharge; //! MCalibrationIntensityBlindCam *fIntensBlind; //! - MCalibrationIntensityQECam *fIntensQE; //! MCalibrationIntensityRelTimeCam *fIntensRelTime; //! + MCalibrationQECam *fQECam; //! MBadPixelsCam *fBad; //! Index: /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc (revision 8424) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc (revision 8425) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.66 2007-04-17 12:39:14 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.67 2007-04-20 11:48:08 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -118,5 +118,4 @@ #include "MCalibrationChargePix.h" -#include "MCalibrationIntensityQECam.h" #include "MCalibrationQECam.h" #include "MCalibrationQEPix.h" @@ -157,5 +156,5 @@ MCalibrateData::MCalibrateData(CalibrationMode_t calmode,const char *name, const char *title) : fGeomCam(NULL), fBadPixels(NULL), fCalibrations(NULL), fIntensCalib(NULL), - fQEs(NULL), fIntensQE(NULL), fSignals(NULL), fCerPhotEvt(NULL), fCalibConstCam(NULL), + fQEs(NULL), fSignals(NULL), fCerPhotEvt(NULL), fCalibConstCam(NULL), fPedestalFlag(kNo), fSignalType(kPhot), fRenormFactor(1.), fScaleFactor(1.) { @@ -249,8 +248,4 @@ return kFALSE; } - - fIntensQE = (MCalibrationIntensityQECam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityQECam")); - if (fIntensQE) - *fLog << inf << "Found MCalibrationIntensityQECam ... " << endl; fQEs = (MCalibrationQECam*)pList->FindObject(AddSerialNumber("MCalibrationQECam")); @@ -370,6 +365,5 @@ } - const MCalibrationQECam *qecam = fIntensQE ? (MCalibrationQECam*)fIntensQE->GetCam() : fQEs; - if(fCalibrationMode == kBlindPixel && !qecam->IsBlindPixelMethodValid()) + if(fCalibrationMode == kBlindPixel && !fQEs->IsBlindPixelMethodValid()) { *fLog << warn << "Blind pixel calibration method not valid, switching to F-factor method" << endl; @@ -377,5 +371,5 @@ } - if(fCalibrationMode == kPinDiode && !qecam->IsPINDiodeMethodValid()) + if(fCalibrationMode == kPinDiode && !fQEs->IsPINDiodeMethodValid()) { *fLog << warn << "PIN diode calibration method not valid, switching to F-factor method" << endl; @@ -383,5 +377,5 @@ } - if(fCalibrationMode == kCombined && !qecam->IsCombinedMethodValid()) + if(fCalibrationMode == kCombined && !fQEs->IsCombinedMethodValid()) { *fLog << warn << "Combined calibration method not valid, switching to F-factor method" << endl; @@ -520,15 +514,8 @@ MCalibrationChargeCam *chargecam = NULL; - MCalibrationQECam *qecam = NULL; if (updatecam) - { chargecam = fCalibrations; - qecam = fQEs; - } else - { chargecam = fIntensCalib ? (MCalibrationChargeCam*)fIntensCalib->GetCam() : fCalibrations; - qecam = fIntensQE ? (MCalibrationQECam*) fIntensQE->GetCam() : fQEs; - } // @@ -569,5 +556,5 @@ calibFFactor = pix.GetMeanFFactorFADC2Phot(); - const MCalibrationQEPix &qe = (MCalibrationQEPix&)(*qecam)[pixidx]; + const MCalibrationQEPix &qe = (MCalibrationQEPix&)(*fQEs)[pixidx]; if (updatecam) Index: /trunk/MagicSoft/Mars/mcalib/MCalibrateData.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrateData.h (revision 8424) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrateData.h (revision 8425) @@ -22,5 +22,4 @@ class MCalibrationIntensityChargeCam; -class MCalibrationIntensityQECam; class MCalibrateData : public MTask @@ -66,5 +65,4 @@ MCalibrationIntensityChargeCam *fIntensCalib; //! Calibration constants from interlaced calib. MCalibrationQECam *fQEs; //! Quantum efficiencies - MCalibrationIntensityQECam *fIntensQE; //! Quantum efficiencies from interlaced calib. MExtractedSignalCam *fSignals; //! Integrated charge in FADCs counts MSignalCam *fCerPhotEvt; //! Cerenkov Photon Event used for calculation Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (revision 8424) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (revision 8425) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.174 2007-04-20 08:55:18 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.175 2007-04-20 11:48:08 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -222,5 +222,4 @@ #include "MCalibrationIntensityChargeCam.h" -#include "MCalibrationIntensityQECam.h" #include "MCalibrationIntensityBlindCam.h" @@ -367,5 +366,4 @@ fCam = NULL; fHCam = NULL; - fIntensQE = NULL; fQECam = NULL; fIntensBlind = NULL; @@ -433,4 +431,5 @@ } + // Obsolete... it is already set in the constructor isn't it? fPulserColor = MCalibrationCam::kNONE; @@ -444,5 +443,5 @@ // - MGeomCam // - MCalibrationIntensityChargeCam or MCalibrationChargeCam -// - MCalibrationIntensityQECam or MCalibrationQECam +// - MCalibrationQECam // - MBadPixelsCam // @@ -476,4 +475,7 @@ { + // + // Geometry + // fGeom = (MGeomCam*)pList->FindObject("MGeomCam"); if (!fGeom) @@ -482,5 +484,19 @@ return kFALSE; } - + + // + // Charge histogram + // + fHCam = (MHCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MHCalibrationChargeCam")); + if (!fHCam) + { + *fLog << err << "Cannot find MHCalibrationChargeCam ... abort." << endl; + *fLog << "Maybe you forget to call an MFillH for the MHCalibrationChargeCam before..." << endl; + return kFALSE; + } + + // + // Intensity containers + // fIntensCam = (MCalibrationIntensityChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityChargeCam")); if (fIntensCam) @@ -497,26 +513,4 @@ } - fHCam = (MHCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MHCalibrationChargeCam")); - if (!fHCam) - { - *fLog << err << "Cannot find MHCalibrationChargeCam ... abort." << endl; - *fLog << "Maybe you forget to call an MFillH for the MHCalibrationChargeCam before..." << endl; - return kFALSE; - } - - fIntensQE = (MCalibrationIntensityQECam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityQECam")); - if (fIntensQE) - *fLog << inf << "Found MCalibrationIntensityQECam... " << flush; - else - { - fQECam = (MCalibrationQECam*)pList->FindObject(AddSerialNumber("MCalibrationQECam")); - if (!fQECam) - { - *fLog << err << "Cannot find MCalibrationQECam ... abort." << endl; - *fLog << "Maybe you forget to call an MFillH for the MHCalibrationQECam before..." << endl; - return kFALSE; - } - } - fIntensBlind = (MCalibrationIntensityBlindCam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityBlindCam")); if (fIntensBlind) @@ -528,8 +522,14 @@ *fLog << inf << "No MCalibrationBlindCam found... no Blind Pixel method!" << endl; } - - fHBlindCam = (MHCalibrationChargeBlindCam*)pList->FindObject(AddSerialNumber("MHCalibrationChargeBlindCam")); - if (!fHBlindCam) - *fLog << inf << "No MHCalibrationChargeBlindCam found... no Blind Pixel method!" << endl; + + // + // Required containers + // + fQECam = (MCalibrationQECam*)pList->FindObject(AddSerialNumber("MCalibrationQECam")); + if (!fQECam) + { + *fLog << err << "Cannot find MCalibrationQECam ... abort." << endl; + return kFALSE; + } fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam")); @@ -546,26 +546,31 @@ if (!fPINDiode) *fLog << inf << "No MCalibrationChargePINDiode found... no PIN Diode method!" << endl; - - MCalibrationQECam *qecam = fIntensQE - ? (MCalibrationQECam*) fIntensQE->GetCam() : fQECam; + + fHBlindCam = (MHCalibrationChargeBlindCam*)pList->FindObject(AddSerialNumber("MHCalibrationChargeBlindCam")); + if (!fHBlindCam) + *fLog << inf << "No MHCalibrationChargeBlindCam found... no Blind Pixel method!" << endl; + + + // + // Further initialization + // MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; - UInt_t npixels = fGeom->GetNumPixels(); + const UInt_t npixels = fGeom->GetNumPixels(); for (UInt_t i=0; iGetPulserColor(); + + // + // If pulser color didn't change there is nothing to do + // const Float_t strength = fCalibPattern->GetPulserStrength(); const Float_t strdiff = TMath::Abs(strength-fStrength); - if (col == fPulserColor && strdiff < 0.05 ) { @@ -593,8 +601,10 @@ return kTRUE; } - + + // + // If there is no color is nothing to do + // if (col == MCalibrationCam::kNONE) return kTRUE; - // @@ -627,10 +637,13 @@ } } - + + // + // Keep pulser color and strength in mind and output some information + // fPulserColor = col; fStrength = strength; *fLog << inf << "Found new colour ... " << flush; - + switch (col) { @@ -644,4 +657,7 @@ *fLog << inf << " with strength: " << strength << endl; + // + // Distribute new color to all containers + // fHCam->SetColor(col); if (fHBlindCam) @@ -660,4 +676,7 @@ fPINDiode->SetColor(col); + // + // Reset number of processed events + // fNumProcessed = 0; @@ -738,5 +757,4 @@ MCalibrationBlindCam *blindcam = fIntensBlind ? (MCalibrationBlindCam*) fIntensBlind->GetCam() : fBlindCam; - MCalibrationQECam *qecam = fIntensQE ? (MCalibrationQECam*) fIntensQE->GetCam() : fQECam; MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; @@ -844,10 +862,10 @@ // Finalize Blind Pixel // - qecam->SetBlindPixelMethodValid(FinalizeBlindCam()); + fQECam->SetBlindPixelMethodValid(FinalizeBlindCam()); // // Finalize PIN Diode // - qecam->SetBlindPixelMethodValid(FinalizePINDiode()); + fQECam->SetBlindPixelMethodValid(FinalizePINDiode()); // @@ -907,5 +925,5 @@ chargecam->SetReadyToSave(); - qecam ->SetReadyToSave(); + fQECam ->SetReadyToSave(); fBadPixels->SetReadyToSave(); @@ -1720,11 +1738,9 @@ } - MCalibrationQECam *qecam = fIntensQE - ? (MCalibrationQECam*) fIntensQE->GetCam() : fQECam; MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; MCalibrationChargePix &avpix = (MCalibrationChargePix&)chargecam->GetAverageArea(0); - MCalibrationQEPix &qepix = (MCalibrationQEPix&) qecam->GetAverageArea(0); + MCalibrationQEPix &qepix = (MCalibrationQEPix&) fQECam->GetAverageArea(0); if (IsDebug()) @@ -1738,5 +1754,5 @@ / qepix.GetPMTCollectionEff() / qepix.GetLightGuidesEff(fPulserColor) - / qecam->GetPlexiglassQE(); + / fQECam->GetPlexiglassQE(); const Float_t avphotrelvar = ( IsUseExternalNumPhes() @@ -1746,5 +1762,5 @@ + qepix.GetPMTCollectionEffRelVar() + qepix.GetLightGuidesEffRelVar(fPulserColor) - + qecam->GetPlexiglassQERelVar(); + + fQECam->GetPlexiglassQERelVar(); const UInt_t nareas = fGeom->GetNumAreas(); @@ -1772,5 +1788,5 @@ MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; - MCalibrationQEPix &qpix = (MCalibrationQEPix&) (*qecam) [i]; + MCalibrationQEPix &qpix = (MCalibrationQEPix&) (*fQECam) [i]; MBadPixelsPix &bad = (*fBadPixels)[i]; @@ -1788,5 +1804,5 @@ qpix.SetFFactorMethodValid( kTRUE , fPulserColor ); - if (!qpix.UpdateFFactorMethod( qecam->GetPlexiglassQE() )) + if (!qpix.UpdateFFactorMethod( fQECam->GetPlexiglassQE() )) *fLog << warn << GetDescriptor() << ": Cannot update Quantum efficiencies with the F-Factor Method" << endl; @@ -1917,5 +1933,5 @@ MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i]; - MCalibrationQEPix &qpix = (MCalibrationQEPix&) (*qecam) [i]; + MCalibrationQEPix &qpix = (MCalibrationQEPix&) (*fQECam) [i]; if ((*fBadPixels)[i].IsUnsuitable(MBadPixelsPix::kUnsuitableRun)) @@ -1953,6 +1969,4 @@ MCalibrationBlindCam *blindcam = fIntensBlind ? (MCalibrationBlindCam*) fIntensBlind->GetCam(): fBlindCam; - MCalibrationQECam *qecam = fIntensQE - ? (MCalibrationQECam*) fIntensQE->GetCam() : fQECam; MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; @@ -1968,9 +1982,9 @@ const Float_t photons = blindcam->GetFluxInsidePlexiglass() * (*fGeom)[0].GetA() - / qecam->GetPlexiglassQE(); + / fQECam->GetPlexiglassQE(); chargecam->SetNumPhotonsBlindPixelMethod(photons); const Float_t photrelvar = blindcam->GetFluxInsidePlexiglassRelVar() - + qecam->GetPlexiglassQERelVar(); + + fQECam->GetPlexiglassQERelVar(); if (photrelvar > 0.) @@ -1986,5 +2000,5 @@ { - MCalibrationQEPix &qepix = (MCalibrationQEPix&) (*qecam) [i]; + MCalibrationQEPix &qepix = (MCalibrationQEPix&)(*fQECam)[i]; if (!blindcam || !(blindcam->IsFluxInsidePlexiglassAvailable())) @@ -2008,8 +2022,8 @@ / blindcam->GetFluxInsidePlexiglass() / geo.GetA() - * qecam->GetPlexiglassQE(); + * fQECam->GetPlexiglassQE(); const Float_t qerelvar = blindcam->GetFluxInsidePlexiglassRelVar() - + qecam->GetPlexiglassQERelVar() + + fQECam->GetPlexiglassQERelVar() + pix.GetPheFFactorMethodRelVar(); @@ -2018,5 +2032,5 @@ qepix.SetBlindPixelMethodValid( kTRUE , fPulserColor ); - if (!qepix.UpdateBlindPixelMethod( qecam->GetPlexiglassQE())) + if (!qepix.UpdateBlindPixelMethod( fQECam->GetPlexiglassQE())) *fLog << warn << GetDescriptor() << ": Cannot update Quantum efficiencies with the Blind Pixel Method" << endl; @@ -2046,6 +2060,4 @@ const UInt_t npixels = fGeom->GetNumPixels(); - MCalibrationQECam *qecam = fIntensQE - ? (MCalibrationQECam*) fIntensQE->GetCam() : fQECam; MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; @@ -2061,5 +2073,5 @@ { - MCalibrationQEPix &qepix = (MCalibrationQEPix&) (*qecam) [i]; + MCalibrationQEPix &qepix = (MCalibrationQEPix&)(*fQECam)[i]; if (!fPINDiode) @@ -2113,11 +2125,8 @@ const UInt_t npixels = fGeom->GetNumPixels(); - MCalibrationQECam *qecam = fIntensQE - ? (MCalibrationQECam*) fIntensQE->GetCam() : fQECam; - for (UInt_t i=0; i