Index: trunk/MagicSoft/Mars/manalysis/MExtractedSignalCam.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MExtractedSignalCam.cc (revision 2912) +++ trunk/MagicSoft/Mars/manalysis/MExtractedSignalCam.cc (revision 2914) @@ -19,5 +19,5 @@ ! Author(s): Thomas Bretz 12/2003 ! -! Copyright: MAGIC Software Development, 2000-2003 +! Copyright: MAGIC Software Development, 2000-2004 ! ! @@ -25,12 +25,11 @@ ///////////////////////////////////////////////////////////////////////////// -// // -// MExtractedSignalCam // -// // -// Hold the Extracted Signal information for all pixels in the camera // -// // +// +// MExtractedSignalCam +// +// Hold the Extracted Signal information for all pixels in the camera +// ///////////////////////////////////////////////////////////////////////////// #include "MExtractedSignalCam.h" -#include "MExtractedSignalPix.h" #include @@ -39,5 +38,5 @@ #include "MLogManip.h" -#include "MGeomCam.h" +#include "MExtractedSignalPix.h" ClassImp(MExtractedSignalCam); @@ -55,5 +54,4 @@ fArray = new TClonesArray("MExtractedSignalPix", 1); - } @@ -65,4 +63,14 @@ { delete fArray; +} + +// -------------------------------------------------------------------------- +// +// Distribute logging stream to all childs +// +void MExtractedSignalCam::SetLogStream(MLog *lg) +{ + fArray->ForEach(MParContainer, SetLogStream)(lg); + MParContainer::SetLogStream(lg); } @@ -87,5 +95,5 @@ // -------------------------------------------------------------------------- // -// Get i-th pixel (pixel number) +// Get i-th pixel (pixel index) // MExtractedSignalPix &MExtractedSignalCam::operator[](Int_t i) @@ -96,11 +104,10 @@ // -------------------------------------------------------------------------- // -// Get i-th pixel (pixel number) +// Get i-th pixel (pixel index) // -MExtractedSignalPix &MExtractedSignalCam::operator[](Int_t i) const +const MExtractedSignalPix &MExtractedSignalCam::operator[](Int_t i) const { return *static_cast(fArray->UncheckedAt(i)); } - void MExtractedSignalCam::Clear(Option_t *o) @@ -112,5 +119,5 @@ { *fLog << all << GetDescriptor() << ":" << endl; - int id = 0; + int idx = -1; TIter Next(fArray); @@ -118,11 +125,11 @@ while ((pix=(MExtractedSignalPix*)Next())) { - id++; + idx++; if (!pix->IsValid()) continue; - *fLog << id-1 << ": " << endl; - pix->PrintOut(); + *fLog << idx << ": "; + pix->Print(); } } Index: trunk/MagicSoft/Mars/manalysis/MExtractedSignalCam.h =================================================================== --- trunk/MagicSoft/Mars/manalysis/MExtractedSignalCam.h (revision 2912) +++ trunk/MagicSoft/Mars/manalysis/MExtractedSignalCam.h (revision 2914) @@ -25,21 +25,23 @@ ~MExtractedSignalCam(); + void Print(Option_t *o="") const; void Clear(Option_t *o=""); + void SetLogStream(MLog *lg); void InitSize(const UInt_t i); Int_t GetSize() const; - Byte_t GetNumUsedFADCSlices() { return fLastUsedSliceHiGain-fFirstUsedSliceHiGain+1; } - Byte_t GetNumUsedHiGainFADCSlices() { return fLastUsedSliceHiGain-fFirstUsedSliceHiGain+1; } - Byte_t GetNumUsedLoGainFADCSlices() { return fLastUsedSliceLoGain-fFirstUsedSliceLoGain+1; } + Byte_t GetNumUsedFADCSlices() const { return fLastUsedSliceHiGain-fFirstUsedSliceHiGain+1; } + Byte_t GetNumUsedHiGainFADCSlices() const { return fLastUsedSliceHiGain-fFirstUsedSliceHiGain+1; } + Byte_t GetNumUsedLoGainFADCSlices() const { return fLastUsedSliceLoGain-fFirstUsedSliceLoGain+1; } - Byte_t GetFirstUsedSliceHiGain() { return fFirstUsedSliceHiGain; } - Byte_t GetLastUsedSliceHiGain() { return fLastUsedSliceHiGain; } + Byte_t GetFirstUsedSliceHiGain() const { return fFirstUsedSliceHiGain; } + Byte_t GetLastUsedSliceHiGain() const { return fLastUsedSliceHiGain; } - Byte_t GetFirstUsedSliceLoGain() { return fFirstUsedSliceLoGain; } - Byte_t GetLastUsedSliceLoGain() { return fLastUsedSliceLoGain; } + Byte_t GetFirstUsedSliceLoGain() const { return fFirstUsedSliceLoGain; } + Byte_t GetLastUsedSliceLoGain() const { return fLastUsedSliceLoGain; } void SetUsedFADCSlices(Byte_t firsth, Byte_t lasth, - Byte_t firstl, Byte_t lastl) + Byte_t firstl, Byte_t lastl) { fFirstUsedSliceHiGain = firsth; @@ -50,7 +52,5 @@ MExtractedSignalPix &operator[](Int_t i); - MExtractedSignalPix &operator[](Int_t i) const; - - void Print(Option_t *o="") const; + const MExtractedSignalPix &operator[](Int_t i) const; Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const; Index: trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.cc (revision 2912) +++ trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.cc (revision 2914) @@ -25,12 +25,13 @@ ///////////////////////////////////////////////////////////////////////////// -// // -// MExtractedSignalPix // -// // -// This is the storage container to hold informations about the pedestal // -// (offset) value of one Pixel (PMT). // -// // +// +// MExtractedSignalPix +// +// This is the storage container to hold informations about the pedestal +// (offset) value of one Pixel (PMT). +// ///////////////////////////////////////////////////////////////////////////// #include "MExtractedSignalPix.h" + #include "MLog.h" #include "MLogManip.h" @@ -39,5 +40,8 @@ using namespace std; + static const Float_t gkSignalInitializer = 99999.9; + +// ------------------------------------------------------------------------ // // MExtractedSignalPix holds the extracted signal (HiGain and LoGain) @@ -57,11 +61,7 @@ fNumLoGainSaturated(0) { - fName = name ? name : "MExtractedSignalPix"; fTitle = title ? title : "Container of the Extracted Signals"; - } - - // ------------------------------------------------------------------------ @@ -71,5 +71,4 @@ void MExtractedSignalPix::Clear(Option_t *o) { - fExtractedSignalHiGain = gkSignalInitializer; fExtractedSignalHiGainError = gkSignalInitializer; @@ -78,18 +77,14 @@ fIsLoGainUsed = kFALSE; + fNumHiGainSaturated = 0; fNumLoGainSaturated = 0; - } void MExtractedSignalPix::SetExtractedSignal(Float_t sig, Float_t sigerr) { - fExtractedSignalHiGain = sig; fExtractedSignalHiGainError = sigerr; - - return; } - void MExtractedSignalPix::SetExtractedSignal(Float_t sighi, Float_t sighierr, @@ -100,15 +95,10 @@ fExtractedSignalLoGain = siglo; fExtractedSignalLoGainError = sigloerr; - - return; } Bool_t MExtractedSignalPix::IsValid() const { - - return fExtractedSignalHiGain >= 0. || fExtractedSignalHiGainError >= 0.; - + return fExtractedSignalHiGain >= 0. || fExtractedSignalHiGainError >= 0.; } - void MExtractedSignalPix::SetGainSaturation(Bool_t sat, Byte_t higain, Byte_t logain) @@ -118,23 +108,13 @@ fNumHiGainSaturated = higain; fNumLoGainSaturated = logain; - - return; - } - - -void MExtractedSignalPix::PrintOut() +void MExtractedSignalPix::Print(Option_t *o) const { - - *fLog << all << GetDescriptor() << ":" << endl; - - *fLog << " Signal: " << fExtractedSignalHiGain - << " +- " << fExtractedSignalHiGainError - << " LoGain? " << fIsLoGainUsed - << " Nr. Sat. Hi Gain: " << fNumHiGainSaturated - << " Nr. Sat. Lo Gain: " << fNumLoGainSaturated - << endl; - + *fLog << " Signal: " << fExtractedSignalHiGain + << " +- " << fExtractedSignalHiGainError + << " LoGain? " << fIsLoGainUsed + << " Nr. Sat. Hi Gain: " << fNumHiGainSaturated + << " Nr. Sat. Lo Gain: " << fNumLoGainSaturated + << endl; } - Index: trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h =================================================================== --- trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h (revision 2912) +++ trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h (revision 2914) @@ -9,5 +9,4 @@ { private: - Float_t fExtractedSignalHiGain; // mean value of the extracted signal Float_t fExtractedSignalHiGainError; // error of the mean value of the extracted signal @@ -20,8 +19,8 @@ public: - MExtractedSignalPix(const char* name=NULL, const char* title=NULL); void Clear(Option_t *o=""); + void Print(Option_t *o="") const; // Setter @@ -42,9 +41,6 @@ Bool_t IsValid() const; - void PrintOut(); - ClassDef(MExtractedSignalPix, 0) // Storage Container for Extracted Signal information of one pixel }; #endif -