Changeset 5550 for trunk/MagicSoft/Mars

Timestamp:

12/03/04 09:13:56 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mpedestal/MPedCalcPedRun.cc (modified) (5 diffs)
• mpedestal/MPedCalcPedRun.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/12/02: Markus Gaug
+ 
+   * mpedestal/MPedCalcPedRun.[h,cc]
+     - replaced CallPostProcess by public member function Finalize()
+
 
  2004/12/02: Thomas Bretz

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc

@@ -237 +237 @@
           *fLog << endl;
           *fLog << inf << GetDescriptor() << " : Finalize pedestal calculations..." << flush;
-          CallPostProcess();
+          Finalize();
           Reset();
         }
@@ -260 +260 @@
 Int_t MPedCalcPedRun::Process()
 {
-
-  if (fSkip && !IsPedBitSet())
-    return kTRUE;
-
-  /*
-  *fLog << err << dec << fEvtHeader->GetTriggerID() << endl;
-  for (Int_t i=16; i>= 0; i--)
-    *fLog << inf << (fEvtHeader->GetTriggerID() >> i & 1);
-  *fLog  << endl;
-  *fLog << warn << hex << fEvtHeader->GetTriggerID() << endl;
-  */
 
   fUsedEvents++;
@@ -383 +372 @@
 }
 
+Int_t MPedCalcPedRun::PostProcess()
+{
+  Finalize();
+  return kTRUE;
+}
+
 // --------------------------------------------------------------------------
 //
 // Compute signal mean and rms in the whole run and store it in MPedestalCam
 //
-Int_t MPedCalcPedRun::PostProcess()
+void MPedCalcPedRun::Finalize()
 {
 
   if (fUsedEvents == 0)
-    return kTRUE;
+    return;
 
   MRawEvtPixelIter pixel(fRawEvt);
@@ -428 +423 @@
   fPedestalsOut->SetReadyToSave();
 
-  return kTRUE;
-}
-
-// -----------------------------------------------------------------------
-//
-// Analogue to the MTask::CallPostProcess, but without the manipulation 
-// of the bit fIsPreProcessed. Needed in order to call PostProcess multiple 
-// times in the intensity calibration.
-//
-Int_t MPedCalcPedRun::CallPostProcess()
-{
-
-  *fLog << all << fName << "... " << flush;
-  if (fDisplay)
-    fDisplay->SetStatusLine2(*this);
-  
-  return PostProcess();
+  return;
 }
 
@@ -457 +436 @@
 {
 
-  if (fRunHeader->GetRunNumber() == 38996)
-    return kTRUE;
-  
   if (fRunHeader->GetRunNumber() < gkFirstRunWithFinalBits)
     return kFALSE;

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.h

@@ -43 +43 @@
   MPedCalcPedRun(const char *name=NULL, const char *title=NULL);
   
-  Int_t CallPostProcess();  
+  void Finalize();  
 
   void Print(Option_t *o="") const;