Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc (revision 3608) +++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc (revision 3609) @@ -96,7 +96,7 @@ using namespace std; -const Float_t MHCalibrationChargeCam::fgNumHiGainSaturationLimit = 0.005; +const Float_t MHCalibrationChargeCam::fgNumHiGainSaturationLimit = 0.01; const Float_t MHCalibrationChargeCam::fgNumLoGainSaturationLimit = 0.005; -// +const Int_t MHCalibrationChargeCam::fgPulserFrequency = 500; // // @@ -147,4 +147,5 @@ SetNumHiGainSaturationLimit(); SetNumLoGainSaturationLimit(); + SetPulserFrequency(); fNumInnerPixels = 0; @@ -352,4 +353,5 @@ (*this)[i].Init(); (*this)[i].ChangeHistId(i); + (*this)[i].SetEventFrequency(fPulserFrequency); } } @@ -371,10 +373,16 @@ (*this)(i).Init(); (*this)(i).ChangeHistId(i); - } + (*this)(i).SetEventFrequency(fPulserFrequency); + } + } + fAverageHiGainInnerPix->SetEventFrequency(fPulserFrequency); + fAverageLoGainInnerPix->SetEventFrequency(fPulserFrequency); + fAverageHiGainOuterPix->SetEventFrequency(fPulserFrequency); + fAverageLoGainOuterPix->SetEventFrequency(fPulserFrequency); + *fLog << inf << GetDescriptor() << ": " << fNumExcluded << " excluded Pixels " << endl; - return kTRUE; } @@ -505,8 +513,8 @@ } - fAverageHiGainInnerPix-> FillAbsTime(sumhiinnertot/fNumInnerPixels); - fAverageLoGainInnerPix-> FillAbsTime(sumloinnertot/fNumInnerPixels); - fAverageHiGainOuterPix-> FillAbsTime(sumhioutertot/fNumOuterPixels); - fAverageLoGainOuterPix-> FillAbsTime(sumlooutertot/fNumOuterPixels); + fAverageHiGainInnerPix->FillAbsTime(sumhiinnertot/fNumInnerPixels); + fAverageLoGainInnerPix->FillAbsTime(sumloinnertot/fNumInnerPixels); + fAverageHiGainOuterPix->FillAbsTime(sumhioutertot/fNumOuterPixels); + fAverageLoGainOuterPix->FillAbsTime(sumlooutertot/fNumOuterPixels); return kTRUE; Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h (revision 3608) +++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.h (revision 3609) @@ -28,19 +28,21 @@ static const Float_t fgNumHiGainSaturationLimit; // The default number of fNumHiGainSaturationLimit static const Float_t fgNumLoGainSaturationLimit; // The default number of fNumLoGainSaturationLimit + static const Int_t fgPulserFrequency; // The default pulser frequency + + Float_t fNumHiGainSaturationLimit; // Rel. number sat. higain FADC slices upon which the pixel is called saturated + Float_t fNumLoGainSaturationLimit; // Rel. number sat. logain FADC slices upon which the pixel is called saturated + Int_t fPulserFrequency; // The pulser frequency + + TObjArray *fHiGainArray; //-> Array of MHCalibrationChargePix with hists + TObjArray *fLoGainArray; //-> Array of MHCalibrationChargePix with hists + MHCalibrationChargeHiGainPix *fAverageHiGainInnerPix; //-> HiGain Average of all inner pixels + MHCalibrationChargeLoGainPix *fAverageLoGainInnerPix; //-> LoGain Average of all inner pixels + MHCalibrationChargeHiGainPix *fAverageHiGainOuterPix; //-> HiGain Average of all outer pixels + MHCalibrationChargeLoGainPix *fAverageLoGainOuterPix; //-> LoGain Average of all outer pixels - Float_t fNumHiGainSaturationLimit; // The rel. number of saturated higain FADC slices in the whole run upon which the pixel is called saturated - Float_t fNumLoGainSaturationLimit; // The rel. number of saturated logain FADC slices in the whole run upon which the pixel is called saturated - - TObjArray *fHiGainArray; //-> Array of MHCalibrationChargePix with hists - TObjArray *fLoGainArray; //-> Array of MHCalibrationChargePix with hists - MHCalibrationChargeHiGainPix *fAverageHiGainInnerPix; //-> One MHCalibrationChargeHiGainPix with the average of all inner pixels - MHCalibrationChargeLoGainPix *fAverageLoGainInnerPix; //-> One MHCalibrationChargeLoGainPix with the average of all inner pixels - MHCalibrationChargeHiGainPix *fAverageHiGainOuterPix; //-> One MHCalibrationChargeHiGainPix with the average of all outer pixels - MHCalibrationChargeLoGainPix *fAverageLoGainOuterPix; //-> One MHCalibrationChargeLoGainPix with the average of all outer pixels - - MCalibrationChargeCam *fCam; //! Class holding the results - MRawEvtData *fRawEvt; //! Raw event data (time slices) - MGeomCam *fGeom; //! MAGIC geometry - MBadPixelsCam *fBadPixels; //! Bad Pixels + MCalibrationChargeCam *fCam; //! Cam holding the results + MRawEvtData *fRawEvt; //! Raw event data (time slices) + MGeomCam *fGeom; //! MAGIC geometry + MBadPixelsCam *fBadPixels; //! Bad Pixels Int_t fNumInnerPixels; @@ -80,5 +82,6 @@ void SetNumHiGainSaturationLimit( const Float_t lim=fgNumHiGainSaturationLimit) { fNumHiGainSaturationLimit = lim; } void SetNumLoGainSaturationLimit( const Float_t lim=fgNumLoGainSaturationLimit) { fNumLoGainSaturationLimit = lim; } - + void SetPulserFrequency ( const Int_t f=fgPulserFrequency) { fPulserFrequency = f; } + Float_t GetNumHiGainSaturationLimit() const { return fNumHiGainSaturationLimit; } Float_t GetNumLoGainSaturationLimit() const { return fNumLoGainSaturationLimit; } Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.cc (revision 3608) +++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.cc (revision 3609) @@ -58,5 +58,4 @@ const Float_t MHCalibrationChargePix::fgPickupLimit = 5.; -const Int_t MHCalibrationChargePix::fgPulserFrequency = 500; // -------------------------------------------------------------------------- // @@ -95,5 +94,4 @@ Clear(); - SetPulserFrequency(); } @@ -138,9 +136,4 @@ fName = Form("%s%d", fName.Data(), id); fTitle = Form("%s%d", fTitle.Data(), id); -} - -void MHCalibrationChargePix::SetPulserFrequency(Float_t f) -{ - SetEventFrequency(f); } Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.h (revision 3608) +++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.h (revision 3609) @@ -23,6 +23,4 @@ protected: - - static const Int_t fgPulserFrequency; Int_t fPixId; @@ -67,6 +65,4 @@ virtual void SetPickupLimit( const Float_t lim =fgPickupLimit) { fPickupLimit = lim; } - void SetPulserFrequency(Float_t f=fgPulserFrequency); - void SetSaturated ( const Float_t f ) { fSaturated += f; } void SetExcluded ( const Bool_t b=kTRUE ); Index: trunk/MagicSoft/Mars/mcalib/MHGausEvents.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MHGausEvents.cc (revision 3608) +++ trunk/MagicSoft/Mars/mcalib/MHGausEvents.cc (revision 3609) @@ -100,5 +100,5 @@ // MHGausEvents::MHGausEvents(const char *name, const char *title) - : fHPowerProbability(NULL), + : fEventFrequency(0), fHPowerProbability(NULL), fPowerSpectrum(NULL), fGraphEvents(NULL), fGraphPowerSpectrum(NULL), @@ -113,5 +113,4 @@ SetPowerProbabilityBins(); - SetEventFrequency(); SetProbLimit(); SetNDFLimit(); Index: trunk/MagicSoft/Mars/mcalib/MHGausEvents.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MHGausEvents.h (revision 3608) +++ trunk/MagicSoft/Mars/mcalib/MHGausEvents.h (revision 3609) @@ -63,5 +63,5 @@ void DrawEvents(); // Draw a graph of the array fEvents - void DrawPowerSpectrum(TVirtualPad &pad, Int_t i); // Draw a graph of the array fPowerSpectrum and the hist fHPowerProbability + void DrawPowerSpectrum(TVirtualPad &pad, Int_t i); // Draw a graph of the array fPowerSpectrum and the hist fHPowerProbability Float_t *CreateEventXaxis(Int_t n); // Create an x-axis for the Event TGraphs @@ -77,5 +77,5 @@ // Setters - void SetEventFrequency(const Float_t f=0) { fEventFrequency = f; } + void SetEventFrequency(const Float_t f) { fEventFrequency = f; } void SetMean ( const Double_t d ) { fMean = d; }