Changeset 5570 for trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

Timestamp:

12/08/04 18:02:12 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -250 +250 @@
   fRunHeader    = NULL;
   fEvtHeader    = NULL;
-  fPedestalsOut = NULL;
 
   // If the size is yet set, set the size
@@ -344 +343 @@
   if (fExtractor && !fPedestalsIn)
   {
-      fPedestalsIn = (MPedestalCam*)pList->FindObject("MPedestalCam", AddSerialNumber(fNamePedestalCamIn));
+      fPedestalsIn = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedestalCamIn), "MPedestalCam");
       if (!fPedestalsIn)
       {
@@ -352 +351 @@
   }
 
-  fPedestalsOut = (MPedestalCam*)pList->FindCreateObj("MPedestalCam", AddSerialNumber(fNamePedestalCamOut));
   if (!fPedestalsOut)
-      return kFALSE;
+  {
+      fPedestalsOut = (MPedestalCam*)pList->FindCreateObj("MPedestalCam", AddSerialNumber(fNamePedestalCamOut));
+      if (!fPedestalsOut)
+          return kFALSE;
+  }
 
   *fLog << inf;
@@ -630 +632 @@
     *fLog << "Name of input  MPedestalCam:  " << (fPedestalsIn?fPedestalsIn->GetName():fNamePedestalCamIn.Data()) << " (" << fPedestalsIn << ")" << endl;
     *fLog << "Name of output MPedestalCam:  " << (fPedestalsOut?fPedestalsOut->GetName():fNamePedestalCamOut.Data()) << " (" << fPedestalsOut << ")" << endl;
-    *fLog << "Num evts for pedestal   calc: " << fNumEventsDump << endl;
-    *fLog << "Num evts for avg.areas  calc: " << fNumAreasDump << endl;
-    *fLog << "Num evts for avg.sector calc: " << fNumSectorsDump << endl;
     *fLog << "Pedestal Update is            " << (fPedestalUpdate?"on":"off") << endl;
-    *fLog << "ExtractWindow from slice " << fExtractWinFirst << " to " << fExtractWinLast << " incl." << endl;
-
+    if (fPedestalUpdate)
+    {
+        *fLog << "Num evts for pedestal   calc: " << fNumEventsDump << endl;
+        *fLog << "Num evts for avg.areas  calc: " << fNumAreasDump << endl;
+        *fLog << "Num evts for avg.sector calc: " << fNumSectorsDump << endl;
+    }
     if (fExtractor)
         *fLog << "Extractor used:               " << fExtractor->ClassName() << endl;
-}
+    *fLog << "ExtractWindow from slice " << fExtractWinFirst << " to " << fExtractWinLast << " incl." << endl;
+}