Changeset 9337 for trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

Timestamp:

02/15/09 13:47:00 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

@@ -89 +89 @@
 // --------------------------------------------------------------------------
 //
-// Check for the run type. Return kTRUE if it is a MC run or if there
-// is no MC run header (old camera files) kFALSE in case of a different
-// run type
-//
-Bool_t MMcCalibrationUpdate::CheckRunType(MParList *pList) const
-{
-    const MRawRunHeader *run = (MRawRunHeader*)pList->FindObject(AddSerialNumber("MRawRunHeader"));
-    if (!run)
-    {
-        *fLog << warn << dbginf << "Warning - cannot check file type, MRawRunHeader not found." << endl;
-        return kTRUE;
-    }
-
-    return run->IsMonteCarloRun();
-}
-
-// --------------------------------------------------------------------------
-//
 // Make sure, that there is an MCalibrationCam Object in the Parameter List.
 //
@@ -150 +132 @@
 Bool_t MMcCalibrationUpdate::ReInit(MParList *pList)
 {
+    const MRawRunHeader *run = (MRawRunHeader*)pList->FindObject(AddSerialNumber("MRawRunHeader"));
+    if (!run)
+    {
+        *fLog << warn << dbginf << "Warning - cannot check file type, MRawRunHeader not found." << endl;
+        return kTRUE;
+    }
+
     //
     // If it is no MC file skip this function...
     //
     fGeom = 0;
-    if (!CheckRunType(pList))
+    if (run->IsMonteCarloRun())
     {
         *fLog << inf << "This is no MC file... skipping." << endl;
         return kTRUE;
     }
+
+    const MMcRunHeader* mcrunh = (MMcRunHeader*) pList->FindObject(AddSerialNumber("MMcRunHeader"));
+    if (!mcrunh)
+    {
+        *fLog << err << AddSerialNumber("MMcRunHeader") << " not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    if (mcrunh->IsCeres())
+    {
+        *fLog << inf;
+        *fLog << "This is a ceres file... skipping." << endl;
+        *fLog << "   MCalibrationChargeCam (calibration constants), MCalibrationQECam (avg quantum efficiency)" << endl;
+        *fLog << "   and MPedPhotCam (randomly extracted pedestal) not updated." << endl;
+        return kTRUE;
+    }
         
     //
@@ -174 +179 @@
     {
         *fLog << err << AddSerialNumber("MMcFadcHeader") << " not found... aborting." << endl;
-        return kFALSE;
-    }
-
-    MMcRunHeader* mcrunh = (MMcRunHeader*) pList->FindObject(AddSerialNumber("MMcRunHeader"));
-    if (!mcrunh)
-    {
-        *fLog << err << AddSerialNumber("MMcRunHeader") << " not found... aborting." << endl;
         return kFALSE;
     }