Changeset 7046 for trunk/MagicSoft/Mars

Timestamp:

05/17/05 13:27:33 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mfilter

Files:

• MFCosmics.cc (modified) (6 diffs)
• MFCosmics.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mfilter/MFCosmics.cc

@@ -38 +38 @@
 //       fMinAcceptedFraction.
 //    b) check the ratio of events which were rejected against
-//       fMaxExcludedFraction.
+//       fMaxAcceptedFraction.
 //
 //  Input Containers:
@@ -82 +82 @@
     : fPedestals(NULL), fSignals(NULL), fBadPixels(NULL), fRawEvt(NULL),
     fNamePedestalCam(fgNamePedestalCam), fMaxEmptyPixels(0.2),
-    fMinAcceptedFraction(0), fMaxExcludedFraction(1)
+    fMinAcceptedFraction(0), fMaxAcceptedFraction(1)
 {
     fName  = name  ? name  : "MFCosmics";
@@ -214 +214 @@
 //       fMinAcceptedFraction.
 //    b) check the ratio of events which were rejected against
-//       fMaxExcludedFraction.
+//       fMaxAcceptedFraction.
 //
 //   return failure (kFALSE) if condition is not fullfilled.
@@ -238 +238 @@
     *fLog << endl;
 
-    const Float_t min = fMinAcceptedFraction*n;
-    const Float_t max = fMaxExcludedFraction*n;
-    if (fCut[0]<min)
-    {
-        *fLog << err << "ERROR - Fraction of accepted events " << min*100;
+    if (fCut[0]<fMinAcceptedFraction*n)
+    {
+        *fLog << err << "ERROR - Fraction of accepted events " << Form("%.1f", fCut[0]*100./n);
         *fLog << "% underrun " << fMinAcceptedFraction*100 << "%... abort." << endl;
         return kFALSE;
     }
-    if (fCut[1]>max)
-    {
-        *fLog << err << "ERROR - Fraction of excluded events " << max*100;
-        *fLog << "% exceeded " << fMaxExcludedFraction*100 << "%... abort." << endl;
+    if (fCut[0]>fMaxAcceptedFraction*n)
+    {
+        *fLog << err << "ERROR - Fraction of accepted events " << Form("%.1f", fCut[0]*100./n);
+        *fLog << "% exceeded " << fMaxAcceptedFraction*100 << "%... abort." << endl;
         return kFALSE;
     }
@@ -260 +258 @@
 // Read the setup from a TEnv, eg:
 //   MFCosmics.MaxEmptyPixels:    0.2
-//   MFCosmics.MaxExcludedFraction: 1
+//   MFCosmics.MaxAcceptedFraction: 1
 //   MFCosmics.MinAcceptedFraction: 0
 //
@@ -271 +269 @@
         SetMaxEmptyPixels(GetEnvValue(env, prefix, "MaxEmptyPixels", fMaxEmptyPixels));
     }
-    if (IsEnvDefined(env, prefix, "MaxExcludedFraction", print))
+    if (IsEnvDefined(env, prefix, "MaxAcceptedFraction", print))
     {
         rc = kTRUE;
-        SetMaxExcludedFraction(GetEnvValue(env, prefix, "MaxExcludedFraction", fMaxExcludedFraction));
+        SetMaxAcceptedFraction(GetEnvValue(env, prefix, "MaxAcceptedFraction", fMaxAcceptedFraction));
     }
     if (IsEnvDefined(env, prefix, "MinAcceptedFraction", print))

trunk/MagicSoft/Mars/mfilter/MFCosmics.h

@@ -32 +32 @@
 
     Float_t fMinAcceptedFraction;      // return error if exceeded
-    Float_t fMaxExcludedFraction;      // return error if exceeded
+    Float_t fMaxAcceptedFraction;      // return error if exceeded
 
     // MFCosmics
@@ -53 +53 @@
     Float_t GetMaxEmptyPixels() const          { return fMaxEmptyPixels; }
 
-    void    SetMaxExcludedFraction(const Float_t n) { fMaxExcludedFraction = n;    }
+    void    SetMaxAcceptedFraction(const Float_t n) { fMaxAcceptedFraction = n;    }
     void    SetMinAcceptedFraction(const Float_t n) { fMinAcceptedFraction = n;    }