Changeset 3004

Timestamp:

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

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MMcCalibrationUpdate.cc (modified) (2 diffs)
• manalysis/MMcPedestalCopy.cc (modified) (3 diffs)
• mcalib/MMcCalibrationCalc.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/02/02: Abelardo Moralejo
+
+   * manalysis/MMcCalibrationUpdate.cc, MMcPedestalCopy.cc
+     - removed file type check (MC or data) from PreProcess since now
+       run headers are not yet known at that point.
+
+   * mcalib/MMcCalibrationCalc.cc
+     - same as above.
+
+
  2004/02/02: Thomas Bretz
 

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

@@ -108 +108 @@
 Int_t MMcCalibrationUpdate::PreProcess(MParList *pList)
 {
-  //
-  // If it is no MC file skip this function...
-  //
-  if (!CheckRunType(pList))
-    return kTRUE;
-
-
   fCalCam = (MCalibrationCam*) pList->FindObject(AddSerialNumber("MCalibrationCam"));
   if ( !fCalCam )
@@ -163 +156 @@
     //
     if (!CheckRunType(pList))
+      {
+        *fLog << inf << "This is no MC file... skipping." << endl;
         return kTRUE;
-
+      }
+        
     //
     // Now check the existence of all necessary containers.

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");

trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc

@@ -99 +99 @@
 Int_t MMcCalibrationCalc::PreProcess(MParList *pList)
 {
-  //
-  // If it is no MC file display error and exit
-  //
-  if (!CheckRunType(pList))
-    {
-      *fLog << err << dbginf << "This is no MC file... aborting." << endl;
-      return kFALSE;
-    }
 
   fCalCam = (MCalibrationCam*) pList->FindObject(AddSerialNumber("MCalibrationCam"));
@@ -148 +140 @@
 Bool_t MMcCalibrationCalc::ReInit(MParList *pList)
 {
+  //
+  // If it is no MC file display error and exit
+  //
+  if (!CheckRunType(pList))
+    {
+      *fLog << err << dbginf << "This is no MC file... aborting." << endl;
+      return kFALSE;
+    }
+
   //
   // Now check the existence of all necessary containers.