Changeset 3290 for trunk/MagicSoft/Mars

Timestamp:

02/25/04 05:04:22 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -28 +28 @@
      - CalcFFactor asks for IsChargeValid before calculating anything
 
+   * mcalib/MHCalibrationChargePix.cc
+     - make fPickup an Int_t
 
    * mcalib/MCalibrate.cc

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.cc

@@ -57 +57 @@
 const Axis_t  MHCalibrationChargePix::fgAbsTimeLast     = 14.5;
 
-const Float_t MHCalibrationChargePix::fgPickupLimit     = 5.;
+const Int_t   MHCalibrationChargePix::fgPickupLimit     = 5;
 const Int_t   MHCalibrationChargePix::fgPulserFrequency = 200;
 // --------------------------------------------------------------------------
@@ -112 +112 @@
   fPixId     = -1;
   fSaturated = 0;
-  fPickup    = 0.;
+  fPickup    = 0;
   
   MHGausEvents::Clear();
@@ -253 +253 @@
 void MHCalibrationChargePix::CountPickup()
 {
-    fPickup  = GetHGausHist()->Integral(GetHGausHist()->GetXaxis()->FindBin(GetMean()+fPickupLimit*GetSigma()),
-                                        GetHGausHist()->GetXaxis()->GetLast(), 
-                                        "width");
-}
-
-
-
-
-
-
+    fPickup  = (Int_t)GetHGausHist()->Integral(GetHGausHist()->GetXaxis()->FindBin(GetMean()+fPickupLimit*GetSigma()),
+                                               GetHGausHist()->GetXaxis()->GetLast(), 
+                                               "width");
+}
+
+
+
+
+
+

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePix.h

@@ -20 +20 @@
   static const Axis_t  fgAbsTimeLast;
 
-  static const Float_t fgPickupLimit;
+  static const Int_t fgPickupLimit;
 
 protected:
@@ -38 +38 @@
   Axis_t   fAbsTimeLast;
 
-  Float_t  fPickupLimit;      // The limit in number of sigmas from the fitted mean above which events are considered as pickup
+  Int_t    fPickupLimit;      // The limit in number of sigmas from the fitted mean above which events are considered as pickup
 
   Int_t    fSaturated;
-  Float_t  fPickup;
+  Int_t    fPickup;
 
 public:
@@ -62 +62 @@
   virtual void SetAbsTimeLast( const Axis_t last =fgAbsTimeLast)     { fAbsTimeLast  = last; }
 
-  virtual void SetPickupLimit( const Float_t lim =fgPickupLimit)     { fPickupLimit  = lim; }
+  virtual void SetPickupLimit( const Int_t  lim =fgPickupLimit)      { fPickupLimit  = lim; }
 
   void SetPulserFrequency(Float_t f=fgPulserFrequency);
@@ -78 +78 @@
 
   const Int_t    GetSaturated()       const { return fSaturated;   }
-  const Float_t  GetPickup()          const { return fPickup;      }
+  const Int_t    GetPickup()          const { return fPickup;      }
 
   // Fill histos