Changeset 3291 for trunk/MagicSoft

Timestamp:

02/25/04 05:54:45 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -27 +27 @@
      - loosened criterium convFFactorRelErrLimit from 0.1 to 0.2
      - CalcFFactor asks for IsChargeValid before calculating anything
+
+   * mcalib/MCalibrationChargePINDiode.[h,cc]
+     - added function SetFluxOutsidePlexiglassAvailable
 
    * mcalib/MHCalibrationChargePix.cc

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.cc

@@ -193 +193 @@
 }
 
+void MCalibrationChargePINDiode::SetFluxOutsidePlexiglassAvailable (const Bool_t b)
+{
+  b ?  SETBIT(fFlags, kFluxOutsidePlexiglassAvailable) : CLRBIT(fFlags, kFluxOutsidePlexiglassAvailable); 
+}
 
 void MCalibrationChargePINDiode::SetMeanTimeInFirstBin(const Bool_t b)
@@ -240 +244 @@
 {
 
-  if (TESTBIT(fFlags,kExcludeQualityCheck))
-    return kTRUE;
 
   if (fMeanCharge < fChargeLimit*GetPedRms())
@@ -279 +281 @@
 Bool_t MCalibrationChargePINDiode::CheckTimeFitValidity()
 {
-
-  if (TESTBIT(fFlags,kExcludeQualityCheck))
-    return kTRUE;
 
   if ( fAbsTimeMean < fTimeLowerEdge+1.)
@@ -347 +346 @@
         << fMeanFluxOutsidePlexiglass << endl;
 
-  if (fMeanFluxOutsidePlexiglass > 0.)
-    SETBIT(fFlags,kFluxOutsidePlexiglassAvailable);  
-  else
-    {
-      CLRBIT(fFlags,kFluxOutsidePlexiglassAvailable);        
-      return kFALSE;
-    }
+  if (fMeanFluxOutsidePlexiglass < 0.)
+      return kFALSE;
 
   if (fMeanFluxErrOutsidePlexiglass < 0.)
-    {
-      *fLog << warn << "Relative Variance on Photon flux outside Plexiglass: " 
-            << fMeanFluxErrOutsidePlexiglass << endl;
-      CLRBIT(fFlags,kFluxOutsidePlexiglassAvailable);        
-      return kFALSE;
-    }
+      return kFALSE;
+
+  SetFluxOutsidePlexiglassAvailable();  
 
   // Finish calculation of errors -> convert from relative variance to absolute error

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.h

@@ -116 +116 @@
   void SetChargeFitValid     ( const Bool_t b = kTRUE );
   void SetTimeFitValid       ( const Bool_t b = kTRUE );
+  void SetFluxOutsidePlexiglassAvailable ( const Bool_t b = kTRUE );
 
   // Setters ONLY for MC: