Changeset 6006 for trunk/MagicSoft

Timestamp:

01/25/05 23:19:27 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc

@@ -234 +234 @@
 {
 
-  if (!InitCams(pList,"HiLo"))
-    return kFALSE;
+  fCam = (MCalibrationCam*)plist->FindObject(AddSerialNumber("MCalibrationHiLoCam"));
+  if (!fCam)
+    {
+      fCam = (MCalibrationCam*)plist->FindCreateObj(AddSerialNumber("MCalibrationHiLoCam"));
+      if (!fCam)
+        {
+          *fLog << err << "Cannot find nor create MCalibrationHiLoCam... abort." << endl;
+          return kFALSE;
+        }
+      fCam->Init(*fGeom);
+    }
 
   MExtractedSignalCam *signal = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
@@ -398 +407 @@
   *fLog << endl;
 
-  MCalibrationCam *hilocam = fIntensCam ? fIntensCam->GetCam() : fCam;
+  MCalibrationCam *hilocam = fCam;
   MBadPixelsCam   *badcam  = fIntensBad ? fIntensBad->GetCam() : fBadPixels;