Changeset 7071 for trunk/MagicSoft/Mars/mjobs

Timestamp:

05/20/05 12:31:32 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibTest.cc (modified) (1 diff)
• MJCalibrateSignal.cc (modified) (2 diffs)
• MJCalibration.cc (modified) (4 diffs)
• MJCut.cc (modified) (2 diffs)
• MJOptimize.cc (modified) (2 diffs)
• MJPedestal.cc (modified) (2 diffs)
• MJSpectrum.cc (modified) (3 diffs)
• MJStar.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -502 +502 @@
     }
   
-  tlist.PrintStatistics();
-  
   if (fIsPixelCheck)
     {

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -696 +696 @@
         tlist2.AddToList(&tlist3);
 
-        tlist3.AddToList(&pinext);
-        tlist3.AddToList(&bldext);
+        if (IsUsePINDiode())
+            tlist3.AddToList(&pinext);
+        if (IsUseBlindPixel())
+            tlist3.AddToList(&bldext);
         tlist3.AddToList(&taskenv3);
         tlist3.AddToList(&pacalc);
@@ -780 +782 @@
     // Execute first analysis
     const Bool_t rc = evtloop.Eventloop(fMaxEvents);
-
-    // Print statistics
-    if (read->GetNumExecutions()>0)
-        tlist.PrintStatistics();
 
     // make sure owned object are deleted

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1480 +1480 @@
   if (!file.IsOpen())
   {
-    *fLog << err << "ERROR - Couldn't open hi-lo intercalibration file " << fHiLoCalibFile << " for reading..." << endl;
+    *fLog << err << "ERROR - Couldn't open file " << fHiLoCalibFile << " for reading... abort." << endl;
     return kFALSE;
   }
@@ -1487 +1487 @@
   if (hilocam.Read()<=0)
   {
-      *fLog << err << "Unable to read MCalibrationHiLoCam from " << fHiLoCalibFile << endl;
+      *fLog << err << "Unable to read MCalibrationHiLoCam from " << fHiLoCalibFile << "... abort." << endl;
       return kFALSE;
   }
-
   if (hilocam.GetSize() < 1)
   {
-      *fLog << err << "MCalibationHiLoCam is un-initialized in file " << fHiLoCalibFile << endl;
+      *fLog << err << "MCalibationHiLoCam is un-initialized in file " << fHiLoCalibFile << "... abort." << endl;
       return kFALSE;
   }
@@ -1507 +1506 @@
   if (fCalibrationCam.GetSize() != hilocam.GetSize())
   {
-      *fLog << err << "Size mismatch MCalibationHiLoCam and MCalibrationChargeCam " << endl;
+      *fLog << err << "Size mismatch MCalibationHiLoCam and MCalibrationChargeCam.. abort." << endl;
       return kFALSE;
   }
@@ -1977 +1976 @@
     if (numexec>0)
     {
-        tlist.PrintStatistics();
         DisplayResult(plist);
         if (!WriteResult(plist))

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -598 +598 @@
         }
 
-        tlist.PrintStatistics();
-
         if (!evtloop.GetDisplay())
         {
@@ -727 +725 @@
         delete write1;
 
-    tlist.PrintStatistics();
-
     // FIXME: Perform fit and plot energy dependant alpha plots
     // and fit result to new tabs!

trunk/MagicSoft/Mars/mjobs/MJOptimize.cc

@@ -187 +187 @@
     TStopwatch clock;
     clock.Start();
-    fEvtLoop->Eventloop(fNumEvents);
+    fEvtLoop->Eventloop(fNumEvents, MEvtLoop::kNoStatistics);
     clock.Stop();
 
@@ -763 +763 @@
         return kFALSE;
     }
-    tlist.PrintStatistics();
 
     *fLog << inf << "Read events from file '" << read.GetFileName() << "'" << endl;

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -1199 +1199 @@
             }
         }
-      
-      
     }
     else
@@ -1230 +1228 @@
     }
 
-    tlist.PrintStatistics();
-
     if (fDisplayType!=kDisplayNone)
         DisplayResult(plist);

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -394 +394 @@
     }
 
-    tlist.PrintStatistics();
-
     if (!loop.GetDisplay())
     {
@@ -467 +465 @@
         return kFALSE;
     }
-
-    tlist1.PrintStatistics();
 
     if (!loop1.GetDisplay())
@@ -887 +883 @@
     }
 
-    tlist2.PrintStatistics();
-
     if (!loop2.GetDisplay())
     {

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -453 +453 @@
     }
 
-    tlist.PrintStatistics();
-
     if (!WriteResult())
         return kFALSE;