Index: /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsIntensityCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsIntensityCam.cc (revision 8427) +++ /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsIntensityCam.cc (revision 8428) @@ -32,6 +32,5 @@ // per calibration camera result. Has to be created // -// See also: MCalibrationIntensityChargeCam, MCalibrationIntensityRelTimeCam, -// MCalibrationCam, MCalibrationPix, +// See also: MCalibrationIntensityChargeCam, MCalibrationCam, MCalibrationPix, // MHCalibrationChargePix, MHCalibrationChargeCam // MCalibrationChargeBlindPix, MCalibrationChargePINDiode Index: /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h (revision 8427) +++ /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h (revision 8428) @@ -19,5 +19,4 @@ #pragma link C++ class MCalibrationIntensityCam+; #pragma link C++ class MCalibrationIntensityChargeCam+; -#pragma link C++ class MCalibrationIntensityRelTimeCam+; #pragma link C++ class MCalibrationIntensityTestCam+; @@ -29,6 +28,4 @@ #pragma link C++ class MCalibrationPulseTimeCam+; #pragma link C++ class MCalibrationPedCam+; -//#pragma link C++ class MCalibrationHiLoCam+; -//#pragma link C++ class MCalibrationHiLoPix+; #pragma link C++ class MCalibrationQECamMagic+; #pragma link C++ class MCalibrationQECam+; Index: /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc (revision 8427) +++ /trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc (revision 8428) @@ -31,9 +31,7 @@ // MParList // MCalibrationIntensityChargeCam -// MCalibrationIntensityRelTimeCam // // Output Containers: // MCalibrationIntensityChargeCam -// MCalibrationIntensityRelTimeCam // // Class version 2: @@ -58,5 +56,4 @@ #include "MCalibrationIntensityChargeCam.h" -//#include "MCalibrationIntensityRelTimeCam.h" #include "MBadPixelsCam.h" @@ -202,11 +199,6 @@ if (pList->FindObject(AddSerialNumber("MHCalibrationRelTimeCam"))) { - - MParContainer *cont = pList->FindCreateObj("MCalibrationIntensityRelTimeCam"); - if (!cont) - { - *fLog << err << "Could not find nor create MCalibrationIntensityRelTimeCam abort... " << endl; - return kFALSE; - } + // if (!pList->FindCreateObj("MCalibrationIntensityRelTimeCam")) + // return kFALSE; if (!fRelTimeCalc) Index: /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc (revision 8427) +++ /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc (revision 8428) @@ -34,9 +34,7 @@ // MParList // MCalibrationIntensityChargeCam -// MCalibrationIntensityRelTimeCam // // Output Containers: // MCalibrationIntensityChargeCam -// MCalibrationIntensityRelTimeCam // ////////////////////////////////////////////////////////////////////////////// @@ -58,11 +56,13 @@ #include "MCalibrationIntensityChargeCam.h" -#include "MCalibrationIntensityRelTimeCam.h" #include "MCalibrationPattern.h" #include "MCalibrationQECam.h" #include "MCalibrationBlindCam.h" + #include "MCalibrationChargeCam.h" #include "MCalibrationChargeCalc.h" + +#include "MCalibrationRelTimeCam.h" #include "MCalibrationRelTimeCalc.h" @@ -77,5 +77,5 @@ MCalibColorSteer::MCalibColorSteer(const char *name, const char *title) : fCalibPattern(NULL), fGeom(NULL), fParList(NULL), - fIntensCharge(NULL), fIntensRelTime(NULL), + fIntensCharge(NULL), fBad(NULL), fChargeCalc(NULL), fRelTimeCalc(NULL), fHistCopy(kFALSE) { @@ -178,20 +178,15 @@ { - fIntensRelTime = (MCalibrationIntensityRelTimeCam*)pList->FindCreateObj("MCalibrationIntensityRelTimeCam"); - fRelTimeCalc = (MCalibrationRelTimeCalc*)tlist->FindObject(AddSerialNumber("MCalibrationRelTimeCalc")); - *fLog << inf << "Found MHCalibrationRelTimeCam ... " << flush; - if (!fIntensRelTime) - { - *fLog << err << "Could not find nor create MCalibrationIntensityRelTimeCam abort... " << endl; + fRelTimeCam = (MCalibrationRelTimeCam*)pList->FindCreateObj("MCalibrationRelTimeCam"); + if (!fRelTimeCam) return kFALSE; - } - + + fRelTimeCalc = (MCalibrationRelTimeCalc*)tlist->FindObject(AddSerialNumber("MCalibrationRelTimeCalc")); if (!fRelTimeCalc) - { - *fLog << err << "Could not find MCalibrationRelTimeCalc abort... " << endl; return kFALSE; - } + + // CALL ITS PrePorcess ??? } @@ -320,4 +315,7 @@ fBlindCam->SetPulserColor(fCalibPattern->GetPulserColor()); + fRelTimeCam->Clear(); + fRelTimeCam->SetPulserColor(fCalibPattern->GetPulserColor()); + if (fIntensCharge) { @@ -331,12 +329,4 @@ } - if (fIntensRelTime) - { - fIntensRelTime->AddToList(Form("MCalibrationRelTimeCam%s",namep.Data()),*fGeom); - MCalibrationCam *cam = fIntensRelTime->GetCam(); - cam->SetPulserColor(fCalibPattern->GetPulserColor()); - *fLog << inf << "New MCalibrationRelTimeCam with name: " << cam->GetName() << endl; - } - return kTRUE; @@ -388,8 +378,8 @@ // fIntensBlind->AddHist((MHCalibrationCam*)hcam->Clone()); - if (n.Contains("RelTime")) - if (fIntensRelTime) - fIntensRelTime->AddHist((MHCalibrationCam*)hcam->Clone()); -} - -// -------------------------------------------------------------------------- +// if (n.Contains("RelTime")) +// if (fIntensRelTime) +// fIntensRelTime->AddHist((MHCalibrationCam*)hcam->Clone()); +} + +// -------------------------------------------------------------------------- Index: /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h (revision 8427) +++ /trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h (revision 8428) @@ -18,5 +18,5 @@ class MCalibrationRelTimeCalc; class MCalibrationIntensityChargeCam; -class MCalibrationIntensityRelTimeCam; +class MCalibrationRelTimeCam; class MCalibrationBlindCam; class MCalibrationQECam; @@ -31,5 +31,5 @@ MParList *fParList; //! MCalibrationIntensityChargeCam *fIntensCharge; //! - MCalibrationIntensityRelTimeCam *fIntensRelTime; //! + MCalibrationRelTimeCam *fRelTimeCam; //! MCalibrationBlindCam *fBlindCam; //! MCalibrationQECam *fQECam; //! Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.cc (revision 8427) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.cc (revision 8428) @@ -34,5 +34,5 @@ // per calibration camera result and area index // -// See also: MCalibrationIntensityChargeCam, MCalibrationIntensityRelTimeCam, +// See also: MCalibrationIntensityChargeCam, // MCalibrationCam, MCalibrationPix, MHCalibrationChargePix, // MHCalibrationChargeCam, MCalibrationChargeBlindPix, Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc (revision 8427) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc (revision 8428) @@ -71,5 +71,4 @@ #include "MGeomPix.h" -#include "MCalibrationIntensityRelTimeCam.h" #include "MCalibrationRelTimeCam.h" #include "MCalibrationRelTimePix.h" @@ -122,9 +121,6 @@ void MCalibrationRelTimeCalc::Clear(const Option_t *o) { - - fBadPixels = NULL; - fCam = NULL; - fIntensCam = NULL; - + fBadPixels = NULL; + fCam = NULL; } @@ -133,5 +129,5 @@ // Search for the following input containers and abort if not existing: // - MGeomCam -// - MCalibrationIntensityRelTimeCam or MCalibrationRelTimeCam +// - MCalibrationRelTimeCam // - MBadPixelsCam // @@ -161,37 +157,25 @@ } - fIntensCam = (MCalibrationIntensityRelTimeCam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityRelTimeCam")); - if (fIntensCam) - *fLog << inf << "Found MCalibrationIntensityRelTimeCam ... " << endl; - else - { - fCam = (MCalibrationRelTimeCam*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCam")); - if (!fCam) - { - *fLog << err << "Cannot find MCalibrationRelTimeCam ... abort." << endl; - *fLog << err << "Maybe you forget to call an MFillH for the MHCalibrationRelTimeCam before..." << endl; - return kFALSE; - } - } - - UInt_t npixels = fGeom->GetNumPixels(); - - MCalibrationRelTimeCam *relcam = fIntensCam - ? (MCalibrationRelTimeCam*)fIntensCam->GetCam() : fCam; - + fCam = (MCalibrationRelTimeCam*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCam")); + if (!fCam) + { + *fLog << err << "Cannot find MCalibrationRelTimeCam ... abort." << endl; + return kFALSE; + } + + const UInt_t npixels = fGeom->GetNumPixels(); for (UInt_t i=0; iSetReadyToSave(); - else - fCam ->SetReadyToSave(); - + fCam->SetReadyToSave(); fBadPixels->SetReadyToSave(); @@ -277,7 +257,4 @@ { - MCalibrationRelTimeCam *relcam = fIntensCam - ? (MCalibrationRelTimeCam*)fIntensCam->GetCam() : fCam; - const UInt_t npixels = fGeom->GetNumPixels(); const UInt_t nareas = fGeom->GetNumAreas(); @@ -286,5 +263,4 @@ TArrayF upplim (nareas); TArrayF areasum (nareas); - // Float_t areasum2 [nareas]; TArrayI numareavalid (nareas); TArrayI useunreliable(nareas); @@ -306,5 +282,5 @@ numareavalid[aidx] ++; } - + for (UInt_t aidx=0; aidx upplim[aidx] ) { @@ -401,12 +377,7 @@ void MCalibrationRelTimeCalc::FinalizeBadPixels() { - - MCalibrationRelTimeCam *relcam = fIntensCam - ? (MCalibrationRelTimeCam*)fIntensCam->GetCam() : fCam; for (Int_t i=0; iGetSize(); i++) { - - MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*relcam)[i]; MBadPixelsPix &bad = (*fBadPixels)[i]; @@ -425,5 +396,8 @@ if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun)) + { + MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCam)[i]; pix.SetExcluded(); + } } @@ -442,6 +416,4 @@ *fLog << dec; - MCalibrationRelTimeCam *relcam = fIntensCam ? (MCalibrationRelTimeCam*)fIntensCam->GetCam() : fCam; - const Int_t nareas = fGeom->GetNumAreas(); @@ -453,6 +425,6 @@ 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); + fCam->SetNumUnsuitable(unsuit[aidx], aidx); + fCam->SetNumUnreliable(unrel[aidx], aidx); } Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.h =================================================================== --- /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.h (revision 8427) +++ /trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.h (revision 8428) @@ -19,8 +19,6 @@ #endif -class MCalibrationIntensityRelTimeCam; class MCalibrationRelTimeCam; class MGeomCam; -//class MBadPixelsIntensityCam; class MBadPixelsCam; @@ -35,7 +33,5 @@ // Pointers - //MBadPixelsIntensityCam *fIntensBad; // Bad Pixels Intensity Cam MBadPixelsCam *fBadPixels; // Bad Pixels - MCalibrationIntensityRelTimeCam *fIntensCam; // Calibrated RelTimes for different intensities MCalibrationRelTimeCam *fCam; // Calibrated RelTimes of all pixels MGeomCam *fGeom; //! Camera geometry Index: /trunk/MagicSoft/Mars/mcalib/Makefile =================================================================== --- /trunk/MagicSoft/Mars/mcalib/Makefile (revision 8427) +++ /trunk/MagicSoft/Mars/mcalib/Makefile (revision 8428) @@ -41,5 +41,4 @@ MCalibrationIntensityCam.cc \ MCalibrationIntensityChargeCam.cc \ - MCalibrationIntensityRelTimeCam.cc \ MCalibrationIntensityTestCam.cc \ MCalibrationCam.cc \ Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc (revision 8427) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc (revision 8428) @@ -318,6 +318,4 @@ *fLog << endl; - MCalibrationCam *blindcam = fIntensCam ? fIntensCam->GetCam() : fCam; - for (Int_t i=0; iGetSize(); i++) { @@ -360,7 +358,5 @@ } - MCalibrationBlindPix &pix = (MCalibrationBlindPix&)(*blindcam)[i]; - - FitBlindPixel(hist,pix); + FitBlindPixel(hist, (MCalibrationBlindPix&)(*fCam)[i]); } Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc (revision 8427) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc (revision 8428) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MHCalibrationHiLoCam.cc,v 1.21 2007-04-18 15:33:56 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MHCalibrationHiLoCam.cc,v 1.22 2007-04-20 13:55:00 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -392,5 +392,5 @@ pix.SetHivsLoLast (fHivsLoLast); - InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); + InitHists(pix, fCam->GetAverageBadArea(j), j); if (fCam) @@ -425,5 +425,5 @@ pix.SetHivsLoLast (fHivsLoLast); - InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); + InitHists(pix, fCam->GetAverageBadSector(j), j); if (fCam) @@ -516,5 +516,5 @@ pix.SetHivsLoLast (fHivsLoLast ); - InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); + InitHists(pix, fCam->GetAverageBadArea(j), j); h = pix.GetHivsLo(); @@ -547,5 +547,5 @@ pix.SetHivsLoLast (fHivsLoLast); - InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); + InitHists(pix, fCam->GetAverageBadSector(j), j); h = pix.GetHivsLo(); Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc (revision 8427) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc (revision 8428) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.35 2007-04-18 15:33:56 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.36 2007-04-20 13:55:00 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -253,5 +253,5 @@ // Gets or creates the pointers to: // - MExtractedSignalCam -// - MCalibrationPulseTimeCam or MCalibrationIntensityPulseTimeCam +// - MCalibrationPulseTimeCam // - MBadPixelsCam // @@ -327,5 +327,5 @@ pix.SetBinning(fNbins, fFirst, fLast); - InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); + InitHists(pix, fCam->GetAverageBadArea(j), j); } } @@ -340,5 +340,5 @@ pix.SetBinning(fNbins, fFirst, fLast); - InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); + InitHists(pix, fCam->GetAverageBadSector(j), j); } } @@ -464,5 +464,4 @@ *fLog << endl; - MCalibrationCam &calcam = *(fIntensCam ? fIntensCam->GetCam() : fCam); // // Perform the fitting for the High Gain (done in MHCalibrationCam) @@ -472,10 +471,8 @@ MHCalibrationPix &hist = (*this)[i]; - if (hist.IsExcluded()) continue; - MCalibrationPix &pix = calcam[i]; - CalcHists(hist,pix); + CalcHists(hist, (*fCam)[i]); } @@ -484,16 +481,8 @@ for (Int_t j=0; jGetSize(); j++) - { - MHCalibrationPix &hist = GetAverageHiGainArea(j); - MCalibrationPix &pix = calcam.GetAverageArea(j); - CalcHists(hist,pix); - } + CalcHists(GetAverageHiGainArea(j), fCam->GetAverageArea(j)); for (Int_t j=0; jGetSize(); j++) - { - MHCalibrationPix &hist = GetAverageHiGainSector(j); - MCalibrationPix &pix = calcam.GetAverageSector(j); - CalcHists(hist,pix); - } + CalcHists(GetAverageHiGainSector(j), fCam->GetAverageSector(j)); return kTRUE; Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc =================================================================== --- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc (revision 8427) +++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc (revision 8428) @@ -95,6 +95,4 @@ #include "MParList.h" -#include "MCalibrationIntensityRelTimeCam.h" - #include "MCalibrationRelTimeCam.h" #include "MCalibrationRelTimePix.h" @@ -446,6 +444,4 @@ *fLog << endl; - MCalibrationCam *relcam = fIntensCam ? fIntensCam->GetCam() : fCam; - const Int_t nareas = fAverageHiGainAreas->GetSize(); const Int_t nsectors = fAverageHiGainSectors->GetSize(); @@ -467,11 +463,11 @@ const Int_t sector = (*fGeom)[i].GetSector(); - MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*relcam)[i] ; - fNumareahi[aidx]++; fNumsectorhi[sector]++; + // // Check saturation // + MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCam)[i] ; if (histhi.GetSaturated() > fNumHiGainSaturationLimit*histhi.GetHGausHist()->GetEntries()) { @@ -496,7 +492,7 @@ for (Int_t j=0; jGetAverageArea(j); + + MHCalibrationPix &histhi = GetAverageHiGainArea(j); + MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)fCam->GetAverageArea(j); if (satarea[j] > 0.5*fNumareahi[j]) @@ -519,10 +515,10 @@ for (Int_t j=0; jGetSize(); j++) { - + MHCalibrationPix &histhi = GetAverageHiGainSector(j); - MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)relcam->GetAverageSector(j) ; if (satsect[j] > 0.5*fNumsectorhi[j]) { + MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)fCam->GetAverageSector(j) ; pix.SetHiGainSaturation(); histhi.SetExcluded(); @@ -540,10 +536,10 @@ } - FitHiGainArrays(*relcam, *fBadPixels, + FitHiGainArrays(*fCam, *fBadPixels, MBadPixelsPix::kRelTimeNotFitted, MBadPixelsPix::kRelTimeOscillating); - if (IsLoGain()) - FitLoGainArrays(*relcam, *fBadPixels, + if (IsLoGain()) + FitLoGainArrays(*fCam, *fBadPixels, MBadPixelsPix::kRelTimeNotFitted, MBadPixelsPix::kRelTimeOscillating); Index: /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 8427) +++ /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 8428) @@ -70,5 +70,4 @@ #include "MCalibConstCam.h" #include "MCalibrationIntensityChargeCam.h" -#include "MCalibrationIntensityRelTimeCam.h" #include "MHCalibrationChargeCam.h" @@ -255,5 +254,4 @@ // Read File MCalibrationIntensityChargeCam ichcam; - MCalibrationIntensityRelTimeCam itmcam; MHCalibrationChargeCam hchacam; @@ -282,5 +280,4 @@ { interlacedcont.Add(&ichcam); - interlacedcont.Add(&itmcam); interlacedcont.Add(&hchacam); if (IsUseBlindPixel()) Index: /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 8427) +++ /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 8428) @@ -2038,5 +2038,5 @@ // // If the flag kRelTimes is set, then also: -// - MCalibrationRelTimeCam or MCalibrationIntensityRelTimeCam +// - MCalibrationRelTimeCam // Bool_t MJCalibration::WriteResult(MParList &plist) Index: /trunk/MagicSoft/Mars/mjobs/MJCalibration.h =================================================================== --- /trunk/MagicSoft/Mars/mjobs/MJCalibration.h (revision 8427) +++ /trunk/MagicSoft/Mars/mjobs/MJCalibration.h (revision 8428) @@ -11,9 +11,9 @@ #include "MCalibrationBlindCam.h" #endif +#ifndef MARS_MCalibrationRelTimeCam +#include "MCalibrationRelTimeCam.h" +#endif #ifndef MARS_MCalibrationChargePINDiode #include "MCalibrationChargePINDiode.h" -#endif -#ifndef MARS_MCalibrationRelTimeCam -#include "MCalibrationRelTimeCam.h" #endif #ifndef MARS_MCalibrationQECam @@ -80,5 +80,5 @@ Float_t fRefTimeResolutionInner; //! Reference value for the time resolution - inner Float_t fRefTimeResolutionOuter; //! Reference value for the time resolution - outer - + TString fReferenceFile; // File name containing the reference values TString fHiLoCalibFile; // File name containing the hi-lo calib. constants @@ -86,5 +86,5 @@ MExtractor *fExtractor; // Signal extractor MExtractTime *fTimeExtractor; // Arrival Time extractor - + MBadPixelsCam fBadPixels; // Bad Pixels cam, can be set from previous runs MCalibrationChargeCam fCalibrationCam; // Calibration conversion factors FADC2Phe @@ -93,9 +93,9 @@ MCalibrationQECam fQECam; // Quantum efficiency, can be set from previous runs MCalibrationRelTimeCam fRelTimeCam; // Calibration constants rel. times - + MPedestalCam fExtractorCam; // Pedestal Cam with extractor resolution MCalibrationCam::PulserColor_t fColor; // Colour of the pulsed LEDs - + enum Display_t // Possible Display types { @@ -104,13 +104,13 @@ kNormalDisplay }; - + Display_t fDisplayType; // Chosen Display type - + enum { kRelTimes, kDebug }; // Possible flags Byte_t fFlags; // Bit-field for the flags - + TString fGeometry; // Class name geometry - + Bool_t IsRelTimes () const { return TESTBIT(fFlags,kRelTimes); } Bool_t IsDebug () const { return TESTBIT(fFlags,kDebug); } @@ -124,10 +124,10 @@ const Int_t CountBadPixels ( MHCamera *cam , const Int_t what ) const; void FixDataCheckHist ( TH1D *hist ) const; - + Bool_t WriteResult (MParList &plist); //Bool_t WriteEventloop( MEvtLoop &evtloop ) const; Bool_t WriteTasks ( MTask *t1, MTask *t2) const; Bool_t CheckEnvLocal (); - + // WORKAROUNDS!!! void InitBlindPixel(MExtractBlindPixel &blindext, @@ -138,5 +138,5 @@ void ReadReferenceFile(); Bool_t ReadHiLoCalibFile(); - + public: MJCalibration(const char *name=NULL, const char *title=NULL); @@ -146,5 +146,5 @@ const MCalibrationQECam &GetQECam() const { return fQECam; } const MBadPixelsCam &GetBadPixels() const { return fBadPixels; } - + // Containers and pointers void SetBadPixels ( const MBadPixelsCam &bad) { bad.Copy(fBadPixels); } @@ -154,5 +154,5 @@ void SetQECam ( const MCalibrationQECam &qe) { qe.Copy(fQECam); } void SetTimeExtractor( MExtractTime* ext) { fTimeExtractor = ext; } - + // Displays void SetFullDisplay() { fDisplayType = kFullDisplay; } @@ -162,10 +162,10 @@ // Camera Geomtry void SetGeometry(const char *geom) { fGeometry = geom; } - + // Flags 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); } - + // Files void SetReferenceFile( const TString ref=fgReferenceFile ) { fReferenceFile = ref; }