Changeset 7047 for trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

Timestamp:

05/17/05 13:42:15 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1929 +1929 @@
     MFCosmics cosmics;
     cosmics.SetMaxEmptyPixels(0.05);
-    cosmics.SetMinAcceptedFraction(0.5);
+    cosmics.SetMaxAcceptedFraction(0.5); // max=0.5 cosmics
 
     MContinue cont(&cosmics, "ContCosmics");
@@ -1971 +1971 @@
 
     // Execute first analysis
-    if (!evtloop.Eventloop())
-    {
-      DisplayResult(plist);
-      WriteResult(plist);
-      *fLog << err << GetDescriptor() << ": Failed." << endl;
-      return kFALSE;
-    }
+    const Bool_t rc = evtloop.Eventloop();
+
+    if (!fCalibrationPINDiode.IsValid())
+        SetUsePINDiode(kFALSE);
 
     tlist.PrintStatistics();
+    DisplayResult(plist);
+    if (!WriteResult(plist))
+        return kFALSE;
+
+    if (!rc)
+    {
+        *fLog << err << GetDescriptor() << ": Failed." << endl;
+        return kFALSE;
+    }
 
     // --------------------------------------------------------------------------------
 
     if (fIsPixelCheck)
-      {
+    {
         MHCalibrationChargeCam *hcam = (MHCalibrationChargeCam*)plist.FindObject("MHCalibrationChargeCam");
         MHCalibrationChargePix &pix1 = (MHCalibrationChargePix&)(*hcam)[fCheckedPixId];
         pix1.DrawClone("");
-        
+
         MHCalibrationChargePix &pix2 = (MHCalibrationChargePix&)(*hcam)(fCheckedPixId);
         pix2.DrawClone("");
-        
+
         if (IsRelTimes())
-          {
+        {
             MHCalibrationRelTimeCam *hccam = (MHCalibrationRelTimeCam*)plist.FindObject("MHCalibrationRelTimeCam");
             MHCalibrationPix &pix11 = (*hccam)[fCheckedPixId];
@@ -1999 +2005 @@
             MHCalibrationPix &pix12 = (*hccam)(fCheckedPixId);
             pix12.DrawClone("");
-          }
-      }
-    
-    if (!fCalibrationPINDiode.IsValid())
-      SetUsePINDiode(kFALSE);
-    
-    DisplayResult(plist);
-    
-    if (!WriteResult(plist))
-      return kFALSE;
-    
+        }
+    }
+
     *fLog << all << GetDescriptor() << ": Done." << endl;
-    
+
     return kTRUE;
 }