Changeset 9157 for trunk/MagicSoft/Mars/mpedestal

Timestamp:

11/12/08 16:16:11 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpedestal

Files:

• MExtractPedestal.cc (modified) (3 diffs)
• MExtractPedestal.h (modified) (1 diff)
• MPedCalcFromLoGain.cc (modified) (3 diffs)
• MPedCalcFromLoGain.h (modified) (1 diff)
• MPedCalcPedRun.cc (modified) (3 diffs)
• MPedCalcPedRun.h (modified) (1 diff)

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.38 2007-12-19 18:53:02 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.39 2008-11-12 16:04:18 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -491 +491 @@
         fExtractor->SetNoiseCalculation(fRandomCalculation);
 
-    const Int_t rc = Calc();
+    Calc();
 
     if (fExtractor)
         fExtractor->SetNoiseCalculation(kFALSE);
 
-    return rc;
+    fPedestalsOut->SetNumEvents(fCounter);
+
+    return kTRUE;
 }
 
@@ -624 +626 @@
 Int_t MExtractPedestal::PostProcess()
 {
-    fPedestalsOut->SetNumEvents(fCounter);
-
     return fExtractor ? fExtractor->CallPostProcess() : kTRUE;
 }

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h

@@ -100 +100 @@
 
   // Interface to be overwritten by a new class
-  virtual void  ResetArrays();
-  virtual Int_t Calc() = 0;
+  virtual void ResetArrays();
+  virtual void Calc() = 0;
 
   // Helper functions

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedCalcFromLoGain.cc,v 1.39 2007-12-14 09:56:03 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedCalcFromLoGain.cc,v 1.40 2008-11-12 16:04:18 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -199 +199 @@
 // calculate the overall mean and rms in the PostProcess()
 //
-Int_t MPedCalcFromLoGain::Calc()
+void MPedCalcFromLoGain::Calc()
 {
     const Int_t nhi = fRunHeader->GetNumSamplesHiGain();
@@ -242 +242 @@
     if (fPedestalUpdate)
         fPedestalsOut->SetReadyToSave();
-
-  return kTRUE;
 }
 

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.h

@@ -34 +34 @@
 
     // MExtractPedestal
-    Int_t  Calc();
+    void   Calc();
 
 public:

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedCalcPedRun.cc,v 1.53 2008-07-14 19:59:12 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedCalcPedRun.cc,v 1.54 2008-11-12 16:04:18 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -256 +256 @@
 // calculate the overall mean and rms in the PostProcess()
 //
-Int_t MPedCalcPedRun::Calc()
+void MPedCalcPedRun::Calc()
 {
     if (fIsNotPedRun && !IsPedBitSet())
-        return kTRUE;
+        return;
 
     MRawEvtPixelIter pixel(fRawEvt);
@@ -268 +268 @@
 
     fPedestalsOut->SetReadyToSave();
-
-    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.h

@@ -25 +25 @@
     Bool_t ReInit(MParList *pList);
     Int_t  PreProcess(MParList *pList);
-    Int_t  Calc();
+    void   Calc();
     Int_t  PostProcess();