Changeset 7070 for trunk

Timestamp:

05/20/05 12:17:55 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MEvtLoop.cc (modified) (4 diffs)
• mbase/MEvtLoop.h (modified) (1 diff)
• mpedestal/MExtractPedestal.cc (modified) (1 diff)
• msignal/MExtractor.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -201 +201 @@
 // for developers or use in special jobs only!
 //
-Bool_t MEvtLoop::PreProcess(const char *tlist)
+Bool_t MEvtLoop::PreProcess()
 {
     fTaskList = NULL;
@@ -218 +218 @@
     //  the default name is "MTaskList"
     //
-    fTaskList = (MTaskList*)fParList->FindObject(tlist, "MTaskList");
+    fTaskList = (MTaskList*)fParList->FindObject("MTaskList");
     if (!fTaskList)
     {
-        *fLog << err << dbginf << "Cannot find tasklist '" << tlist << "' in parameter list." << endl;
+        *fLog << err << dbginf << "Cannot find MTaskList in parameter list." << endl;
         return kFALSE;
     }
@@ -567 +567 @@
 // task will access the tasklist.
 //
-Bool_t MEvtLoop::Eventloop(UInt_t maxcnt, const char *tlist)
+Bool_t MEvtLoop::Eventloop(UInt_t maxcnt, Bool_t printstat)
 {
     TDatime d;
     *fLog << inf << underline << "Eventloop: " << fName << " started at " << d.AsString() << endl;
 
-    Bool_t rc = PreProcess(tlist);
+    Bool_t rc = PreProcess();
 
     //
@@ -590 +590 @@
         rc = kFALSE;
     }
+
+    //
+    // If Process has ever been called print statistics
+    //
+    if (printstat && fTaskList->GetNumExecutions()>0)
+        fTaskList->PrintStatistics();
 
     if (!fDisplay)

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -64 +64 @@
 #endif
 
-    Bool_t PreProcess(const char *tlist="MTaskList");
+    Bool_t PreProcess();
     Int_t  Process(UInt_t maxcnt);
     Bool_t PostProcess() const;
 
-    Bool_t Eventloop(UInt_t maxcnt=0, const char *tlist="MTaskList");
+    Bool_t Eventloop(UInt_t maxcnt=0, Bool_t printstat=kTRUE);
 
     void MakeMacro(const char *filename="evtloop.C");

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -443 +443 @@
   if (fExtractor)
   {
-    if (!((MTask*)fExtractor)->ReInit(pList))
-        return kFALSE;
-
-      if (!fExtractor->InitArrays())
+      if (!((MTask*)fExtractor)->ReInit(pList))
           return kFALSE;
 

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -429 +429 @@
         *fLog << GetDescriptor() << ":" << endl;
 
-    *fLog << " Hi Gain Range:      " << (int)fHiGainFirst << " " << (int)fHiGainLast << endl;
-    *fLog << " Lo Gain Range:      " << (int)fLoGainFirst << " " << (int)fLoGainLast << endl;
-    *fLog << " Gain Overlap to Lo: " << (int)fHiLoLast    << endl;
-    *fLog << " Saturation Lim:     " << (int)fSaturationLimit << endl;
-    *fLog << " Num Samples HiGain: " << fNumHiGainSamples << "  LoGain: " << fNumLoGainSamples << endl;
+    *fLog << " Hi Gain Range:      " << Form("%2d %2d", fHiGainFirst, fHiGainLast) << endl;
+    *fLog << " Lo Gain Range:      " << Form("%2d %2d", fLoGainFirst, fLoGainLast) << endl;
+    *fLog << " Gain Overlap to Lo: " << Form("%2d", fHiLoLast)        << endl;
+    *fLog << " Saturation Lim:     " << Form("%3d", fSaturationLimit) << endl;
+    *fLog << " Num Samples Hi/Lo:  " << Form("%2d %2d", fNumHiGainSamples, fNumLoGainSamples) << endl;
     if (fPedestals)
         *fLog << " Pedestals:          " << fPedestals->GetName() << ", " << fPedestals << endl;