Changeset 3642 for trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.cc

Timestamp:

04/04/04 17:50:30 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.cc (modified) (10 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.cc

@@ -85 +85 @@
 //
 MCalibrationChargePINDiode::MCalibrationChargePINDiode(const char *name, const char *title)
-    : fFlags(0)
+    : fCalibFlags(0)
 {
 
@@ -112 +112 @@
 {
 
-    SetChargeFitValid     ( kFALSE );
-    SetTimeFitValid       ( kFALSE );
-    SetMeanTimeInFirstBin ( kFALSE );
-    SetMeanTimeInLastBin  ( kFALSE );
+  SetChargeFitValid     ( kFALSE );
+  SetTimeFitValid       ( kFALSE );
+  SetMeanTimeInFirstBin ( kFALSE );
+  SetMeanTimeInLastBin  ( kFALSE );
     
-  fMeanCharge                       =  -1.;
-  fMeanChargeErr                    =  -1.;
-  fSigmaCharge                      =  -1.;
-  fSigmaChargeErr                   =  -1.;
-  fChargeProb                       =  -1.;
   fPed                              =  -1.;
   fPedRms                           =  -1.;
@@ -163 +158 @@
 void  MCalibrationChargePINDiode::SetOscillating( const Bool_t b)
 {
-    b ? SETBIT(fFlags,kOscillating) : CLRBIT(fFlags,kOscillating);
-}
-
-// --------------------------------------------------------------------------
-//
-// Set the Excluded Bit from outside 
-//
-void MCalibrationChargePINDiode::SetExcluded(Bool_t b )
-{ 
-  b ?  SETBIT(fFlags, kExcluded) : CLRBIT(fFlags, kExcluded); 
+    b ? SETBIT(fCalibFlags,kOscillating) : CLRBIT(fCalibFlags,kOscillating);
 }
 
@@ -182 +168 @@
 void MCalibrationChargePINDiode::SetExcludeQualityCheck(Bool_t b )
 { 
-  b ?  SETBIT(fFlags, kExcludeQualityCheck) : CLRBIT(fFlags, kExcludeQualityCheck); 
+  b ?  SETBIT(fCalibFlags, kExcludeQualityCheck) : CLRBIT(fCalibFlags, kExcludeQualityCheck); 
 }
 
@@ -191 +177 @@
 void MCalibrationChargePINDiode::SetChargeFitValid(Bool_t b )    
 { 
-  b ?  SETBIT(fFlags, kChargeFitValid) : CLRBIT(fFlags, kChargeFitValid); 
+  b ?  SETBIT(fCalibFlags, kChargeFitValid) : CLRBIT(fCalibFlags, kChargeFitValid); 
 }
 
@@ -200 +186 @@
 void MCalibrationChargePINDiode::SetTimeFitValid(Bool_t b )    
 { 
-  b ?  SETBIT(fFlags, kTimeFitValid) : CLRBIT(fFlags, kTimeFitValid); 
+  b ?  SETBIT(fCalibFlags, kTimeFitValid) : CLRBIT(fCalibFlags, kTimeFitValid); 
 }
 
 void MCalibrationChargePINDiode::SetFluxOutsidePlexiglassAvailable (const Bool_t b)
 {
-  b ?  SETBIT(fFlags, kFluxOutsidePlexiglassAvailable) : CLRBIT(fFlags, kFluxOutsidePlexiglassAvailable); 
+  b ?  SETBIT(fCalibFlags, kFluxOutsidePlexiglassAvailable) : CLRBIT(fCalibFlags, kFluxOutsidePlexiglassAvailable); 
 }
 
 void MCalibrationChargePINDiode::SetMeanTimeInFirstBin(const Bool_t b)
 {
-  b ? SETBIT(fFlags,kMeanTimeInFirstBin) : CLRBIT(fFlags,kMeanTimeInFirstBin);
+  b ? SETBIT(fCalibFlags,kMeanTimeInFirstBin) : CLRBIT(fCalibFlags,kMeanTimeInFirstBin);
 }
 
 void MCalibrationChargePINDiode::SetMeanTimeInLastBin(const Bool_t b)
 {
-  b ? SETBIT(fFlags,kMeanTimeInLastBin) : CLRBIT(fFlags,kMeanTimeInLastBin);
+  b ? SETBIT(fCalibFlags,kMeanTimeInLastBin) : CLRBIT(fCalibFlags,kMeanTimeInLastBin);
 }
 
 Bool_t MCalibrationChargePINDiode::IsMeanTimeInFirstBin() const
 {
-  return TESTBIT(fFlags,kMeanTimeInFirstBin);
+  return TESTBIT(fCalibFlags,kMeanTimeInFirstBin);
 }
 
 Bool_t MCalibrationChargePINDiode::IsMeanTimeInLastBin() const
 {
-  return TESTBIT(fFlags,kMeanTimeInLastBin);
-}
-
-Bool_t MCalibrationChargePINDiode::IsExcluded()       const
-{ 
-   return TESTBIT(fFlags,kExcluded);  
+  return TESTBIT(fCalibFlags,kMeanTimeInLastBin);
 }
 
 Bool_t MCalibrationChargePINDiode::IsChargeFitValid() const 
 {
-  return TESTBIT(fFlags, kChargeFitValid);  
+  return TESTBIT(fCalibFlags, kChargeFitValid);  
 }
 
 Bool_t MCalibrationChargePINDiode::IsTimeFitValid()   const 
 {
-  return TESTBIT(fFlags, kTimeFitValid);  
+  return TESTBIT(fCalibFlags, kTimeFitValid);  
 }
 
@@ -255 +236 @@
 
 
-  if (fMeanCharge < fChargeLimit*GetPedRms())
+  if (GetMean() < fChargeLimit*GetPedRms())
     {
       *fLog << warn << "WARNING: Fitted Charge is smaller than "
@@ -262 +243 @@
     }
   
-  if (fMeanChargeErr < fChargeErrLimit) 
+  if (GetMeanErr() < fChargeErrLimit) 
     {
       *fLog << warn << "WARNING: Error of Fitted Charge is smaller than "
@@ -269 +250 @@
     }
       
-  if (fMeanCharge < fChargeRelErrLimit*fMeanChargeErr) 
+  if (GetMean() < fChargeRelErrLimit*GetMeanErr()) 
     {
       *fLog << warn << "WARNING: Fitted Charge is smaller than "
@@ -276 +257 @@
     }
       
-  if (fSigmaCharge < GetPedRms())
+  if (GetSigma() < GetPedRms())
     {
       *fLog << warn << "WARNING: Sigma of Fitted Charge smaller than Pedestal RMS in PINDiode " << endl;