Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 8426) +++ trunk/MagicSoft/Mars/Changelog (revision 8427) @@ -46,6 +46,7 @@ - removed obsolete reference in comment to MCalibrationINtensityQECam - * mcalib/CalibLinkDef.h, mcalib/Makefile, mjobs/MJCalibrateSignal.cc: + * mcalib/CalibLinkDef.h, mcalib/Makefile: - removed obsolete MCalibrationIntensityQECam + - removed obsolete MCalibrationIntensityBlindCam * mcalib/MCalibCalcFromPast.[h,cc], mcalib/MCalibColorSteer.[h,cc], @@ -54,4 +55,6 @@ - removed references to obsolete MCalibrationIntensityQECam - added some comments + - replaced obsolete reference to MCalibrationIntensityBlindCam + by reference to MCalibrationBlindCam * mcalib/MCalibrationChargeCalc.[h,cc]: @@ -59,4 +62,13 @@ - adde some comments - removed data member fIntensQECam + - replaced obsoilete reference to MCalibrationIntensityBlindCam + by reference to MCalibrationBlindCam + + * mjobs/MJCalibrateSignal.cc, mhcalib/MHCalibrationChargeBlindCam.cc: + - removed obsolete references to MCalibrationIntensityQECam + - removed obsolete references to MCalibrationIntensityBlindCam + + * mbase/MTask.cc: + - added some unexecuted code to debug which taks are processed Index: trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h (revision 8426) +++ trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h (revision 8427) @@ -19,5 +19,4 @@ #pragma link C++ class MCalibrationIntensityCam+; #pragma link C++ class MCalibrationIntensityChargeCam+; -#pragma link C++ class MCalibrationIntensityBlindCam+; #pragma link C++ class MCalibrationIntensityRelTimeCam+; #pragma link C++ class MCalibrationIntensityTestCam+; Index: trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc (revision 8426) +++ trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc (revision 8427) @@ -58,5 +58,4 @@ #include "MCalibrationIntensityChargeCam.h" -#include "MCalibrationIntensityBlindCam.h" //#include "MCalibrationIntensityRelTimeCam.h" @@ -64,5 +63,5 @@ #include "MCalibrationQECam.h" -#include "MCalibrationQEPix.h" +#include "MCalibrationBlindCam.h" #include "MCalibrationChargePix.h" #include "MCalibrationChargeCalc.h" @@ -87,6 +86,6 @@ MCalibCalcFromPast::MCalibCalcFromPast(const char *name, const char *title) : fGeom(NULL), fParList(NULL), fRunHeader(NULL), - fIntensCharge(NULL), fIntensBlind(NULL), - fChargeCalc(NULL), fRelTimeCalc(NULL), fCalibrate(NULL), + fIntensCharge(NULL), fBlindCam(NULL), fQECam(NULL), fBadPixels(NULL), + fChargeCalc(NULL), fRelTimeCalc(NULL), fCalibrate(NULL), fNumCam(0), fNumEvents(0), fUpdateWithFFactorMethod(kTRUE), fUpdateNumPhes(kTRUE), fNumFails(0) @@ -152,16 +151,12 @@ if (pList->FindObject(AddSerialNumber("MHCalibrationBlindCam"))) { - - *fLog << inf << "Found MHCalibrationBlindCam ... " << flush; - - fIntensBlind = (MCalibrationIntensityBlindCam*)pList->FindCreateObj("MCalibrationIntensityBlindCam"); - if (!fIntensBlind) - { - *fLog << err << "Could not find nor create MCalibrationIntensitBlindCam abort... " << endl; - return kFALSE; - } - } - - // + *fLog << inf << "Found MHCalibrationBlindCam ... " << flush; + + fBlindCam = (MCalibrationBlindCam*)pList->FindCreateObj("MCalibrationBlindCam"); + if (!fBlindCam) + return kFALSE; + } + + // // Look for the MFillH-class "MHCalibrationChargeCam". In case yes, initialize the // corresponding IntensityCam @@ -394,4 +389,12 @@ // IS IT REALLY NECESSARY? + if (fBlindCam) + { + *fLog << "MCalibrationBlindCam..."; + fBlindCam->Clear(); + fBlindCam->SetRunNumber(runnumber); + } + // IS IT REALLY NECESSARY? + // IF SIMPLE ENOUGH, REMOVE THE FUNCTION! @@ -411,14 +414,4 @@ fIntensCharge->DeleteOldCam(cold); } - } - - if (fIntensBlind) - { - *fLog << "MCalibrationBlindCam..."; - MCalibrationCam *cold = fIntensBlind->GetCam(); - fIntensBlind->AddToList(Form("MCalibrationBlindCam%04d",fNumCam),*fGeom); - fIntensBlind->GetCam()->SetRunNumber(runnumber); - if (cold) - fIntensBlind->DeleteOldCam(cold); } Index: trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h (revision 8426) +++ trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h (revision 8427) @@ -18,5 +18,5 @@ class MCalibrateData; class MCalibrationIntensityChargeCam; -class MCalibrationIntensityBlindCam; +class MCalibrationBlindCam; class MCalibrationQECam; @@ -33,6 +33,6 @@ MRawRunHeader *fRunHeader; //! Run header storing the run number MCalibrationIntensityChargeCam *fIntensCharge; //! Intensity Charge Cam (to be created) - MCalibrationIntensityBlindCam *fIntensBlind; //! Intensity Blind Cam (to be created) + MCalibrationBlindCam *fBlindCam; //! Blind Cam MCalibrationQECam *fQECam; //! QE Cam MBadPixelsCam *fBadPixels; //! Bad Pixels Cam Index: trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc (revision 8426) +++ trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc (revision 8427) @@ -58,9 +58,9 @@ #include "MCalibrationIntensityChargeCam.h" -#include "MCalibrationIntensityBlindCam.h" #include "MCalibrationIntensityRelTimeCam.h" #include "MCalibrationPattern.h" #include "MCalibrationQECam.h" +#include "MCalibrationBlindCam.h" #include "MCalibrationChargeCam.h" #include "MCalibrationChargeCalc.h" @@ -141,13 +141,10 @@ // - // Look for the MCalibrationIntensityBlindCam - // - fIntensBlind = (MCalibrationIntensityBlindCam*)pList->FindCreateObj("MCalibrationIntensityBlindCam"); - if (!fIntensBlind) - { - *fLog << err << "MCalibrationIntensityBlindCam not found... abort." << endl; - return kFALSE; - } - + // Look for the MCalibrationBlindCam + // + fBlindCam = (MCalibrationBlindCam*)pList->FindCreateObj("MCalibrationBlindCam"); + if (!fBlindCam) + return kFALSE; + // // Look for the MFillH name "FillChargeCam". In case yes, initialize the @@ -320,4 +317,7 @@ fQECam->Clear(); + fBlindCam->Clear(); + fBlindCam->SetPulserColor(fCalibPattern->GetPulserColor()); + if (fIntensCharge) { @@ -331,12 +331,4 @@ } - if (fIntensBlind) - { - fIntensBlind->AddToList(Form("MCalibrationBlindCam%s",namep.Data()),*fGeom); - MCalibrationCam *cam = fIntensBlind->GetCam(); - cam->SetPulserColor(fCalibPattern->GetPulserColor()); - *fLog << inf << "New MCalibrationBlindCam with name: " << cam->GetName() << endl; - } - if (fIntensRelTime) { @@ -392,7 +384,7 @@ fIntensCharge->AddHist((MHCalibrationCam*)hcam->Clone()); } - if (n.Contains("Blind")) - if (fIntensBlind) - fIntensBlind->AddHist((MHCalibrationCam*)hcam->Clone()); +// if (n.Contains("Blind")) +// if (fIntensBlind) +// fIntensBlind->AddHist((MHCalibrationCam*)hcam->Clone()); if (n.Contains("RelTime")) Index: trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h (revision 8426) +++ trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h (revision 8427) @@ -18,6 +18,6 @@ class MCalibrationRelTimeCalc; class MCalibrationIntensityChargeCam; -class MCalibrationIntensityBlindCam; class MCalibrationIntensityRelTimeCam; +class MCalibrationBlindCam; class MCalibrationQECam; class MBadPixelsCam; @@ -31,6 +31,6 @@ MParList *fParList; //! MCalibrationIntensityChargeCam *fIntensCharge; //! - MCalibrationIntensityBlindCam *fIntensBlind; //! MCalibrationIntensityRelTimeCam *fIntensRelTime; //! + MCalibrationBlindCam *fBlindCam; //! MCalibrationQECam *fQECam; //! MBadPixelsCam *fBad; //! Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (revision 8426) +++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (revision 8427) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.175 2007-04-20 11:48:08 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.176 2007-04-20 13:21:11 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -222,5 +222,4 @@ #include "MCalibrationIntensityChargeCam.h" -#include "MCalibrationIntensityBlindCam.h" #include "MHCalibrationChargeCam.h" @@ -367,5 +366,4 @@ fHCam = NULL; fQECam = NULL; - fIntensBlind = NULL; fBlindCam = NULL; fHBlindCam = NULL; @@ -513,17 +511,14 @@ } - fIntensBlind = (MCalibrationIntensityBlindCam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityBlindCam")); - if (fIntensBlind) - *fLog << inf << "Found MCalibrationIntensityBlindCam... " << flush; - else - { - fBlindCam = (MCalibrationBlindCam*)pList->FindObject(AddSerialNumber("MCalibrationBlindCam")); - if (!fBlindCam) - *fLog << inf << "No MCalibrationBlindCam found... no Blind Pixel method!" << endl; - } - - // - // Required containers - // + // + // Blind pixel calibration + // + fBlindCam = (MCalibrationBlindCam*)pList->FindObject(AddSerialNumber("MCalibrationBlindCam")); + if (!fBlindCam) + *fLog << inf << "No MCalibrationBlindCam found... no Blind Pixel method!" << endl; + + // + // Required containers + // fQECam = (MCalibrationQECam*)pList->FindObject(AddSerialNumber("MCalibrationQECam")); if (!fQECam) @@ -664,6 +659,4 @@ fHBlindCam->SetColor(col); - MCalibrationBlindCam *blindcam = fIntensBlind - ? (MCalibrationBlindCam*)fIntensBlind->GetCam() : fBlindCam; MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; @@ -671,6 +664,6 @@ chargecam->SetPulserColor(col); - if (blindcam) - blindcam->SetPulserColor(col); + if (fBlindCam) + fBlindCam->SetPulserColor(col); if (fPINDiode) fPINDiode->SetColor(col); @@ -756,5 +749,4 @@ } - MCalibrationBlindCam *blindcam = fIntensBlind ? (MCalibrationBlindCam*) fIntensBlind->GetCam() : fBlindCam; MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; @@ -928,6 +920,6 @@ fBadPixels->SetReadyToSave(); - if (blindcam) - blindcam->SetReadyToSave(); + if (fBlindCam) + fBlindCam->SetReadyToSave(); if (fPINDiode) fPINDiode->SetReadyToSave(); @@ -1580,17 +1572,13 @@ Bool_t MCalibrationChargeCalc::FinalizeBlindCam() { - - MCalibrationBlindCam *blindcam = fIntensBlind - ? (MCalibrationBlindCam*)fIntensBlind->GetCam() : fBlindCam; - - if (!blindcam) + if (!fBlindCam) return kFALSE; - Int_t nvalid = 0; - - for (Int_t i=0; iGetSize(); i++) - { - - MCalibrationBlindPix &blindpix = (MCalibrationBlindPix&)(*blindcam)[i]; + Int_t nvalid = 0; + + for (Int_t i=0; iGetSize(); i++) + { + + MCalibrationBlindPix &blindpix = (MCalibrationBlindPix&)(*fBlindCam)[i]; if (!blindpix.IsValid()) @@ -1966,24 +1954,22 @@ { - - MCalibrationBlindCam *blindcam = fIntensBlind - ? (MCalibrationBlindCam*) fIntensBlind->GetCam(): fBlindCam; - MCalibrationChargeCam *chargecam = fIntensCam + if (!fBlindCam) + return; + + MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam; - if (!blindcam) - return; // // Set the results in the MCalibrationChargeCam // - if (!blindcam || !(blindcam->IsFluxInsidePlexiglassAvailable())) - { - - const Float_t photons = blindcam->GetFluxInsidePlexiglass() * (*fGeom)[0].GetA() + if (!fBlindCam->IsFluxInsidePlexiglassAvailable()) + { + + const Float_t photons = fBlindCam->GetFluxInsidePlexiglass() * (*fGeom)[0].GetA() / fQECam->GetPlexiglassQE(); chargecam->SetNumPhotonsBlindPixelMethod(photons); - const Float_t photrelvar = blindcam->GetFluxInsidePlexiglassRelVar() + const Float_t photrelvar = fBlindCam->GetFluxInsidePlexiglassRelVar() + fQECam->GetPlexiglassQERelVar(); @@ -2002,5 +1988,5 @@ MCalibrationQEPix &qepix = (MCalibrationQEPix&)(*fQECam)[i]; - if (!blindcam || !(blindcam->IsFluxInsidePlexiglassAvailable())) + if (!fBlindCam->IsFluxInsidePlexiglassAvailable()) { qepix.SetBlindPixelMethodValid(kFALSE, fPulserColor); @@ -2020,9 +2006,9 @@ const Float_t qe = pix.GetPheFFactorMethod() - / blindcam->GetFluxInsidePlexiglass() + / fBlindCam->GetFluxInsidePlexiglass() / geo.GetA() * fQECam->GetPlexiglassQE(); - const Float_t qerelvar = blindcam->GetFluxInsidePlexiglassRelVar() + const Float_t qerelvar = fBlindCam->GetFluxInsidePlexiglassRelVar() + fQECam->GetPlexiglassQERelVar() + pix.GetPheFFactorMethodRelVar(); Index: trunk/MagicSoft/Mars/mcalib/Makefile =================================================================== --- trunk/MagicSoft/Mars/mcalib/Makefile (revision 8426) +++ trunk/MagicSoft/Mars/mcalib/Makefile (revision 8427) @@ -41,5 +41,4 @@ MCalibrationIntensityCam.cc \ MCalibrationIntensityChargeCam.cc \ - MCalibrationIntensityBlindCam.cc \ MCalibrationIntensityRelTimeCam.cc \ MCalibrationIntensityTestCam.cc \ Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc (revision 8426) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc (revision 8427) @@ -46,5 +46,5 @@ #include "MCalibrationBlindPix.h" -#include "MCalibrationIntensityBlindCam.h" +#include "MCalibrationIntensityCam.h" #include "MParList.h" @@ -132,5 +132,5 @@ // Gets or creates the pointers to: // - MExtractedSignalBlindPixel -// - MCalibrationChargeCam or MCalibrationIntensityBlindCam +// - MCalibrationChargeCam or MCalibrationBlindCam // // Initializes the number of used FADC slices from MExtractedSignalCam Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 8426) +++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 8427) @@ -70,5 +70,4 @@ #include "MCalibConstCam.h" #include "MCalibrationIntensityChargeCam.h" -#include "MCalibrationIntensityBlindCam.h" #include "MCalibrationIntensityRelTimeCam.h" @@ -256,5 +255,4 @@ // Read File MCalibrationIntensityChargeCam ichcam; - MCalibrationIntensityBlindCam iblcam; MCalibrationIntensityRelTimeCam itmcam; @@ -284,5 +282,4 @@ { interlacedcont.Add(&ichcam); - interlacedcont.Add(&iblcam); interlacedcont.Add(&itmcam); interlacedcont.Add(&hchacam);