Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 8497) +++ trunk/MagicSoft/Mars/Changelog (revision 8498) @@ -70,4 +70,19 @@ - adapted GetPixelContent accordingly - increased class version to 2 + + * manalysis/MCameraData.cc: + - added include of TArrayI (previously included from MPedestalCam) + + * mcalib/MCalibrationChargeCam.cc, mcalib/MCalibrationRelTimeCam.cc: + - fixed GetPixelContant to give more proper output + - reformatted GetPIxelContent code + - added const-qualifiers + + * mjobs/MJCalibTest.cc, mjobs/MJCalibrateSignal.cc, + mjobs/MJCalibration.cc, mjobs/MJPedestal.cc, + mpedestal/MExtractPedestal.[h,cc], msignal/MExtractor.[h,cc], + msignal/MExtractBlindPixel.cc, msignal/MExtractPINDiode.cc: + - removed data members fPedestal and fPedestalsIn respectively, + and all referencing functions because it was never used at all Index: trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc (revision 8497) +++ trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc (revision 8498) @@ -396,23 +396,14 @@ MExtractTimeAndChargeSpline spline; - spline.SetPedestals(&pedcam); - MTaskEnv taskenv1("ExtractSignal"); MTaskEnv taskenv2("ExtractTime"); if (extractor1) - { - extractor1->SetPedestals(&pedcam); taskenv1.SetDefault(extractor1); - } if (extractor2) - { - fTimeExtractor->SetPedestals(&pedcam); taskenv2.SetDefault(fTimeExtractor); - } else if (!(extractor1->InheritsFrom("MExtractTimeAndCharge"))) { - spline.SetPedestals(&pedcam); spline.SetWindowSize(8,8); taskenv2.SetDefault(&spline); @@ -544,3 +535,2 @@ } - Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 8497) +++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (revision 8498) @@ -418,5 +418,4 @@ pedlo2.SetPedestalUpdate(kTRUE); pedlo2.SetRandomCalculation(kTRUE); - pedlo2.SetNamePedestalCamIn("MPedestalFundamental"); pedlo2.SetNamePedestalCamOut("MPedestalFromExtractorRndm"); @@ -424,5 +423,4 @@ pedlo3.SetPedestalUpdate(kTRUE); pedlo3.SetRandomCalculation(kFALSE); - pedlo3.SetNamePedestalCamIn("MPedestalFundamental"); pedlo3.SetNamePedestalCamOut("MPedestalFromExtractor"); @@ -432,6 +430,4 @@ return kFALSE; } - - extractor1->SetPedestals(&pedcamab); // Setup to use the hi-gain extraction window in the lo-gain @@ -460,10 +456,4 @@ } - if (extractor2) - extractor2->SetPedestals(&pedcamab); - - if (extractor3) - extractor3->SetPedestals(&pedcamab); - //------------------------------ MFTriggerPattern ftp2; @@ -530,6 +520,4 @@ MCalibCalcFromPast pacalc; - pinext.SetPedestals(&pedcamab); - bldext.SetPedestals(&pedcamab); chcalc.SetPedestals(&pedcamextr); Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 8497) +++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (revision 8498) @@ -1802,5 +1802,4 @@ // Produce pedestal subtracted raw-data MPedestalSubtract pedsub; - pedsub.SetPedestalCam(fExtractor->GetPedestals()); tlist.AddToList(&pedsub); Index: trunk/MagicSoft/Mars/mjobs/MJPedestal.cc =================================================================== --- trunk/MagicSoft/Mars/mjobs/MJPedestal.cc (revision 8497) +++ trunk/MagicSoft/Mars/mjobs/MJPedestal.cc (revision 8498) @@ -1188,7 +1188,4 @@ } - pedcalc.SetPedestalsIn(&fPedestalCamIn); - pedlogain.SetPedestalsIn(&fPedestalCamIn); - pedcalc.SetPedestalsOut(&fPedestalCamOut); pedlogain.SetPedestalsOut(&fPedestalCamOut); @@ -1197,6 +1194,4 @@ if (fExtractor) { - fExtractor->SetPedestals(&fPedestalCamIn); - if (fExtractionType!=kFundamental) { Index: trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc =================================================================== --- trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc (revision 8497) +++ trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc (revision 8498) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.29 2007-05-11 10:25:45 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.30 2007-05-11 15:47:18 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -194,5 +194,5 @@ // MExtractPedestal::MExtractPedestal(const char *name, const char *title) - : fGeom(NULL), fPedestalsIn(NULL), fPedestalsInter(NULL), + : fGeom(NULL), fPedestalsInter(NULL), fPedestalsOut(NULL), fExtractor(NULL), fSignal(0), fExtractWinFirst(0), fExtractWinSize(0), fUseSpecialPixels(kFALSE) @@ -204,5 +204,4 @@ SetRandomCalculation ( kTRUE ); - SetNamePedestalCamIn(); SetNamePedestalCamOut(); SetNamePedestalCamInter(); @@ -427,14 +426,4 @@ } - if (fExtractor && !fPedestalsIn) - { - fPedestalsIn = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedestalCamIn), "MPedestalCam"); - if (!fPedestalsIn) - { - *fLog << err << AddSerialNumber(fNamePedestalCamIn) << " not found... aborting." << endl; - return kFALSE; - } - } - if (!fPedestalsInter && fIntermediateStorage) { @@ -603,5 +592,4 @@ Int_t MExtractPedestal::PostProcess() { - fPedestalsIn = NULL; return fExtractor ? fExtractor->CallPostProcess() : kTRUE; } @@ -947,5 +935,4 @@ { *fLog << GetDescriptor() << ":" << endl; - *fLog << "Name of input MPedestalCam: " << (fPedestalsIn?fPedestalsIn->GetName():fNamePedestalCamIn.Data()) << " (" << fPedestalsIn << ")" << endl; *fLog << "Name of interm. MPedestalCam: " << (fPedestalsInter?fPedestalsInter->GetName():fNamePedestalCamInter.Data()) << " (" << fPedestalsInter << ")" << endl; *fLog << "Name of output MPedestalCam: " << (fPedestalsOut?fPedestalsOut->GetName():fNamePedestalCamOut.Data()) << " (" << fPedestalsOut << ")" << endl; @@ -1033,11 +1020,4 @@ } - // find resource for MPedestalCam - if (IsEnvDefined(env, prefix, "NamePedestalCamIn", print)) - { - SetNamePedestalCamIn(GetEnvValue(env, prefix, "NamePedestalCamIn", fNamePedestalCamIn)); - rc = kTRUE; - } - if (IsEnvDefined(env, prefix, "NamePedestalCamInter", print)) { Index: trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h =================================================================== --- trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h (revision 8497) +++ trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h (revision 8498) @@ -34,5 +34,4 @@ static const UShort_t fgMaxSignalVar; //! The maximum difference between the highest and lowest slice - TString fNamePedestalCamIn; // Name of the incoming 'MPedestalCam' container TString fNamePedestalCamOut; // Name of the outgoing 'MPedestalCam' container TString fNamePedestalCamInter; // Name of the intermediate 'MPedestalCam' container @@ -50,5 +49,4 @@ MGeomCam *fGeom; //! Camera geometry - MPedestalCam *fPedestalsIn; //! Pedestals of all pixels in the camera (incoming) MPedestalCam *fPedestalsInter; //! Pedestals of all pixels in the camera (intermediate) MPedestalCam *fPedestalsOut; //! Pedestals of all pixels in the camera (outgoing) @@ -130,5 +128,4 @@ // names - void SetNamePedestalCamIn (const char *name=fgNamePedestalCam) { fNamePedestalCamIn = name; } void SetNamePedestalCamInter(const char *name=fgNamePedestalCam) { fNamePedestalCamInter = name; } void SetNamePedestalCamOut (const char *name=fgNamePedestalCam) { fNamePedestalCamOut = name; } @@ -137,5 +134,4 @@ // pointers void SetExtractor ( MExtractTimeAndCharge *e) { fExtractor = e; } - void SetPedestalsIn ( MPedestalCam *pedcam ) { fPedestalsIn = pedcam; } void SetPedestalsInter( MPedestalCam *pedcam ) { fPedestalsInter = pedcam; } void SetPedestalsOut ( MPedestalCam *pedcam ) { fPedestalsOut = pedcam; } Index: trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc =================================================================== --- trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc (revision 8497) +++ trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc (revision 8498) @@ -231,5 +231,5 @@ fBlindPixel->SetExtractionType(fExtractionType); - +/* for (UInt_t i=0;iGetNumSamplesHiGain(); const Int_t logainsamples = fRunHeader->GetNumSamplesLoGain(); Index: trunk/MagicSoft/Mars/msignal/MExtractPINDiode.cc =================================================================== --- trunk/MagicSoft/Mars/msignal/MExtractPINDiode.cc (revision 8497) +++ trunk/MagicSoft/Mars/msignal/MExtractPINDiode.cc (revision 8498) @@ -208,5 +208,5 @@ fPedMean.Reset(); - +/* const MPedestalPix &ped = (*fPedestals)[fPINDiodeIdx]; @@ -222,5 +222,5 @@ return kFALSE; } - + */ if (fSlices) delete fSlices; Index: trunk/MagicSoft/Mars/msignal/MExtractor.cc =================================================================== --- trunk/MagicSoft/Mars/msignal/MExtractor.cc (revision 8497) +++ trunk/MagicSoft/Mars/msignal/MExtractor.cc (revision 8498) @@ -115,5 +115,4 @@ const UInt_t MExtractor::fgSaturationLimit = 245; -const TString MExtractor::fgNamePedestalCam = "MPedestalCam"; const TString MExtractor::fgNameSignalCam = "MExtractedSignalCam"; const Float_t MExtractor::fgOffsetLoGain = 1.51; // 5 ns @@ -127,5 +126,4 @@ // - all variables to 0 // - fSaturationLimit to fgSaturationLimit -// - fNamePedestalCam to fgNamePedestalCam // - fNameSignalCam to fgNameSignalCam // - fNoiseCalculation to kFALSE @@ -133,6 +131,5 @@ MExtractor::MExtractor(const char *name, const char *title) : fResolutionPerPheHiGain(0), fResolutionPerPheLoGain(0), - fPedestals(NULL), fSignals(NULL), fRawEvt(NULL), fRunHeader(NULL), - fSignal(NULL), + fSignals(NULL), fRawEvt(NULL), fRunHeader(NULL), fSignal(NULL), /*fHiLoLast(0),*/ fNumHiGainSamples(0), fNumLoGainSamples(0) { @@ -140,5 +137,4 @@ fTitle = title ? title : "Base class for signal extractors"; - SetNamePedestalCam(); SetNameSignalCam(); SetOffsetLoGain(); @@ -162,5 +158,4 @@ // MRawEvtData // MRawRunHeader -// MPedestalCam // Int_t MExtractor::PreProcessStd(MParList *pList) @@ -185,15 +180,4 @@ { *fLog << err << AddSerialNumber("MPedestalSubtractedEvt") << " not found... aborting." << endl; - return kFALSE; - } - - - if (fPedestals) - return kTRUE; - - fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedestalCam), "MPedestalCam"); - if (!fPedestals) - { - *fLog << err << AddSerialNumber(fNamePedestalCam) << " [MPedestalCam] not found... aborting" << endl; return kFALSE; } @@ -207,5 +191,4 @@ // - MRawEvtData // - MRawRunHeader -// - MPedestalCam // // The following output containers are also searched and created if @@ -480,5 +463,3 @@ *fLog << " Num Samples Hi/Lo: " << Form("%2.1f %2.1f", fNumHiGainSamples, fNumLoGainSamples) << endl; } - if (fPedestals) - *fLog << " Pedestals: " << fPedestals->GetName() << ", " << fPedestals << endl; -} +} Index: trunk/MagicSoft/Mars/msignal/MExtractor.h =================================================================== --- trunk/MagicSoft/Mars/msignal/MExtractor.h (revision 8497) +++ trunk/MagicSoft/Mars/msignal/MExtractor.h (revision 8498) @@ -17,5 +17,4 @@ class MRawRunHeader; -class MPedestalCam; class MPedestalSubtractedEvt; class MExtractedSignalCam; @@ -33,17 +32,15 @@ protected: static const UInt_t fgSaturationLimit; //! Default for fSaturationLimit (now set to: 254) - static const TString fgNamePedestalCam; //! "MPedestalCam" static const TString fgNameSignalCam; //! "MExtractedSignalCam" Float_t fOffsetLoGain; // Offset of the low-gain signal w.r.t. the High-Gain slices - MPedestalCam *fPedestals; //! Pedestals of all pixels in the camera MExtractedSignalCam *fSignals; //! Extracted signal of all pixels in the camera - + MRawEvtData *fRawEvt; //! Raw event data (time slices) MRawRunHeader *fRunHeader; //! RunHeader information MPedestalSubtractedEvt *fSignal; //! - + Byte_t fHiGainFirst; // First FADC slice nr. to extract the High Gain signal Byte_t fHiGainLast; // Last FADC slice nr. to extract the High Gain signal @@ -61,5 +58,4 @@ UInt_t fSaturationLimit; // Highest FADC slice value until being declared saturated - TString fNamePedestalCam; // Name of the 'MPedestalCam' container TString fNameSignalCam; // Name of the 'MExtractedSignalCam' container @@ -107,10 +103,6 @@ void SetOffsetLoGain ( const Float_t f=fgOffsetLoGain ) { fOffsetLoGain = f; } void SetSaturationLimit ( const UInt_t lim=fgSaturationLimit ) { fSaturationLimit = lim; } - void SetNamePedestalCam ( const char *name=fgNamePedestalCam.Data()) { fNamePedestalCam = name; } void SetNameSignalCam ( const char *name=fgNameSignalCam.Data() ) { fNameSignalCam = name; } void SetNoiseCalculation( const Bool_t b=kTRUE ) { fNoiseCalculation = b; } - - void SetPedestals (MPedestalCam *pedcam) { fPedestals = pedcam; } - MPedestalCam *GetPedestals() { return fPedestals; } // TObject