Changeset 3620

Timestamp:

03/31/04 14:08:36 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationChargeBlindPix.cc (modified) (1 diff)
• mcalib/MHCalibrationChargePINDiode.cc (modified) (1 diff)
• mcalib/MHCalibrationRelTimeCam.cc (modified) (3 diffs)
• mcalib/MHCalibrationRelTimeCam.h (modified) (2 diffs)
• mcalib/MHCalibrationRelTimePix.cc (modified) (4 diffs)
• mcalib/MHCalibrationRelTimePix.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -37 +37 @@
    * mcalib/MHCalibrationChargeBlindPix.[h,cc]
    * mcalib/MHCalibrationChargePINDiode.[h,cc]
+   * mcalib/MHCalibrationRelTimePix.[h,cc]
      - updated and enlarged documentation
 

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindPix.cc

@@ -25 +25 @@
 /////////////////////////////////////////////////////////////////////////////
 //                                                                         //
-// MCalibrationChargeBlindPix                                                    //
+// MCalibrationChargeBlindPix                                              //
 //                                                                         //
 // This is the storage container to hold informations about the calibration//

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc

@@ -180 +180 @@
 // Fills the following histograms:
 // - MHGausEvents::FillHistAndArray(signal)
-// - FillAbsTime(time);
+// - MHCalibrationChargePix::FillAbsTime(time);
 // - FillRmsCharge(rms);
 //

trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.cc

@@ -45 +45 @@
 
 using namespace std;
-const Float_t MHCalibrationRelTimeCam::fgTimeSliceWidth = 3.3;
+const Float_t MHCalibrationRelTimeCam::fgTimeSliceWidth  = 3.3;
+const Int_t   MHCalibrationRelTimeCam::fgPulserFrequency = 500;
 // --------------------------------------------------------------------------
 //
@@ -66 +67 @@
 
   SetTimeSliceWidth();
+  SetPulserFrequency();
 }
 
@@ -167 +169 @@
           hist.ChangeHistId(i);
           hist.InitBins();
+          hist.SetEventFrequency(fPulserFrequency);
         }
     }

trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimeCam.h

@@ -19 +19 @@
 private:
 
-  static const Float_t fgTimeSliceWidth;          // Default FADC slice time width for MAGIC
-  Float_t              fTimeSliceWidth;          //  FADC slice time width
+  static const Float_t fgTimeSliceWidth;       // Default for fTimeSliceWidth
+  static const Int_t   fgPulserFrequency;      // Default for fPulserFrequency
+
+  Float_t fTimeSliceWidth;                    // FADC slice time width
+  Int_t   fPulserFrequency;                   // The pulser frequency
   
   TObjArray  *fArray;       //-> List of MHCalibrationRelTimePix's
@@ -39 +42 @@
 
   // Setters
-  void SetTimeSliceWidth(const Float_t width=fgTimeSliceWidth)  {  fTimeSliceWidth = width; }
+  void SetTimeSliceWidth( const Float_t width=fgTimeSliceWidth)  {  fTimeSliceWidth = width; }
+  void SetPulserFrequency( const Int_t  f=fgPulserFrequency)     { fPulserFrequency = f;     }
   
   TObject *Clone(const char *) const;

trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimePix.cc

@@ -27 +27 @@
 //  MHCalibrationRelTimePix
 //
-//  Histogram class for the relative arrival time analysis. 
+//  Histogram class for the relative arrival time calibration.
 //  Holds the histogrammed arrival times,
 //  derives from MHGausEvents, perform Fourier analysis
@@ -43 +43 @@
 const Axis_t  MHCalibrationRelTimePix::fgChargeFirst    = -13.;
 const Axis_t  MHCalibrationRelTimePix::fgChargeLast     =  13.;
-
-const Int_t   MHCalibrationRelTimePix::fgPulserFrequency = 200;
 // --------------------------------------------------------------------------
 //
@@ -67 +65 @@
   fHGausHist.Sumw2();
 
-  SetPulserFrequency();
 }
 
@@ -103 +100 @@
 
 
-void  MHCalibrationRelTimePix::SetPulserFrequency(Float_t f)
-{
-  SetEventFrequency(f);
-}
-
-
 void  MHCalibrationRelTimePix::BypassFit()
 {

trunk/MagicSoft/Mars/mcalib/MHCalibrationRelTimePix.h

@@ -11 +11 @@
 private:
 
-  static const Int_t   fgPulserFrequency;
+  static const Int_t   fgChargeNbins;      // Default for fChargeNBins  (now set to: 900   )
+  static const Axis_t  fgChargeFirst;      // Default for fChargeFirst  (now set to: -13.5 )
+  static const Axis_t  fgChargeLast;       // Default for fChargeLast   (now set to:  13.5 )
 
-  static const Int_t   fgChargeNbins;
-  static const Axis_t  fgChargeFirst;
-  static const Axis_t  fgChargeLast;
+  Int_t   fChargeNbins;                   // Number of  bins used for the fHGausHist
+  Axis_t  fChargeFirst;                   // Lower bound bin used for the fHGausHist
+  Axis_t  fChargeLast;                    // Upper bound bin used for the fHGausHist
 
-  Int_t   fChargeNbins;
-  Axis_t  fChargeFirst;
-  Axis_t  fChargeLast;
-
-  Int_t fPixId;                  // Pixel Nr
+  Int_t fPixId;                           // The pixel ID
 
 public:
@@ -36 +34 @@
   void SetChargeLast( const Axis_t last =fgChargeLast)     { fChargeLast  = last; }
 
-  void SetPulserFrequency(Float_t f=fgPulserFrequency);
-
   // Fits
   void BypassFit();
@@ -45 +41 @@
   void Renorm(const Float_t slicewidth);
   
-  //  TObject *DrawClone(Option_t *opt="") const;
-  
-  ClassDef(MHCalibrationRelTimePix, 1)     // Histograms for each calibrated pixel
+  ClassDef(MHCalibrationRelTimePix, 1)     // Histogram class for Relative Time Calibration pixel
 };