Changeset 3642 for trunk/MagicSoft/Mars/manalysis

Timestamp:

04/04/04 17:50:30 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MHPedestalCam.h (modified) (1 diff)
• MHPedestalPix.cc (modified) (4 diffs)
• MHPedestalPix.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MHPedestalCam.h

@@ -2 +2 @@
 #define MARS_MHPedestalCam
 
-#ifndef ROOT_TObjArray
-#include <TObjArray.h>
+#ifndef MARS_MHCalibrationCam
+#include "MHCalibrationCam.h"
 #endif
 
-#ifndef MARS_MH
-#include "MH.h"
-#endif
-#ifndef MARS_MCamEvent
-#include "MCamEvent.h"
-#endif
-
+class MGeomCam;
+class MPedestalCam;
 class MHPedestalPix;
-class MPedestalCam;
-class MHPedestalCam : public MH, public MCamEvent
+class MHPedestalCam : public MHCalibrationCam
 {
 
 private:
 
-  TObjArray  *fArray;       //-> List of MHPedestalPix's
+  void   InitPedHists(MHPedestalPix &hist, const Int_t i, const Float_t nslices);
+  
+  Bool_t ReInitHists(MParList *pList);
+  Bool_t FillHists(const MParContainer *par, const Stat_t w=1);
+  Bool_t FinalizeHists();
+  
+  Float_t fExtractHiGainSlices;           // Number of FADC slices used for high gain signal extraction
+  Float_t fExtractLoGainSlices;           // Number of FADC slices used for low  gain signal extraction
 
-  MPedestalCam *fPedestals; //! need to initialize MPedestalCam to zero (which is not default!)
-  
-  Float_t fExtractSlices;
+  MPedestalCam *fPedestals;               //! Pedestal Cam filled by MPedCalcPedRun
   
 public:
   MHPedestalCam(const char *name=NULL, const char *title=NULL);
-  ~MHPedestalCam();
-  
-  MHPedestalPix &operator[](UInt_t i);
-  const MHPedestalPix &operator[](UInt_t i) const;
-  
-  Bool_t SetupFill(const MParList *pList);
-  Bool_t Fill(const MParContainer *par, const Stat_t w=1);
-  Bool_t Finalize();
-  
-  TObject *Clone(const char *) const;
+  ~MHPedestalCam() {}
   
   Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;

trunk/MagicSoft/Mars/manalysis/MHPedestalPix.cc

@@ -27 +27 @@
 //  MHPedestalPix
 //
-//  Histogram class for pedestal analysis. Holds the histogrammed pedestals, 
-//  derives from MHGausEvents, perform Fourier analysis
+//  Histogram class for pedestal analysis. 
+//  Stores and fits the pedestals taken from MPedestalPix on an event-by-event
+//  basis. The results are re-normalized to a value per slice with the formulae:
+//
+// - Mean Pedestal        / slice = Mean Pedestal        / Number slices
+// - Mean Pedestal Error  / slice = Mean Pedestal Error  / Number slices
+// - Sigma Pedestal       / slice = Sigma Pedestal       / Sqrt (Number slices)
+// - Sigma Pedestal Error / slice = Sigma Pedestal Error / Sqrt (Number slices)
+// 
+//  Derives from MHGausEvents, fits the pedestals to a Gaussian and performs
+//  a Fourier analysis.
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -46 +55 @@
 // Default Constructor. 
 //
+// Sets: 
+// - the default number for fNbins        (fgChargeNbins)
+// - the default number for fFirst        (fgChargeFirst)
+// - the default number for fLast         (fgChargeLast)
+//
+// - the default name of the  fHGausHist ("HPedestalCharge")
+// - the default title of the fHGausHist ("Distribution of Summed FADC Pedestal slices Pixel ")
+// - the default x-axis title for fHGausHist ("Sum FADC Slices")
+// - the default y-axis title for fHGausHist ("Nr. of events")
+// - TH1::Sumw2() for fHGausHist
+//
+// Initializes:
+// - fNSlices to 1
+//
 MHPedestalPix::MHPedestalPix(const char *name, const char *title) 
-    : fPixId(-1)
+    : fNSlices(1)
 { 
 
@@ -53 +76 @@
   fTitle = title ? title : "Histogrammed Pedestal events";
 
-  SetChargeNbins();
-  SetChargeFirst();
-  SetChargeLast();
+  SetNbins( fgChargeNbins );
+  SetFirst( fgChargeFirst );
+  SetLast(  fgChargeLast  );
 
   // Create a large number of bins, later we will rebin
@@ -66 +89 @@
 }
 
-MHPedestalPix::~MHPedestalPix()
-{
-}
-
-void MHPedestalPix::Clear(Option_t *o)
+// --------------------------------------------------------------------------
+// 
+// If mean and sigma have not yet been set, returns.
+//
+// Renormalizes the pedestal fit results by the following formulae:
+//
+// - Mean Pedestal        / slice = Mean Pedestal        / Number slices
+// - Mean Pedestal Error  / slice = Mean Pedestal Error  / Number slices
+// - Sigma Pedestal       / slice = Sigma Pedestal       / Sqrt (Number slices)
+// - Sigma Pedestal Error / slice = Sigma Pedestal Error / Sqrt (Number slices)
+// 
+void MHPedestalPix::Renorm()
 {
 
-  fPixId = -1;
-  MHGausEvents::Clear();
-  return;
-}
-
-
-
-void MHPedestalPix::InitBins()
-{
-
-  fHGausHist.SetBins(fChargeNbins,fChargeFirst,fChargeLast);
-
-}
-
-
-void MHPedestalPix::ChangeHistId(Int_t id)
-{
-
-  fPixId = id;
-
-  fHGausHist.SetName(Form("%s%d", fHGausHist.GetName(), id));
-  fHGausHist.SetTitle(Form("%s%d", fHGausHist.GetTitle(), id));
-}
-
-
-void MHPedestalPix::Renorm(const Float_t nslices)
-{
-
-  if (!IsGausFitOK())
+  if (fMean == fMeanErr == fSigma == fSigmaErr == 0.)
     return;
 
-  Float_t sqslices = TMath::Sqrt(nslices);
+  //
+  // One never knows...
+  //
+  if (fNSlices <= 0)
+    return;
   
-  SetMean(GetMean()/nslices);
+  const Float_t sqslices = TMath::Sqrt(fNSlices);
+  
+  SetMean     ( GetMean()    / fNSlices  );
   //
   // Mean error goes with PedestalRMS/Sqrt(entries) -> scale with slices
   // 
-  SetMeanErr(GetMeanErr()/nslices);
+  SetMeanErr  ( GetMeanErr() / fNSlices  );
   //
   // Sigma goes like PedestalRMS -> scale with sqrt(slices)    
   //
-  SetSigma(GetSigma()/sqslices);
+  SetSigma    ( GetSigma()   / sqslices  );
   //
-  // Sigma error goes like PedestalRMS/2.(entries) -> scale with slices
+  // Sigma error goes like PedestalRMS/2.(entries) -> scale with sqrt(slices)
   //
-  SetSigmaErr(GetSigmaErr()/nslices);
+  SetSigmaErr ( GetSigmaErr() / sqslices );
   
 }

trunk/MagicSoft/Mars/manalysis/MHPedestalPix.h

@@ -11 +11 @@
 private:
 
-  static const Int_t   fgChargeNbins;
-  static const Axis_t  fgChargeFirst;
-  static const Axis_t  fgChargeLast;
+  static const Int_t   fgChargeNbins;        // Default for fNBins          (now set to: 450  )
+  static const Axis_t  fgChargeFirst;        // Default for fFirst          (now set to: -0.5  )
+  static const Axis_t  fgChargeLast;         // Default for fLast           (now set to: 449.5)
 
-  Int_t   fChargeNbins;
-  Axis_t  fChargeFirst;
-  Axis_t  fChargeLast;
-
-  Int_t fPixId;                  // Pixel Nr
-
+  Float_t fNSlices;                         // Number of FADC slices summed in extraction
+  
 public:
 
   MHPedestalPix(const char *name=NULL, const char *title=NULL);
-  ~MHPedestalPix();
+  ~MHPedestalPix() {}
 
-  void Clear(Option_t *o="");
-  void InitBins();
+  // Setters
+  void SetNSlices( const Float_t n)    { fNSlices = n ; }
   
-  // Setters
-  void SetChargeNbins(const Int_t  bins =fgChargeNbins)    { fChargeNbins = bins; }
-  void SetChargeFirst(const Axis_t first=fgChargeFirst)    { fChargeFirst = first; }
-  void SetChargeLast( const Axis_t last =fgChargeLast)     { fChargeLast  = last; }
+  // Getters
+  Float_t GetNSlices() const       { return fNSlices; }
   
   // Others
-  void ChangeHistId(Int_t i);
-  void Renorm(const Float_t nslices);  
+  void Renorm();  
 
-  //  TObject *DrawClone(Option_t *opt="") const;
-  
   ClassDef(MHPedestalPix, 1)     // Histograms for each calibrated pixel
 };