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

Timestamp:

01/21/04 18:52:05 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

@@ -73 +73 @@
     fADC2PhOuter = 1.;
 
+    fFillCalibrationCam = kTRUE;
+
 }
 
@@ -117 +119 @@
     return kTRUE;
 
-  fCalCam = (MCalibrationCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationCam"));
+
+  fCalCam = (MCalibrationCam*) pList->FindObject(AddSerialNumber("MCalibrationCam"));
   if ( !fCalCam )
     {
-      *fLog << err << dbginf << "Cannot create MCalibrationCam... aborting." << endl;
-      return kFALSE;
+      *fLog << warn << dbginf << AddSerialNumber("MCalibrationCam") << " does not exist... Creating." << endl;
+
+      fCalCam = (MCalibrationCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationCam"));
+      if ( !fCalCam )
+        {
+          *fLog << err << dbginf << "Cannot create " << AddSerialNumber("MCalibrationCam") << "... aborting." << endl;
+          return kFALSE;
+        }
+    }
+  else
+    {
+      fFillCalibrationCam = kFALSE;
+      *fLog << warn << dbginf << AddSerialNumber("MCalibrationCam") << " already exists... " << endl;
     }
 
@@ -185 +199 @@
     fConversionHiLo = fHeaderFadc->GetLow2HighGain();
 
+    //
+    // If MCalibrationCam already existed in the parameter list before
+    // MMcCalibrationUpdate::PreProcess was executed (from a 
+    // previous calibration loop) we must not fill it, hence nothing
+    // else has to be done in ReInit:
+    //
+    if ( !fFillCalibrationCam )
+      return kTRUE;
+
 
     const int num = fCalCam->GetSize();