Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 8131) +++ trunk/MagicSoft/Mars/Changelog (revision 8132) @@ -32,4 +32,19 @@ possible set of weights. This also gives correct numbers for the lo-gains which were totally wrong before. + + * datacenter/macros/plotdb.C: + - updated the bin width of the histograms + + * mbadpixels/MBadPixelsTreat.cc, mcalib/MCalibrateData.cc, + mcalib/MCalibrationChargeCalc.cc, mfilter/MFCosmics.cc, + mhcalib/MHCalibrationHiLoCam.cc: + - added some comments + + * mcalib/MCalibrationHiLoPix.h: + - commented out the unused function GetOffsetPerSlice + + * msignal/MArrivalTimeCam.[h,cc]: + - removed unused data members + Index: trunk/MagicSoft/Mars/datacenter/macros/plotdb.C =================================================================== --- trunk/MagicSoft/Mars/datacenter/macros/plotdb.C (revision 8131) +++ trunk/MagicSoft/Mars/datacenter/macros/plotdb.C (revision 8132) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: plotdb.C,v 1.28 2006-10-19 13:57:14 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc =================================================================== --- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc (revision 8131) +++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc (revision 8132) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MBadPixelsTreat.cc,v 1.37 2006-10-19 13:57:40 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -499,7 +501,10 @@ { const Int_t aidx = gpix.GetAidx(); + // This is to which bias level the signal fluctuates const Double_t mean = fPedPhot1->GetArea(aidx).GetMean(); + // This is how the signal fluctuates const Double_t rms = fPedPhot2->GetArea(aidx).GetRms(); const Double_t phe = gRandom->Gaus(mean, rms); + (*fEvt)[i].SetNumPhotons(phe); } Index: trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc (revision 8131) +++ trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc (revision 8132) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.61 2006-10-19 13:58:29 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -23,5 +25,5 @@ ! Author(s): Thomas Bretz 08/2004 ! -! Copyright: MAGIC Software Development, 2000-2004 +! Copyright: MAGIC Software Development, 2000-2006 ! ! @@ -734,4 +736,8 @@ const UInt_t npix = fSignals->GetSize(); + + // The number of used slices are just a mean value + // the real number might change from event to event. + // (up to 50%!) const Float_t slices = fSignals->GetNumUsedHiGainFADCSlices(); const Float_t sqrtslices = TMath::Sqrt(slices); Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (revision 8131) +++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (revision 8132) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.166 2006-10-17 17:15:59 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.167 2006-10-19 13:59:08 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -727,4 +727,7 @@ Int_t MCalibrationChargeCalc::Finalize() { + // The number of used slices are just a mean value + // the real number might change from event to event. + // (up to 50%!) fNumHiGainSamples = fSignal->GetNumUsedHiGainFADCSlices(); fNumLoGainSamples = fSignal->GetNumUsedLoGainFADCSlices(); Index: trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoPix.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoPix.h (revision 8131) +++ trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoPix.h (revision 8132) @@ -32,5 +32,5 @@ Float_t GetHiLoTimeDiffProb() const { return GetLoGainProb(); } Float_t GetGainRatio () const { return fGainRatio; } - Float_t GetOffsetPerSlice() const { return fOffsetPerSlice; } +// Float_t GetOffsetPerSlice() const { return fOffsetPerSlice; } ClassDef(MCalibrationHiLoPix, 2) // Container HiLo conversion Calibration Results Pixel Index: trunk/MagicSoft/Mars/mfilter/MFCosmics.cc =================================================================== --- trunk/MagicSoft/Mars/mfilter/MFCosmics.cc (revision 8131) +++ trunk/MagicSoft/Mars/mfilter/MFCosmics.cc (revision 8132) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MFCosmics.cc,v 1.15 2006-10-19 14:01:03 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * @@ -19,5 +21,5 @@ ! Author(s): Thomas Bretz ! -! Copyright: MAGIC Software Development, 2000-2005 +! Copyright: MAGIC Software Development, 2000-2006 ! ! @@ -137,4 +139,6 @@ Bool_t MFCosmics::ReInit(MParList *pList) { + // The number here is just an average number. The real number + // might change from event to event (up to 50%!) fSqrtHiGainSamples = TMath::Sqrt((Float_t) fSignals->GetNumUsedHiGainFADCSlices()); Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc (revision 8131) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc (revision 8132) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MHCalibrationHiLoCam.cc,v 1.19 2006-10-17 17:16:00 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MHCalibrationHiLoCam.cc,v 1.20 2006-10-19 14:01:49 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -738,6 +738,9 @@ const Float_t gainr = fit->GetParameter(1) > 0.001 - ? 1./fit->GetParameter(1) - : 0.; + ? 1./fit->GetParameter(1) : 0.; + + // The number of used slices are just a mean value + // the real number might change from event to event. + // (up to 50%!) const Float_t offset = fit->GetParameter(0)/fUsedLoGainSlices; @@ -798,6 +801,9 @@ const Float_t gainr = fit->GetParameter(1) > 0.001 - ? 1./fit->GetParameter(1) - : 0.; + ? 1./fit->GetParameter(1) : 0.; + + // The number of used slices are just a mean value + // the real number might change from event to event. + // (up to 50%!) const Float_t offset = fit->GetParameter(0)/fUsedLoGainSlices; @@ -823,6 +829,9 @@ const Float_t gainr = fit->GetParameter(1) > 0.001 - ? 1./fit->GetParameter(1) - : 0.; + ? 1./fit->GetParameter(1) : 0.; + + // The number of used slices are just a mean value + // the real number might change from event to event. + // (up to 50%!) const Float_t offset = fit->GetParameter(0)/fUsedLoGainSlices; Index: trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.cc =================================================================== --- trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.cc (revision 8131) +++ trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.cc (revision 8132) @@ -1,3 +1,5 @@ /* ======================================================================== *\ +! $Name: not supported by cvs2svn $:$Id: MArrivalTimeCam.cc,v 1.10 2006-10-19 14:06:46 tbretz Exp $ +! -------------------------------------------------------------------------- ! ! * Index: trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.h =================================================================== --- trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.h (revision 8131) +++ trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.h (revision 8132) @@ -18,9 +18,9 @@ TClonesArray *fArray; //-> FIXME: Change TClonesArray away from a pointer? - Byte_t fFirstUsedSliceHiGain; - Byte_t fFirstUsedSliceLoGain; +// Byte_t fFirstUsedSliceHiGain; +// Byte_t fFirstUsedSliceLoGain; - Byte_t fLastUsedSliceHiGain; - Byte_t fLastUsedSliceLoGain; +// Byte_t fLastUsedSliceHiGain; +// Byte_t fLastUsedSliceLoGain; public: @@ -37,14 +37,14 @@ Int_t GetSize() const; - 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 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() const { return fFirstUsedSliceHiGain; } - Byte_t GetLastUsedSliceHiGain() const { return fLastUsedSliceHiGain; } +// Byte_t GetFirstUsedSliceHiGain() const { return fFirstUsedSliceHiGain; } +// Byte_t GetLastUsedSliceHiGain() const { return fLastUsedSliceHiGain; } - Byte_t GetFirstUsedSliceLoGain() const { return fFirstUsedSliceLoGain; } - Byte_t GetLastUsedSliceLoGain() const { 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) @@ -55,5 +55,5 @@ fLastUsedSliceLoGain = lastl; } - + */ MArrivalTimePix &operator[](Int_t i); const MArrivalTimePix &operator[](Int_t i) const;