Changeset 3907 for trunk/MagicSoft

Timestamp:

04/30/04 14:40:15 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrate.cc (modified) (2 diffs)
• mcalib/MHCalibrationChargePINDiode.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -26 +26 @@
    * mcalib/MHCalibrationRelTimeCam.[h,cc]
      -  Getter and Setter for the reference pixel
+
+   * mcalib/MCalibrate.cc
+     - make error of nphot to be taken from square root of absolute 
+       number of photons instead of number of photons, otherwise 
+       NaN's are obtained
+
 
  2004/04/29: Thomas Bretz

trunk/MagicSoft/Mars/mcalib/MCalibrate.cc

@@ -334 +334 @@
                   case kFfactor:
                       if (pix.IsFFactorMethodValid())
-                      {
+                        {
                           calibQE      = qe.GetQECascadesFFactor   ( zenith );
                           calibQEVar   = qe.GetQECascadesFFactorVar( zenith );
-                      }
+                        }
                       else
                           continue;
@@ -394 +394 @@
       
       nphot    = signal*calibConv/calibQE;
-      nphotErr = calibFFactor*TMath::Sqrt(nphot);
+      nphotErr = calibFFactor*TMath::Sqrt(TMath::Abs(nphot));
 
       if (fCalibrationMode == kFlatCharge)

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc

@@ -56 +56 @@
 const Int_t   MHCalibrationChargePINDiode::fgAbsTimeNbins    = 30;
 const Axis_t  MHCalibrationChargePINDiode::fgChargeFirst     = -0.5;
-const Axis_t  MHCalibrationChargePINDiode::fgChargeLast      = 199.5;
-const Int_t   MHCalibrationChargePINDiode::fgChargeNbins     = 200;
-const Int_t   MHCalibrationChargePINDiode::fgRmsChargeNbins  = 100;
+const Axis_t  MHCalibrationChargePINDiode::fgChargeLast      = 1999.5;
+const Int_t   MHCalibrationChargePINDiode::fgChargeNbins     = 2000;
+const Int_t   MHCalibrationChargePINDiode::fgRmsChargeNbins  = 200;
 const Axis_t  MHCalibrationChargePINDiode::fgRmsChargeFirst  = 0.;
-const Axis_t  MHCalibrationChargePINDiode::fgRmsChargeLast   = 100.;  
+const Axis_t  MHCalibrationChargePINDiode::fgRmsChargeLast   = 200.;  
 const Float_t MHCalibrationChargePINDiode::fgTimeLowerLimit  = 3.;
 const Float_t MHCalibrationChargePINDiode::fgTimeUpperLimit  = 4.;
@@ -156 +156 @@
   MHGausEvents::InitBins();
 
-  fHAbsTime.SetBins(fAbsTimeNbins,fAbsTimeFirst,fAbsTimeLast);
+  fHAbsTime.  SetBins(fAbsTimeNbins,  fAbsTimeFirst,  fAbsTimeLast);
   fHRmsCharge.SetBins(fRmsChargeNbins,fRmsChargeFirst,fRmsChargeLast);