Changeset 3004 for trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc

Timestamp:

02/02/04 15:31:26 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc

@@ -89 +89 @@
 }
 
+
+
 // --------------------------------------------------------------------------
 //
-// Make sure, that there is an MPedestalCam Object in the Parameter List.
+// Make sure that there is a MPedestalCam object in the parameter list.
 //
-Int_t MMcPedestalCopy::PreProcess(MParList *pList)
+Int_t  MMcPedestalCopy::PreProcess(MParList *pList)
 {
-  //
-  // If it is no MC file skip this function...
-  //
-  if (! CheckRunType(pList))
-    return kTRUE;
+  if ( ! pList->FindObject(AddSerialNumber("MPedestalCam")) )
+    pList->FindCreateObj(AddSerialNumber("MPedestalCam"));
 
-  return pList->FindCreateObj(AddSerialNumber("MPedestalCam")) ? kTRUE : kFALSE;
+  return kTRUE;
 }
 
@@ -115 +114 @@
     //
     if (!CheckRunType(pList))
+      {
+        *fLog << inf << "This is no MC file... skipping." << endl;
         return kTRUE;
+      }
 
     //
@@ -128 +130 @@
     }
 
-    MPedestalCam *pedcam = (MPedestalCam*)pList->FindCreateObj(AddSerialNumber("MPedestalCam"));
+    MPedestalCam *pedcam = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
     if (!pedcam)
+      {
+        *fLog << err << dbginf << "Cannot create " << AddSerialNumber("MPedestalCam") <<"... Exiting." << endl;
+
         return kFALSE;
+      }
 
     MMcRunHeader *mcrun = (MMcRunHeader*)pList->FindObject("MMcRunHeader");