Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 4555) +++ trunk/MagicSoft/Mars/Changelog (revision 4556) @@ -21,5 +21,16 @@ - 2004/08/09: Markus Gaug + 2004/08/10: Thomas Bretz + + * mpedestal/MPedestalPix.[h,cc]: + - as discussed removed fValid + + * mpedestal/MPedCalcFromPedRun.[h,cc], + mpedestal/MPedCalcFromLoGain.[h,cc]: + - removed dependancy on MBadPixelsCam + + + + 2004/08/09: Markus Gaug * mcalib/MHGausEvents.[h,cc] @@ -30,4 +41,6 @@ (needed by e.g. TObject::DrawClone()) - added name and title to the class (was forgotten) + + 2004/08/09: Wolfgang Wittek Index: trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc =================================================================== --- trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc (revision 4555) +++ trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc (revision 4556) @@ -27,4 +27,5 @@ ! \* ======================================================================== */ + ///////////////////////////////////////////////////////////////////////////// // @@ -142,9 +143,4 @@ #include "MGeomCam.h" -#include "MBadPixelsPix.h" -#include "MBadPixelsCam.h" - -#include "MGeomCamMagic.h" - ClassImp(MPedCalcFromLoGain); @@ -177,5 +173,5 @@ : fWindowSizeHiGain(fgHiGainWindowSize), fWindowSizeLoGain(fgLoGainWindowSize), - fGeom(NULL),fBad(NULL) + fGeom(NULL) { fName = name ? name : "MPedCalcFromLoGain"; @@ -202,5 +198,4 @@ void MPedCalcFromLoGain::Clear(const Option_t *o) { - fRawEvt = NULL; fRunHeader = NULL; @@ -218,5 +213,4 @@ void MPedCalcFromLoGain::SetRange(Byte_t hifirst, Byte_t hilast, Byte_t lofirst, Byte_t lolast) { - MExtractor::SetRange(hifirst,hilast,lofirst,lolast); @@ -225,14 +219,12 @@ // SetWindowSize(fWindowSizeHiGain,fWindowSizeLoGain); - -} - - -// -------------------------------------------------------------------------- -// -void MPedCalcFromLoGain::SetMaxHiGainVar(Byte_t maxvar) { +} + +// -------------------------------------------------------------------------- +// +void MPedCalcFromLoGain::SetMaxHiGainVar(Byte_t maxvar) +{ fMaxHiGainVar = maxvar; } - // -------------------------------------------------------------------------- @@ -251,5 +243,4 @@ void MPedCalcFromLoGain::SetWindowSize(Byte_t windowh, Byte_t windowl) { - fWindowSizeHiGain = windowh & ~1; fWindowSizeLoGain = windowl & ~1; @@ -286,5 +277,4 @@ } - fNumHiGainSamples = (Float_t)fWindowSizeHiGain; fNumLoGainSamples = (Float_t)fWindowSizeLoGain; @@ -292,9 +282,6 @@ fSqrtHiGainSamples = TMath::Sqrt(fNumHiGainSamples); fSqrtLoGainSamples = TMath::Sqrt(fNumLoGainSamples); - -} - - - +} + // -------------------------------------------------------------------------- // @@ -304,5 +291,4 @@ // - MRawRunHeader // - MGeomCam -// - MBadPixelsCam // // The following output containers are also searched and created if @@ -313,5 +299,4 @@ Int_t MPedCalcFromLoGain::PreProcess( MParList *pList ) { - Clear(); @@ -340,6 +325,4 @@ if (!fPedestals) return kFALSE; - - fBad = (MBadPixelsCam*)pList->FindObject("MBadPixelsCam"); return kTRUE; @@ -361,7 +344,4 @@ // the functions SetRange() are mostly overloaded and perform more checks, // modifying the ranges again, if necessary. -// -// A loop over the MBadPixelsCam is performed and bad pixels are set -// to MPedestalPix::SetValid(kFALSE); // Bool_t MPedCalcFromLoGain::ReInit(MParList *pList) @@ -463,16 +443,7 @@ << " LoGain FADC samples starting with slice: " << (int)fLoGainFirst << endl; - - if (fBad) - { - const Int_t nbads = fBad->GetSize(); - for (Int_t i=0; i<(nbads>npixels?npixels:nbads);i++) - if ((*fBad)[i].IsBad()) - (*fPedestals)[i].SetValid(kFALSE); - } - return kTRUE; - -} +} + // -------------------------------------------------------------------------- // @@ -483,10 +454,6 @@ Int_t MPedCalcFromLoGain::Process() { - MRawEvtPixelIter pixel(fRawEvt); - // cout << "fHiGainFirst: " << (Int_t)fHiGainFirst << " fWindowSizeHiGain: " << (Int_t)fWindowSizeHiGain << " fLoGainFirst: " << (Int_t)fLoGainFirst << " fWindowSizeLoGain: " << (Int_t)fWindowSizeLoGain << endl; - - while (pixel.Next()) { Index: trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.h =================================================================== --- trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.h (revision 4555) +++ trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.h (revision 4556) @@ -16,7 +16,7 @@ class MGeomCam; class MBadPixelsCam; + class MPedCalcFromLoGain : public MExtractor { - static const Byte_t fgHiGainFirst; // First FADC slice Hi-Gain (currently set to: 3) static const Byte_t fgHiGainLast; // Last FADC slice Hi-Gain (currently set to: 14) @@ -27,30 +27,28 @@ static const Byte_t fgMaxHiGainVar; // The maximum difference between the highest and lowest slice // in the high gain window allowed in order to use low gain - // for pedestal calculation - Int_t fNumEventsDump; // Number of event after which MPedestalCam gets updated + + Int_t fNumEventsDump; // Number of event after which MPedestalCam gets updated Byte_t fMaxHiGainVar; - Byte_t fWindowSizeHiGain; // Number of Hi Gain slices in window - Byte_t fWindowSizeLoGain; // Number of Lo Gain slices in window + Byte_t fWindowSizeHiGain; // Number of Hi Gain slices in window + Byte_t fWindowSizeLoGain; // Number of Lo Gain slices in window Bool_t fPedestalUpdate; - MGeomCam *fGeom; // Camera geometry - MBadPixelsCam *fBad; // Bad Pixels + MGeomCam*fGeom; // Camera geometry - TArrayI fNumEventsUsed; // Number of events used for pedestal calc for each pixel - TArrayI fTotalCounter; // Counter for dumping values to Pedestal Container - TArrayD fSumx; // sum of values - TArrayD fSumx2; // sum of squared values - TArrayD fSumAB0; // sum of ABFlag=0 slices - TArrayD fSumAB1; // sum of ABFlag=1 slices + TArrayI fNumEventsUsed; // Number of events used for pedestal calc for each pixel + TArrayI fTotalCounter; // Counter for dumping values to Pedestal Container + TArrayD fSumx; // sum of values + TArrayD fSumx2; // sum of squared values + TArrayD fSumAB0; // sum of ABFlag=0 slices + TArrayD fSumAB1; // sum of ABFlag=1 slices - Int_t PreProcess ( MParList *pList ); - Bool_t ReInit ( MParList *pList ); + Int_t PreProcess (MParList *pList); + Bool_t ReInit (MParList *pList); Int_t Process (); Int_t PostProcess(); public: - MPedCalcFromLoGain(const char *name=NULL, const char *title=NULL); Index: trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc =================================================================== --- trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc (revision 4555) +++ trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc (revision 4556) @@ -135,9 +135,4 @@ #include "MGeomCam.h" -#include "MBadPixelsPix.h" -#include "MBadPixelsCam.h" - -#include "MGeomCamMagic.h" - ClassImp(MPedCalcPedRun); @@ -168,14 +163,14 @@ : fWindowSizeHiGain(fgHiGainWindowSize), fWindowSizeLoGain(fgLoGainWindowSize), - fGeom(NULL),fBad(NULL) -{ - fName = name ? name : "MPedCalcPedRun"; - fTitle = title ? title : "Task to calculate pedestals from pedestal runs raw data"; - - AddToBranchList("fHiGainPixId"); - AddToBranchList("fHiGainFadcSamples"); - - SetRange(fgHiGainFirst, fgHiGainLast, fgLoGainFirst, fgLoGainLast); - Clear(); + fGeom(NULL) +{ + fName = name ? name : "MPedCalcPedRun"; + fTitle = title ? title : "Task to calculate pedestals from pedestal runs raw data"; + + AddToBranchList("fHiGainPixId"); + AddToBranchList("fHiGainFadcSamples"); + + SetRange(fgHiGainFirst, fgHiGainLast, fgLoGainFirst, fgLoGainLast); + Clear(); } @@ -190,10 +185,9 @@ void MPedCalcPedRun::Clear(const Option_t *o) { - - fNumSamplesTot = 0; - - fRawEvt = NULL; - fRunHeader = NULL; - fPedestals = NULL; + fNumSamplesTot = 0; + + fRawEvt = NULL; + fRunHeader = NULL; + fPedestals = NULL; } @@ -208,14 +202,11 @@ void MPedCalcPedRun::SetRange(Byte_t hifirst, Byte_t hilast, Byte_t lofirst, Byte_t lolast) { - - MExtractor::SetRange(hifirst,hilast,lofirst,lolast); - - // - // Redo the checks if the window is still inside the ranges - // - SetWindowSize(fWindowSizeHiGain,fWindowSizeLoGain); - -} - + MExtractor::SetRange(hifirst,hilast,lofirst,lolast); + + // + // Redo the checks if the window is still inside the ranges + // + SetWindowSize(fWindowSizeHiGain,fWindowSizeLoGain); +} // -------------------------------------------------------------------------- @@ -275,9 +266,6 @@ fSqrtHiGainSamples = TMath::Sqrt(fNumHiGainSamples); fSqrtLoGainSamples = TMath::Sqrt(fNumLoGainSamples); - -} - - - +} + // -------------------------------------------------------------------------- // @@ -287,5 +275,4 @@ // - MRawRunHeader // - MGeomCam -// - MBadPixelsCam // // The following output containers are also searched and created if @@ -296,5 +283,4 @@ Int_t MPedCalcPedRun::PreProcess( MParList *pList ) { - Clear(); @@ -313,5 +299,5 @@ } - fGeom = (MGeomCam*)pList->FindObject("MGeomCam"); + fGeom = (MGeomCam*)pList->FindObject("MGeomCam"); if (!fGeom) { @@ -323,6 +309,4 @@ if (!fPedestals) return kFALSE; - - fBad = (MBadPixelsCam*)pList->FindObject("MBadPixelsCam"); return kTRUE; @@ -345,11 +329,6 @@ // modifying the ranges again, if necessary. // -// A loop over the MBadPixelsCam is performed and bad pixels are set -// to MPedestalPix::SetValid(kFALSE); -// Bool_t MPedCalcPedRun::ReInit(MParList *pList) { - - Int_t lastdesired = (Int_t)fLoGainLast; Int_t lastavailable = (Int_t)fRunHeader->GetNumSamplesLoGain()-1; @@ -414,7 +393,7 @@ - Int_t npixels = fPedestals->GetSize(); - Int_t areas = fPedestals->GetAverageAreas(); - Int_t sectors = fPedestals->GetAverageSectors(); + const Int_t npixels = fPedestals->GetSize(); + const Int_t areas = fPedestals->GetAverageAreas(); + const Int_t sectors = fPedestals->GetAverageSectors(); if (fSumx.GetSize()==0) @@ -449,16 +428,7 @@ << " LoGain FADC samples starting with slice: " << (int)fLoGainFirst << endl; - - if (fBad) - { - const Int_t nbads = fBad->GetSize(); - for (Int_t i=0; i<(nbads>npixels?npixels:nbads);i++) - if ((*fBad)[i].IsBad()) - (*fPedestals)[i].SetValid(kFALSE); - } - return kTRUE; - -} +} + // -------------------------------------------------------------------------- // @@ -469,5 +439,4 @@ Int_t MPedCalcPedRun::Process() { - MRawEvtPixelIter pixel(fRawEvt); @@ -549,5 +518,4 @@ Int_t MPedCalcPedRun::PostProcess() { - // Compute pedestals and rms from the whole run const ULong_t n = fNumSamplesTot; Index: trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.h =================================================================== --- trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.h (revision 4555) +++ trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.h (revision 4556) @@ -15,45 +15,42 @@ class MGeomCam; -class MBadPixelsCam; + class MPedCalcPedRun : public MExtractor { + static const Byte_t fgHiGainFirst; // First FADC slice Hi-Gain (currently set to: 3) + static const Byte_t fgHiGainLast; // Last FADC slice Hi-Gain (currently set to: 14) + static const Byte_t fgLoGainFirst; // First FADC slice Lo-Gain (currently set to: 3) + static const Byte_t fgLoGainLast; // Last FADC slice Lo-Gain (currently set to: 14) + static const Byte_t fgHiGainWindowSize; // The extraction window Hi-Gain + static const Byte_t fgLoGainWindowSize; // The extraction window Lo-Gain - static const Byte_t fgHiGainFirst; // First FADC slice Hi-Gain (currently set to: 3) - static const Byte_t fgHiGainLast; // Last FADC slice Hi-Gain (currently set to: 14) - static const Byte_t fgLoGainFirst; // First FADC slice Lo-Gain (currently set to: 3) - static const Byte_t fgLoGainLast; // Last FADC slice Lo-Gain (currently set to: 14) - static const Byte_t fgHiGainWindowSize; // The extraction window Hi-Gain - static const Byte_t fgLoGainWindowSize; // The extraction window Lo-Gain + UInt_t fNumSamplesTot; + Byte_t fWindowSizeHiGain; // Number of Hi Gain slices in window + Byte_t fWindowSizeLoGain; // Number of Lo Gain slices in window - UInt_t fNumSamplesTot; - Byte_t fWindowSizeHiGain; // Number of Hi Gain slices in window - Byte_t fWindowSizeLoGain; // Number of Lo Gain slices in window - - MGeomCam *fGeom; // Camera geometry - MBadPixelsCam *fBad; // Bad Pixels - - TArrayD fSumx; // sum of values - TArrayD fSumx2; // sum of squared values - TArrayD fAreaSumx; // averaged sum of values per area idx - TArrayD fAreaSumx2; // averaged sum of squared values per area idx - TArrayI fAreaValid; // number of valid pixel with area idx - TArrayD fSectorSumx; // averaged sum of values per sector - TArrayD fSectorSumx2; // averaged sum of squared values per sector - TArrayI fSectorValid; // number of valid pixel with sector idx - - Int_t PreProcess ( MParList *pList ); - Bool_t ReInit ( MParList *pList ); - Int_t Process (); - Int_t PostProcess(); - + MGeomCam *fGeom; // Camera geometry + + TArrayD fSumx; // sum of values + TArrayD fSumx2; // sum of squared values + TArrayD fAreaSumx; // averaged sum of values per area idx + TArrayD fAreaSumx2; // averaged sum of squared values per area idx + TArrayI fAreaValid; // number of valid pixel with area idx + TArrayD fSectorSumx; // averaged sum of values per sector + TArrayD fSectorSumx2; // averaged sum of squared values per sector + TArrayI fSectorValid; // number of valid pixel with sector idx + + Int_t PreProcess (MParList *pList); + Bool_t ReInit (MParList *pList); + Int_t Process (); + Int_t PostProcess(); + public: + MPedCalcPedRun(const char *name=NULL, const char *title=NULL); - MPedCalcPedRun(const char *name=NULL, const char *title=NULL); - - void Clear(const Option_t *o=""); - void SetRange(Byte_t hifirst=0, Byte_t hilast=0, Byte_t lofirst=0, Byte_t lolast=0); - void SetWindowSize(Byte_t windowh=0, Byte_t windowl=0); - - ClassDef(MPedCalcPedRun, 0) // Task to calculate pedestals from pedestal runs raw data + void Clear(const Option_t *o=""); + void SetRange(Byte_t hifirst=0, Byte_t hilast=0, Byte_t lofirst=0, Byte_t lolast=0); + void SetWindowSize(Byte_t windowh=0, Byte_t windowl=0); + + ClassDef(MPedCalcPedRun, 0) // Task to calculate pedestals from pedestal runs raw data }; Index: trunk/MagicSoft/Mars/mpedestal/MPedestalPix.cc =================================================================== --- trunk/MagicSoft/Mars/mpedestal/MPedestalPix.cc (revision 4555) +++ trunk/MagicSoft/Mars/mpedestal/MPedestalPix.cc (revision 4556) @@ -17,6 +17,6 @@ ! ! Author(s): Thomas Bretz 12/2000 -! Markus Gaug 04/2004 -! Florian Goebel 06/2004 +! Author(s): Markus Gaug 04/2004 +! Author(s): Florian Goebel 06/2004 ! ! Copyright: MAGIC Software Development, 2000-2004 @@ -26,18 +26,34 @@ ///////////////////////////////////////////////////////////////////////////// -// // -// MPedestalPix // -// // -// This is the storage container to hold informations about the pedestal // -// (offset) value of one Pixel (PMT). // -// // -// version 2: // -// ---------- // -// added: // -// fPedestalABoffset difference between pedestal mean of odd slices and // -// the total pedestal mean (fPedestal) // -// fNumEvents number of times, the Process was executed // -// (to estimate the error of pedestal) // -// // +// +// MPedestalPix +// +// This is the storage container to hold informations about the pedestal +// (offset) value of one Pixel (PMT). +// +// Float_t fPedestal: +// - mean value of pedestal (PMT offset) +// Float_t fPedestalRms: +// - root mean square / sigma / standard deviation of pedestal +// Float_t fPedestalABoffset: +// - the difference between odd slice pedestal mean and the +// total pedestal mean (fPedestal). For even slices pedestal +// use -fPedestalABoffset. +// UInt_t fNumEvents: +// - number of times, the Process was executed (to estimate the error +// of pedestal) +// +// version 2: +// ---------- +// added: +// fPedestalABoffset difference between pedestal mean of odd slices and +// the total pedestal mean (fPedestal) +// fNumEvents number of times, the Process was executed +// (to estimate the error of pedestal) +// +// version 3: +// ---------- +// - fValid removed +// ///////////////////////////////////////////////////////////////////////////// #include "MPedestalPix.h" @@ -50,10 +66,12 @@ using namespace std; +// ------------------------------------------------------------------------ +// +// Default constructor. Calls Clear() +// MPedestalPix::MPedestalPix() - : fValid(kTRUE) { - Clear(); + Clear(); } - // ------------------------------------------------------------------------ @@ -63,35 +81,40 @@ void MPedestalPix::Clear(Option_t *o) { - fPedestal = -1.; - fPedestalRms = -1.; - fPedestalABoffset = -1.; - fNumEvents = 0; + fPedestal = -1; + fPedestalRms = -1; + fPedestalABoffset = -1; + fNumEvents = 0; } +// ------------------------------------------------------------------------ +// +// Set all values to 0 +// void MPedestalPix::InitUseHists() { - - fPedestal = 0.; - fPedestalRms = 0.; - fPedestalABoffset = 0.; - fNumEvents = 0; + fPedestal = 0; + fPedestalRms = 0; + fPedestalABoffset = 0; + fNumEvents = 0; } - +// ------------------------------------------------------------------------ +// +// Set fPedestal=m, fPedestalRms=r, fPedestalABoffset=offs, fNumEvents=n +// void MPedestalPix::Set(Float_t m, Float_t r, Float_t offs, UInt_t n) { - fPedestal = m; - fPedestalRms = r; - fPedestalABoffset = offs; - fNumEvents = n; + fPedestal = m; + fPedestalRms = r; + fPedestalABoffset = offs; + fNumEvents = n; } - +// ------------------------------------------------------------------------ +// +// Return kTRUE if pedestal AND pedestal rms is valid (>=0) +// Bool_t MPedestalPix::IsValid() const { - - if (!fValid) - return kFALSE; - - return fPedestal>=0||fPedestalRms>=0; + return fPedestal>=0 && fPedestalRms>=0; } Index: trunk/MagicSoft/Mars/mpedestal/MPedestalPix.h =================================================================== --- trunk/MagicSoft/Mars/mpedestal/MPedestalPix.h (revision 4555) +++ trunk/MagicSoft/Mars/mpedestal/MPedestalPix.h (revision 4556) @@ -9,42 +9,36 @@ { private: + Float_t fPedestal; // mean value of pedestal (PMT offset) + Float_t fPedestalRms; // root mean square / sigma / standard deviation of pedestal + Float_t fPedestalABoffset; // the difference between odd slice pedestal mean and total mean + UInt_t fNumEvents; // number of times, the Process was executed (to estimate the error of pedestal) - Float_t fPedestal; // mean value of pedestal (PMT offset) - Float_t fPedestalRms; // root mean square / sigma / standard deviation of pedestal - Float_t fPedestalABoffset; // the difference between odd slice pedestal mean and the - // total pedestal mean (fPedestal). For even slices pedestal - // use -fPedestalABoffset. - UInt_t fNumEvents; // number of times, the Process was executed (to estimate the error of pedestal) - Bool_t fValid; // flag to set pixel valid - public: - MPedestalPix(); - - void Clear(Option_t *o=""); - - // Using histograms - void InitUseHists(); - + MPedestalPix(); + + void Clear(Option_t *o=""); + + // Using histograms + void InitUseHists(); + // Setters - void SetPedestal(const Float_t f) { fPedestal = f; } - void SetPedestalRms(const Float_t f) { fPedestalRms = f; } - void SetPedestalABoffset(const Float_t f) { fPedestalABoffset = f; } - void SetNumEvents(const UInt_t n) { fNumEvents = n; } + void SetPedestal(const Float_t f) { fPedestal = f; } + void SetPedestalRms(const Float_t f) { fPedestalRms = f; } + void SetPedestalABoffset(const Float_t f) { fPedestalABoffset = f; } + void SetNumEvents(const UInt_t n) { fNumEvents = n; } - void Set(const Float_t m, const Float_t r, const Float_t offs=0, const UInt_t n=0); - void SetValid(const Bool_t b=kTRUE) { fValid = b; } - - // Getters - Float_t GetPedestal() const { return fPedestal; } - Float_t GetPedestalRms() const { return fPedestalRms; } - Float_t GetPedestalABoffset() const { return fPedestalABoffset; } - Float_t GetPedestalError() const { return fNumEvents>0 ? fPedestalRms/TMath::Sqrt((Float_t)fNumEvents) : 0; } - Float_t GetPedestalRmsError() const { return fNumEvents>0 ? fPedestalRms/TMath::Sqrt((Float_t)fNumEvents/2) : 0; } - - Bool_t IsValid() const; + void Set(const Float_t m, const Float_t r, const Float_t offs=0, const UInt_t n=0); - ClassDef(MPedestalPix, 2) // Storage Container for Pedestal information of one pixel + // Getters + Float_t GetPedestal() const { return fPedestal; } + Float_t GetPedestalRms() const { return fPedestalRms; } + Float_t GetPedestalABoffset() const { return fPedestalABoffset; } + Float_t GetPedestalError() const { return fNumEvents>0 ? fPedestalRms/TMath::Sqrt((Float_t)fNumEvents) : 0; } + Float_t GetPedestalRmsError() const { return fNumEvents>0 ? fPedestalRms/TMath::Sqrt((Float_t)fNumEvents/2) : 0; } + + Bool_t IsValid() const; + + ClassDef(MPedestalPix, 3) // Storage Container for Pedestal information of one pixel }; #endif -