Changeset 3007 for trunk/MagicSoft/Mars/mcalib/MCalibrationPINDiode.cc

Timestamp:

02/02/04 22:52:53 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationPINDiode.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationPINDiode.cc

@@ -76 +76 @@
 
   CLRBIT(fFlags, kExcluded);
-  CLRBIT(fFlags, kFitValid);
+  CLRBIT(fFlags, kChargeFitValid);
+  CLRBIT(fFlags, kChargeFitValid);
   CLRBIT(fFlags, kFitted);
 
@@ -129 +130 @@
 // Set the Excluded Bit from outside 
 //
-void MCalibrationPINDiode::SetFitValid(Bool_t b )    
-{ 
-  b ?  SETBIT(fFlags, kFitValid) : CLRBIT(fFlags, kFitValid); 
+void MCalibrationPINDiode::SetChargeFitValid(Bool_t b )    
+{ 
+  b ?  SETBIT(fFlags, kChargeFitValid) : CLRBIT(fFlags, kChargeFitValid); 
+}
+
+// --------------------------------------------------------------------------
+//
+// Set the Excluded Bit from outside 
+//
+void MCalibrationPINDiode::SetTimeFitValid(Bool_t b )    
+{ 
+  b ?  SETBIT(fFlags, kTimeFitValid) : CLRBIT(fFlags, kTimeFitValid); 
 }
 
@@ -148 +158 @@
  }
 
-Bool_t MCalibrationPINDiode::IsFitValid() const 
-{
-  return TESTBIT(fFlags, kFitValid);  
+Bool_t MCalibrationPINDiode::IsChargeFitValid() const 
+{
+  return TESTBIT(fFlags, kChargeFitValid);  
+}
+
+Bool_t MCalibrationPINDiode::IsTimeFitValid() const 
+{
+  return TESTBIT(fFlags, kTimeFitValid);  
 }
 
@@ -165 +180 @@
   //    or if the histogram is empty
   //
-  if (fHist->IsFitOK() || fHist->IsEmpty())
+  if (fHist->IsChargeFitOK() || fHist->IsEmpty())
     return kTRUE;
 
@@ -195 +210 @@
 
   if (CheckChargeFitValidity())
-    SETBIT(fFlags,kFitValid);
+    SETBIT(fFlags,kChargeFitValid);
   else
     {
-      CLRBIT(fFlags,kFitValid);
+      CLRBIT(fFlags,kChargeFitValid);
       return kFALSE;
     }
@@ -242 +257 @@
     }
       
-  if (!fHist->IsFitOK()) 
+  if (!fHist->IsChargeFitOK()) 
     {
       *fLog << warn << "WARNING: Probability of Fitted Charge too low in PINDiode " << endl;
@@ -267 +282 @@
 {
 
-  if(!fHist->FitTimeHiGain())
+  if(!fHist->FitTime())
     {
       *fLog << warn << "WARNING: Could not fit Hi Gain times of PIN Diode" << endl;
@@ -274 +289 @@
     }
   
-  fTime          = fHist->GetTimeMean();
-  fSigmaTime     = fHist->GetTimeSigma();
-  fTimeChiSquare = fHist->GetTimeChiSquare();
-  fTimeProb      = fHist->GetTimeProb();
+  fTime          = fHist->GetRelTimeMean();
+  fSigmaTime     = fHist->GetRelTimeSigma();
+  fTimeProb      = fHist->GetRelTimeProb();
   
   if (CheckTimeFitValidity())
-    SETBIT(fFlags,kFitValid);
+    SETBIT(fFlags,kTimeFitValid);
   else
-    CLRBIT(fFlags,kFitValid);
+    CLRBIT(fFlags,kTimeFitValid);
 
   return kTRUE;