Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 7809) +++ /trunk/MagicSoft/Mars/Changelog (revision 7810) @@ -134,4 +134,25 @@ - fixed a deprecated conversion from string constant to `char* + * mfbase/MFilterList.cc: + - improved warn output + + * msignal/MArrivalTimeCalc2.cc, msignal/MArrivalTimePix.[h,cc], + msignal/MExtractFixedWindowPeakSearch.cc, msignal/MExtractSignal.cc, + msignal/MExtractSignal2.cc, msignal/MExtractSignal3.cc, + msignal/MExtractSignalABcorr.cc, msignal/MExtractTime.cc, + msignal/MExtractTimeAndCharge.cc, msignal/MExtractor.cc, + msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc: + - removed first obsolete argument from SetGainSaturation + + * msignal/MExtractedSignalCam.[h,cc]: + - removed obsolete fNdf + - increased class version + + * msignal/MExtractedSignalPix.[h,cc]: + - removed obsolete fIsLoGainUsed + - removed obsolete fChisquare + - increased class version + - removed obsolete first argument from SetGainSaturation + Index: /trunk/MagicSoft/Mars/mfbase/MFilterList.cc =================================================================== --- /trunk/MagicSoft/Mars/mfbase/MFilterList.cc (revision 7809) +++ /trunk/MagicSoft/Mars/mfbase/MFilterList.cc (revision 7810) @@ -218,5 +218,5 @@ if (fFilters.FindObject(filter)) { - *fLog << warn << dbginf << "Filter already existing... skipped." << endl; + *fLog << warn << dbginf << "Filter " << filter << " already existing... skipped." << endl; return kTRUE; } Index: /trunk/MagicSoft/Mars/msignal/MArrivalTimeCalc2.cc =================================================================== --- /trunk/MagicSoft/Mars/msignal/MArrivalTimeCalc2.cc (revision 7809) +++ /trunk/MagicSoft/Mars/msignal/MArrivalTimeCalc2.cc (revision 7810) @@ -245,5 +245,5 @@ pix.SetArrivalTime(timehi+ Float_t(fHiGainFirst), deltatimehi, timelo + Float_t(fLoGainFirst), deltatimelo); - pix.SetGainSaturation(sathi, sathi, satlo); + pix.SetGainSaturation(sathi, satlo); } Index: /trunk/MagicSoft/Mars/msignal/MArrivalTimePix.cc =================================================================== --- /trunk/MagicSoft/Mars/msignal/MArrivalTimePix.cc (revision 7809) +++ /trunk/MagicSoft/Mars/msignal/MArrivalTimePix.cc (revision 7810) @@ -95,9 +95,8 @@ } -void MArrivalTimePix::SetGainSaturation(Bool_t sat, Byte_t higain, Byte_t logain) +void MArrivalTimePix::SetGainSaturation(Byte_t higain, Byte_t logain) { - - fNumHiGainSaturated = higain; - fNumLoGainSaturated = logain; + fNumHiGainSaturated = higain; + fNumLoGainSaturated = logain; } Index: /trunk/MagicSoft/Mars/msignal/MArrivalTimePix.h =================================================================== --- /trunk/MagicSoft/Mars/msignal/MArrivalTimePix.h (revision 7809) +++ /trunk/MagicSoft/Mars/msignal/MArrivalTimePix.h (revision 7810) @@ -26,5 +26,5 @@ void SetArrivalTime(Float_t sig, Float_t sigerr); void SetArrivalTime(Float_t sighi, Float_t sighierr,Float_t siglo, Float_t sigloerr); - void SetGainSaturation(Bool_t sat, Byte_t higain, Byte_t logain); + void SetGainSaturation(Byte_t higain, Byte_t logain); // Getter Index: /trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.cc =================================================================== --- /trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.cc (revision 7809) +++ /trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.cc (revision 7810) @@ -486,5 +486,5 @@ sumlo - pedes*fNumLoGainSamples, pedrms*fSqrtLoGainSamples); - pix.SetGainSaturation(sathi, sathi, satlo); + pix.SetGainSaturation(sathi, satlo); // pix.SetNumHiGainSlices(fNumHiGainSamples); Index: /trunk/MagicSoft/Mars/msignal/MExtractSignal.cc =================================================================== --- /trunk/MagicSoft/Mars/msignal/MExtractSignal.cc (revision 7809) +++ /trunk/MagicSoft/Mars/msignal/MExtractSignal.cc (revision 7810) @@ -179,5 +179,5 @@ sumlo - pedes*fNumLoGainSamples, pedrms*fSqrtLoGainSamples); - pix.SetGainSaturation(sathi, sathi, satlo); + pix.SetGainSaturation(sathi, satlo); } /* while (pixel.Next()) */ Index: /trunk/MagicSoft/Mars/msignal/MExtractSignal2.cc =================================================================== --- /trunk/MagicSoft/Mars/msignal/MExtractSignal2.cc (revision 7809) +++ /trunk/MagicSoft/Mars/msignal/MExtractSignal2.cc (revision 7810) @@ -250,5 +250,5 @@ sumlo - pedes*fWindowSizeLoGain, pedrms*fWindowSqrtLoGain); - pix.SetGainSaturation(sathi, sathi, satlo); + pix.SetGainSaturation(sathi, satlo); } /* while (pixel.Next()) */ Index: /trunk/MagicSoft/Mars/msignal/MExtractSignal3.cc =================================================================== --- /trunk/MagicSoft/Mars/msignal/MExtractSignal3.cc (revision 7809) +++ /trunk/MagicSoft/Mars/msignal/MExtractSignal3.cc (revision 7810) @@ -351,5 +351,5 @@ sumlo - pedes*fWindowSizeLoGain, pedrms*fWindowSqrtLoGain); - pix.SetGainSaturation(sathi, sathi, satlo); + pix.SetGainSaturation(sathi, satlo); } /* while (pixel.Next()) */ Index: /trunk/MagicSoft/Mars/msignal/MExtractSignalABcorr.cc =================================================================== --- /trunk/MagicSoft/Mars/msignal/MExtractSignalABcorr.cc (revision 7809) +++ /trunk/MagicSoft/Mars/msignal/MExtractSignalABcorr.cc (revision 7810) @@ -199,5 +199,5 @@ sumlo - pedtotlo, pedrms*fSqrtLoGainSamples); - pix.SetGainSaturation(sathi, sathi, satlo); + pix.SetGainSaturation(sathi, satlo); } /* while (pixel.Next()) */ Index: /trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc =================================================================== --- /trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc (revision 7809) +++ /trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc (revision 7810) @@ -242,9 +242,9 @@ MExtractedSignalPix &pix = (*fSignals)[pixidx]; MArrivalTimePix &tix = (*fArrTime)[pixidx]; - pix.SetExtractedSignal(sumhi, deltasumhi,sumlo, deltasumlo); - pix.SetGainSaturation(sathi, sathi, satlo); + pix.SetExtractedSignal(sumhi, deltasumhi, sumlo, deltasumlo); + pix.SetGainSaturation(sathi, satlo); tix.SetArrivalTime(timehi, deltatimehi, timelo-fOffsetLoGain, deltatimelo); - tix.SetGainSaturation(sathi, sathi, satlo); + tix.SetGainSaturation(sathi, satlo); } /* while (pixel.Next()) */ Index: /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc =================================================================== --- /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc (revision 7809) +++ /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc (revision 7810) @@ -452,8 +452,8 @@ MArrivalTimePix &tix = (*fArrTime)[pixidx]; pix.SetExtractedSignal(sumhi, deltasumhi,sumlo, deltasumlo); - pix.SetGainSaturation(sathi, sathi, satlo); + pix.SetGainSaturation(sathi, satlo); tix.SetArrivalTime(timehi, deltatimehi, timelo-fOffsetLoGain, deltatimelo); - tix.SetGainSaturation(sathi, sathi, satlo); + tix.SetGainSaturation(sathi, satlo); } /* while (pixel.Next()) */ Index: /trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.cc =================================================================== --- /trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.cc (revision 7809) +++ /trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.cc (revision 7810) @@ -19,5 +19,5 @@ ! Author(s): Thomas Bretz 12/2003 ! -! Copyright: MAGIC Software Development, 2000-2004 +! Copyright: MAGIC Software Development, 2000-2006 ! ! @@ -29,4 +29,8 @@ // // Hold the Extracted Signal information for all pixels in the camera +// +// Class Version 3: +// ---------------- +// - fNdf // ///////////////////////////////////////////////////////////////////////////// @@ -51,5 +55,5 @@ : fFirstUsedSliceHiGain(0), fFirstUsedSliceLoGain(0), fLastUsedSliceHiGain(0), fLastUsedSliceLoGain(0), - fUsedWindowHiGain(0.), fUsedWindowLoGain(0.), fNdf(-1) + fUsedWindowHiGain(0.), fUsedWindowLoGain(0.) { fName = name ? name : "MExtractedSignalCam"; @@ -114,4 +118,5 @@ } +/* Float_t MExtractedSignalCam::GetProb( const Int_t pixidx ) const { @@ -121,4 +126,5 @@ return TMath::Prob((*this)[pixidx].GetChisquare(),fNdf); } +*/ void MExtractedSignalCam::Clear(Option_t *o) Index: /trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.h =================================================================== --- /trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.h (revision 7809) +++ /trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.h (revision 7810) @@ -28,8 +28,5 @@ Float_t fUsedWindowLoGain; // Low Gain FADC extraction window - Int_t fNdf; // Number of degrees of freedom for a possible fit - public: - MExtractedSignalCam(const char *name=NULL, const char *title=NULL); ~MExtractedSignalCam(); @@ -51,9 +48,5 @@ Float_t GetNumUsedLoGainFADCSlices() const { return fUsedWindowLoGain; } - Float_t GetNdf() const { return fNdf; } - Float_t GetProb( const Int_t pixidx) const; - void SetLogStream ( MLog *lg ); - void SetNdf ( Int_t ndf ) { fNdf = ndf; } void SetUsedFADCSlices(Byte_t firsth, Byte_t lasth, Float_t winh, Byte_t firstl, Byte_t lastl, Float_t winl) @@ -73,5 +66,5 @@ void DrawPixelContent(Int_t num) const; - ClassDef(MExtractedSignalCam, 2) // Storage Container for extracted signals in the camera + ClassDef(MExtractedSignalCam, 3) // Storage Container for extracted signals in the camera }; Index: /trunk/MagicSoft/Mars/msignal/MExtractedSignalPix.cc =================================================================== --- /trunk/MagicSoft/Mars/msignal/MExtractedSignalPix.cc (revision 7809) +++ /trunk/MagicSoft/Mars/msignal/MExtractedSignalPix.cc (revision 7810) @@ -30,4 +30,9 @@ // This is the storage container to hold informations about the pedestal // (offset) value of one Pixel (PMT). +// +// Class Version 3: +// ---------------- +// - fIsLoGainUsed +// - fChisquare // ///////////////////////////////////////////////////////////////////////////// @@ -72,10 +77,6 @@ fExtractedSignalLoGainError = -1; - fLoGainUsed = kFALSE; - fNumHiGainSaturated = 0; fNumLoGainSaturated = 0; - - fChisquare = -1.; } @@ -100,10 +101,8 @@ } -void MExtractedSignalPix::SetGainSaturation(Bool_t sat, Byte_t higain, Byte_t logain) +void MExtractedSignalPix::SetGainSaturation(Byte_t higain, Byte_t logain) { - - fLoGainUsed = sat; - fNumHiGainSaturated = higain; - fNumLoGainSaturated = logain; + fNumHiGainSaturated = higain; + fNumLoGainSaturated = logain; } @@ -112,5 +111,4 @@ *fLog << " Signal: " << fExtractedSignalHiGain << " +- " << fExtractedSignalHiGainError - << " LoGain? " << fLoGainUsed << " Nr. Sat. Hi Gain: " << fNumHiGainSaturated << " Nr. Sat. Lo Gain: " << fNumLoGainSaturated Index: /trunk/MagicSoft/Mars/msignal/MExtractedSignalPix.h =================================================================== --- /trunk/MagicSoft/Mars/msignal/MExtractedSignalPix.h (revision 7809) +++ /trunk/MagicSoft/Mars/msignal/MExtractedSignalPix.h (revision 7810) @@ -15,7 +15,4 @@ Float_t fExtractedSignalLoGainError; // error of the mean value of the extracted signal - Float_t fChisquare; // Chi-square of a possible fit the pulse - - Bool_t fLoGainUsed; Byte_t fNumHiGainSaturated; Byte_t fNumLoGainSaturated; @@ -30,6 +27,5 @@ void SetExtractedSignal( Float_t sig, Float_t sigerr); void SetExtractedSignal( Float_t sighi, Float_t sighierr,Float_t siglo, Float_t sigloerr); - void SetGainSaturation ( Bool_t sat, Byte_t higain, Byte_t logain); - void SetChisquare ( Float_t chi2 ) { fChisquare = chi2; } + void SetGainSaturation ( Byte_t higain, Byte_t logain); // Getter @@ -43,10 +39,8 @@ Byte_t GetNumLoGainSaturated() const { return fNumLoGainSaturated; } - Float_t GetChisquare() const { return fChisquare; } - - Bool_t IsLoGainUsed() const { return fLoGainUsed; } + Bool_t IsLoGainUsed() const { return fNumHiGainSaturated>0; } Bool_t IsValid() const; - ClassDef(MExtractedSignalPix, 2) // Storage Container for Extracted Signal information of one pixel + ClassDef(MExtractedSignalPix, 3) // Storage Container for Extracted Signal information of one pixel }; Index: /trunk/MagicSoft/Mars/msignal/MExtractor.cc =================================================================== --- /trunk/MagicSoft/Mars/msignal/MExtractor.cc (revision 7809) +++ /trunk/MagicSoft/Mars/msignal/MExtractor.cc (revision 7810) @@ -326,5 +326,5 @@ sumlo - pedes*fNumLoGainSamples, pedrms*fSqrtLoGainSamples); - pix.SetGainSaturation(sathi, sathi, satlo); + pix.SetGainSaturation(sathi, satlo); } /* while (pixel.Next()) */