Changeset 7130 for trunk/MagicSoft/Mars/mpedestal

Timestamp:

06/03/05 18:02:36 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc

@@ -242 +242 @@
   // is not the first anymore
   //
-  if (fRunHeader->GetRunType()==MRawRunHeader::kRTPedestal)
-    {
+  switch (fRunHeader->GetRunType())
+  {
+  case MRawRunHeader::kRTPedestal:
+  case MRawRunHeader::kRTMonteCarlo:
       fIsFirstPedRun = kFALSE;
       fIsNotPedRun   = kFALSE;
       return kTRUE;
-    }
-  
-  if (fRunHeader->GetRunType()==MRawRunHeader::kRTCalibration)
-    {
-      TString proj(fRunHeader->GetProjectName());
-      proj.ToLower();
-      
-      // test if a continuous light run has been declared as calibration...
-      if (proj.Contains("cl"))
-        {
-          fIsFirstPedRun = kFALSE;
-          fIsNotPedRun   = kFALSE;
-          return kTRUE;
-        }
-    }
-  
-
+  
+  case MRawRunHeader::kRTCalibration:
+      {
+          TString proj(fRunHeader->GetProjectName());
+          proj.ToLower();
+
+          // test if a continuous light run has been declared as calibration...
+          if (proj.Contains("cl"))
+          {
+              fIsFirstPedRun = kFALSE;
+              fIsNotPedRun   = kFALSE;
+              return kTRUE;
+          }
+      }
+  }
 
   fIsNotPedRun = kTRUE;
+
   //
   // If this is the first call to ReInit (before reading the first file)
@@ -464 +465 @@
 }
 
-//-------------------------------------------------------------
+//-----------------------------------------------------------------------
 // 
 // Return if the pedestal bit was set from the calibration trigger box.
@@ -473 +474 @@
 Bool_t MPedCalcPedRun::IsPedBitSet()
 {
+    if (fRunHeader->GetRunNumber()<gkFirstRunWithFinalBits)
+        return kFALSE;
+
     if (!fTrigPattern)
-        return kFALSE;
- 
-    if (fRunHeader->GetRunNumber() < gkFirstRunWithFinalBits)
         return kFALSE;