Changeset 3012 for trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc

Timestamp:

02/03/04 20:14:48 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc

@@ -129 +129 @@
   fTimeLastLoGain                   =   0 ;
 
+  fAbsTimeMean                      =  -1.;
+  fAbsTimeRms                       =  -1.;
+
   fPheFFactorMethod                 =  -1.;
   fPheFFactorMethodError            =  -1.;
@@ -666 +669 @@
     }
 
-  Float_t first;
-  Float_t last;
-
   if (TESTBIT(fFlags,kHiGainSaturation))
     {
-      first = (Float_t)fHist->GetAbsTimeFirstLoGain();
-      last = (Float_t)fHist->GetAbsTimeLastLoGain();
-
-      if (first < (Float_t)fTimeFirstLoGain+1)
+
+      if (fAbsTimeMean < (Float_t)fTimeFirstLoGain+1)
         {
           *fLog << warn 
                 << "WARNING: Some absolute times smaller than limit in Pixel " 
-                << fPixId << " time: " << first << " Limit: " << fTimeFirstLoGain+1 << endl;
+                << fPixId << " time: " << fAbsTimeMean 
+                << " Limit: " << (Float_t)fTimeFirstLoGain+1. << endl;
           return kFALSE;
         }
 
-      if ((Float_t)fTimeLastLoGain-1 > last)
+      if (fAbsTimeMean > (Float_t)fTimeLastLoGain-1)
         {
           *fLog << warn 
                 << "WARNING: Some absolute times bigger than limit in Pixel " 
-                << fPixId << " time: " << last << " Limit: " << fTimeLastLoGain-1 << endl;
+                << fPixId << " time: " << fAbsTimeMean 
+                << " Limit: " << (Float_t)fTimeLastLoGain-1. << endl;
           return kFALSE;
         }
@@ -693 +693 @@
   else
     {
-      first = (Float_t)fHist->GetAbsTimeFirstHiGain();
-      last = (Float_t)fHist->GetAbsTimeLastHiGain();
-
-      if (first > ((Float_t)fTimeFirstHiGain+1.))
+
+      if (fAbsTimeMean < (Float_t)fTimeFirstHiGain+1.)
         {
           *fLog << warn 
                 << "WARNING: Some absolute times smaller than limit in Pixel " 
-                << fPixId << " time: " << first << " Limit: " << (Float_t)fTimeFirstHiGain+1. << endl;
+                << fPixId << " time: " << fAbsTimeMean 
+                << " Limit: " << (Float_t)fTimeFirstHiGain+1. << endl;
           //          return kFALSE;
         }
 
-      if (((Float_t)fTimeLastHiGain-1.) > last)
+      if (fAbsTimeMean > (Float_t)fTimeLastHiGain-1.)
         {
           *fLog << warn 
                 << "WARNING: Some absolute times bigger than limit in Pixel " 
-                << fPixId << " time: " << last << " Limit: " << (Float_t)fTimeLastHiGain-1. << endl;
+                << fPixId << " time: " << fAbsTimeMean 
+                << " Limit: " << (Float_t)fTimeLastHiGain-1. << endl;
           //          return kFALSE;
         }
@@ -766 +766 @@
 {
 
+
   if(!fHist->FitTime())
     {
@@ -777 +778 @@
   fTimeProb      = fHist->GetRelTimeProb();
 
+  fAbsTimeMean    = fHist->GetAbsTimeMean();
+  fAbsTimeMeanErr = fHist->GetAbsTimeMeanErr();
+  fAbsTimeRms     = fHist->GetAbsTimeRms();  
+
   if (CheckTimeFitValidity())
     SETBIT(fFlags,kTimeFitValid);