Changeset 7071 for trunk/MagicSoft/Mars

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• callisto.rc (modified) (5 diffs)
• callisto_Dec04Jan05.rc (modified) (5 diffs)
• mbase/MEvtLoop.cc (modified) (2 diffs)
• mbase/MEvtLoop.h (modified) (2 diffs)
• mjobs/MJCalibTest.cc (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (2 diffs)
• mjobs/MJCalibration.cc (modified) (4 diffs)
• mjobs/MJCut.cc (modified) (2 diffs)
• mjobs/MJOptimize.cc (modified) (2 diffs)
• mjobs/MJPedestal.cc (modified) (2 diffs)
• mjobs/MJSpectrum.cc (modified) (3 diffs)
• mjobs/MJStar.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -45 +45 @@
    * msignal/MExtractor.cc:
      - added output of pedestal container - if available - in Print()
+     - improved format of Print() output
+
+   * mbase/MEvtLoop.[h,cc]:
+     - removed the obsolete (it was never been used) argument from
+       PreProcess
+     - replaced the second obsolete argument in Eventloop by a flag
+       whether statistics should be printer or not: default=kTRUE
+     - Print statistics automatically in Eventloop if tasklists
+       Process has ever been touched.
+
+   * mjobs/MJCalibTest.cc, mjobs/MJCalibration.cc, MJCalibrateSignal.cc,
+     mjobs/MJCut.cc, mjobs/MJOptimize.cc, mjobs/MJPedestal.cc,
+     mjobs/MJSpectrum.cc, mjobs/MJStar.cc:
+     - removed call to PrintStatistics - no done automatically in 
+       MEvtLoop
+
+   * mpedestal/MExtractPedestal.cc:
+     - removed InitArrays after ReInit of fExtractor. It is done there
+       automatically
+
+   * mjobs/MJCalibrateSignal.cc:
+     - don't add pinext and bldext to tasklist if not necessary
+       (UNDOCUMENTED change from bcn cvs)
+
+   * callisto.rc, callisto_Dec04Jan05.rc: 
+     - replaced wrong MaxHiGainVar by MaxSignalVar (was nowehere 
+       really used)
 
 

trunk/MagicSoft/Mars/NEWS

@@ -26 +26 @@
    - general: added new histograms for image parameters versus size
      (MHVsSize)
+
+   - general: The eventloop now automatically calls PrintStatistics
 
    - Status Display: Improved support for printing:

trunk/MagicSoft/Mars/callisto.rc

@@ -169 +169 @@
 #MJPedestalC1.ExtractPedestal.CheckWinFirst:     0
 #MJPedestalC1.ExtractPedestal.CheckWinSize:     29
-#MJPedestalC1.ExtractPedestal.MaxHiGainVar:     40
+#MJPedestalC1.ExtractPedestal.MaxSignalVar:     40
 
 #MJPedestalC2.ExtractPedestal: MPedCalcFromLoGain
@@ -177 +177 @@
 #MJPedestalC2.ExtractPedestal.CheckWinFirst:     0
 #MJPedestalC2.ExtractPedestal.CheckWinSize:     29
-#MJPedestalC2.ExtractPedestal.MaxHiGainVar:     40
+#MJPedestalC2.ExtractPedestal.MaxSignalVar:     40
 
 # -------------------------------------------------------------------------
@@ -343 +343 @@
 #MJCalibrateSignal.MPedCalcFundamental.CheckWinFirst:      0
 #MJCalibrateSignal.MPedCalcFundamental.CheckWinSize:      29
-#MJCalibrateSignal.MPedCalcFundamental.MaxHiGainVar:      40
+#MJCalibrateSignal.MPedCalcFundamental.MaxSignalVar:      40
 
 #MJCalibrateSignal.MPedCalcFromExtractorRndm.PedestalUpdate:   yes
@@ -354 +354 @@
 #MJCalibrateSignal.MPedCalcFromExtractorRndm.CheckWinFirst:      0
 #MJCalibrateSignal.MPedCalcFromExtractorRndm.CheckWinSize:      29
-#MJCalibrateSignal.MPedCalcFromExtractorRndm.MaxHiGainVar:      40
+#MJCalibrateSignal.MPedCalcFromExtractorRndm.MaxSignalVar:      40
 
 #MJCalibrateSignal.MPedCalcFromExtractor.PedestalUpdate:   yes
@@ -365 +365 @@
 #MJCalibrateSignal.MPedCalcFromExtractor.CheckWinFirst:      0
 #MJCalibrateSignal.MPedCalcFromExtractor.CheckWinSize:      29
-#MJCalibrateSignal.MPedCalcFromExtractor.MaxHiGainVar:      40
+#MJCalibrateSignal.MPedCalcFromExtractor.MaxSignalVar:      40
 
 # -------------------------------------------------------------------------

trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc

@@ -191 +191 @@
 #MJPedestalC1.ExtractPedestal.CheckWinFirst:     0
 #MJPedestalC1.ExtractPedestal.CheckWinSize:     29
-#MJPedestalC1.ExtractPedestal.MaxHiGainVar:     40
+#MJPedestalC1.ExtractPedestal.MaxSignalVar:     40
 
 #MJPedestalC2.ExtractPedestal: MPedCalcFromLoGain
@@ -199 +199 @@
 #MJPedestalC2.ExtractPedestal.CheckWinFirst:     0
 #MJPedestalC2.ExtractPedestal.CheckWinSize:     29
-#MJPedestalC2.ExtractPedestal.MaxHiGainVar:     40
+#MJPedestalC2.ExtractPedestal.MaxSignalVar:     40
 
 # -------------------------------------------------------------------------
@@ -364 +364 @@
 #MJCalibrateSignal.MPedCalcFundamental.CheckWinFirst:      0
 #MJCalibrateSignal.MPedCalcFundamental.CheckWinSize:      29
-#MJCalibrateSignal.MPedCalcFundamental.MaxHiGainVar:      40
+#MJCalibrateSignal.MPedCalcFundamental.MaxSignalVar:      40
 
 #MJCalibrateSignal.MPedCalcFromExtractorRndm.PedestalUpdate:   yes
@@ -375 +375 @@
 #MJCalibrateSignal.MPedCalcFromExtractorRndm.CheckWinFirst:      0
 #MJCalibrateSignal.MPedCalcFromExtractorRndm.CheckWinSize:      29
-#MJCalibrateSignal.MPedCalcFromExtractorRndm.MaxHiGainVar:      40
+#MJCalibrateSignal.MPedCalcFromExtractorRndm.MaxSignalVar:      40
 
 #MJCalibrateSignal.MPedCalcFromExtractor.PedestalUpdate:   yes
@@ -386 +386 @@
 #MJCalibrateSignal.MPedCalcFromExtractor.CheckWinFirst:      0
 #MJCalibrateSignal.MPedCalcFromExtractor.CheckWinSize:      29
-#MJCalibrateSignal.MPedCalcFromExtractor.MaxHiGainVar:      40
+#MJCalibrateSignal.MPedCalcFromExtractor.MaxSignalVar:      40
 
 # -------------------------------------------------------------------------

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -567 +567 @@
 // task will access the tasklist.
 //
-Bool_t MEvtLoop::Eventloop(UInt_t maxcnt, Bool_t printstat)
+Bool_t MEvtLoop::Eventloop(UInt_t maxcnt, Statistics_t printstat)
 {
     TDatime d;
@@ -594 +594 @@
     // If Process has ever been called print statistics
     //
-    if (printstat && fTaskList->GetNumExecutions()>0)
-        fTaskList->PrintStatistics();
+    if (fTaskList->GetNumExecutions()>0)
+        switch (printstat)
+        {
+        case kNoStatistics:
+            break;
+        case kStdStatistics:
+            fTaskList->PrintStatistics();
+            break;
+        case kFullStatistics:
+            fTaskList->PrintStatistics(0, kTRUE);
+            break;
+        }
 
     if (!fDisplay)

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -43 +43 @@
 
 public:
+    enum Statistics_t {
+        kNoStatistics   = 0,
+        kStdStatistics  = 1,
+        kFullStatistics = 2
+    };
+
     MEvtLoop(const char *name="Evtloop");
     virtual ~MEvtLoop();
@@ -68 +74 @@
     Bool_t PostProcess() const;
 
-    Bool_t Eventloop(UInt_t maxcnt=0, Bool_t printstat=kTRUE);
+    Bool_t Eventloop(UInt_t maxcnt=0, Statistics_t printstat=kStdStatistics);
 
     void MakeMacro(const char *filename="evtloop.C");

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;