Changeset 3428 for trunk

Timestamp:

03/07/04 17:21:50 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MHCalibrationChargePix.cc (modified) (5 diffs)
• mcalib/MHCalibrationChargePix.h (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -26 +26 @@
   * mcalib/MHCalibrationChargeCam.[h,cc]
     - include MBadPixelsCam
+
+  * mcalib/MHCalibrationChargePix.[h,cc]
+    - make fSaturated and fPickup a Float_t (for average pixel)
 
   * mbadpixels/MBadPixelsPix.h

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.cc

@@ -57 +57 @@
 const Axis_t  MHCalibrationChargePix::fgAbsTimeLast     = 14.5;
 
-const Int_t   MHCalibrationChargePix::fgPickupLimit     = 5;
+const Float_t MHCalibrationChargePix::fgPickupLimit     = 5.;
 const Int_t   MHCalibrationChargePix::fgPulserFrequency = 500;
 // --------------------------------------------------------------------------
@@ -64 +64 @@
 //
 MHCalibrationChargePix::MHCalibrationChargePix(const char *name, const char *title)
-    : fHAbsTime()
+    : fHAbsTime(), fFlags(0)
 { 
   
@@ -110 +110 @@
 
   fPixId     = -1;
-  fSaturated = 0;
-  fPickup    = 0;
+  fSaturated = 0.;
+  fPickup    = 0.;
+
+  SetExcluded ( kFALSE );
   
   MHGausEvents::Clear();
@@ -138 +140 @@
 }
 
+void  MHCalibrationChargePix::SetPulserFrequency(Float_t f)
+{
+  SetEventFrequency(f);
+}
+
+
+void MHCalibrationChargePix::SetExcluded(const Bool_t b)
+{
+    b ? SETBIT(fFlags,kExcluded) : CLRBIT(fFlags,kExcluded);
+}
 
 const Float_t MHCalibrationChargePix::GetIntegral() const 
@@ -154 +166 @@
 }
 
-void  MHCalibrationChargePix::SetPulserFrequency(Float_t f)
-{
-  SetEventFrequency(f);
+Bool_t MHCalibrationChargePix::IsExcluded()      const
+{
+  return TESTBIT(fFlags,kExcluded);
 }
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.h

@@ -20 +20 @@
   static const Axis_t  fgAbsTimeLast;
 
-  static const Int_t fgPickupLimit;
+  static const Float_t fgPickupLimit;
 
 protected:
@@ -38 +38 @@
   Axis_t   fAbsTimeLast;
 
-  Int_t    fPickupLimit;      // The limit in number of sigmas from the fitted mean above which events are considered as pickup
+  Float_t    fPickupLimit;      // The limit in number of sigmas from the fitted mean above which events are considered as pickup
 
-  Int_t    fSaturated;
-  Int_t    fPickup;
+  Float_t  fSaturated;
+  Float_t  fPickup;
+
+  Byte_t   fFlags;
+  enum     { kExcluded };
 
 public:
@@ -58 +61 @@
   virtual void SetChargeLast( const Axis_t last =fgChargeLast)     { fChargeLast  = last; }
   
-  virtual void SetAbsTimeNbins(const Int_t  bins =fgAbsTimeNbins)    { fAbsTimeNbins = bins; }
-  virtual void SetAbsTimeFirst(const Axis_t first=fgAbsTimeFirst)    { fAbsTimeFirst = first; }
-  virtual void SetAbsTimeLast( const Axis_t last =fgAbsTimeLast)     { fAbsTimeLast  = last; }
+  virtual void SetAbsTimeNbins(const Int_t  bins =fgAbsTimeNbins)  { fAbsTimeNbins = bins; }
+  virtual void SetAbsTimeFirst(const Axis_t first=fgAbsTimeFirst)  { fAbsTimeFirst = first; }
+  virtual void SetAbsTimeLast( const Axis_t last =fgAbsTimeLast)   { fAbsTimeLast  = last; }
 
-  virtual void SetPickupLimit( const Int_t  lim =fgPickupLimit)      { fPickupLimit  = lim; }
+  virtual void SetPickupLimit( const Float_t  lim =fgPickupLimit)    { fPickupLimit  = lim; }
 
   void SetPulserFrequency(Float_t f=fgPulserFrequency);
 
-  void SetSaturated      (const Int_t i) { fSaturated += i; }
+  void SetSaturated      ( const Float_t f    )                   { fSaturated += f; }
+  void SetExcluded       ( const Bool_t b=kTRUE );
 
   // Getters
@@ -77 +81 @@
   const Float_t  GetAbsTimeRms()      const;
 
-  const Int_t    GetSaturated()       const { return fSaturated;   }
-  const Int_t    GetPickup()          const { return fPickup;      }
+  const Float_t    GetSaturated()       const { return fSaturated;   }
+  const Float_t    GetPickup()          const { return fPickup;      }
+
+  Bool_t   IsExcluded()         const;
 
   // Fill histos