Changeset 5030 for trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

Timestamp:

09/15/04 14:53:06 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1453 +1453 @@
 
     SetRelTimeCalibration(GetEnv("RelTimeCalibration", IsRelTimes()));
+    SetIntensity(GetEnv("IntensityCalibration", IsIntensity()));
     SetDataCheck(GetEnv("Datacheck", IsDataCheck()));
     SetDebug(GetEnv("Debug", IsDebug()));
-    SetIntensity(GetEnv("Intensity", IsIntensity()));
 
     SetUseBlindPixel(GetEnv("UseBlindPixel", IsUseBlindPixel()));
@@ -1491 +1491 @@
   if (run < gkSecondBlindPixelInstallation)
     {
-
       MCalibrationBlindCamOneOldStyle blindresults;
       if (IsIntensity())
@@ -1505 +1504 @@
   else if (run < gkThirdBlindPixelInstallation)
     {
-
       MCalibrationBlindCamTwoNewStyle blindresults;
 
@@ -2031 +2029 @@
     *fLog << inf << "ok." << endl;
 
+    TObjArray cont;
     if (IsIntensity())
-      {
-        *fLog << inf << " - MBadPixelsIntensityCam..." << flush;
-        if (fIntensBadCam.Write()<=0)
-          {
-            *fLog << err << "Unable to write MBadPixelsIntensityCam to " << oname << endl;
-            return kFALSE;
-          }
-        *fLog << inf << "ok." << endl;
-
-        *fLog << inf << " - MCalibrationIntensityChargeCam..." << flush;
-        if (fIntensCalibCam.Write()<=0)
-          {
-            *fLog << err << "Unable to write MCalibrationIntensityChargeCam to " << oname << endl;
-            return kFALSE;
-          }
-        *fLog << inf << "ok." << endl;
-
-        *fLog << inf << " - MCalibrationIntensityQECam..." << flush;
-        if (fIntensQECam.Write()<=0)
-          {
-            *fLog << err << "Unable to write MCalibrationIntensityQECam to " << oname << endl;
-            return kFALSE;
-          }
-        *fLog << inf << "ok." << endl;
-        *fLog << inf << " - MCalibrationIntensityBlindCam..." << flush;
-        if (fIntensBlindCam.Write()<=0)
-          {
-            *fLog << err << "Unable to write MCalibrationIntensityBlindCam to " << oname << endl;
-            return kFALSE;
-          }
-        *fLog << inf << "ok." << endl;
-      }
+    {
+        cont.Add(&fIntensBadCam);
+        cont.Add(&fIntensCalibCam);
+        cont.Add(&fIntensQECam);
+        cont.Add(&fIntensBlindCam);
+    }
     else
-      {
-        *fLog << inf << " - MCalibrationChargeCam..." << flush;
-        if (fCalibrationCam.Write()<=0)
-          {
-            *fLog << err << "Unable to write MCalibrationChargeCam to " << oname << endl;
-            return kFALSE;
-          }
-        *fLog << inf << "ok." << endl;
-
-        *fLog << inf << " - MCalibrationQECam..." << flush;
-        if (fQECam.Write()<=0)
-          {
-            *fLog << err << "Unable to write MCalibrationQECam to " << oname << endl;
-            return kFALSE;
-          }
-        *fLog << inf << "ok." << endl;
-
-        *fLog << inf << " - MCalibrationBlindCam..." << flush;
-        if (fCalibrationBlindCam.Write()<=0)
-          {
-            *fLog << err << "Unable to write MCalibrationBlindCam to " << oname << endl;
-            return kFALSE;
-          }
-        *fLog << inf << "ok." << endl;
-      }
-    
-    *fLog << inf << " - MCalibrationChargePINDiode..." << flush;
-    if (fCalibrationPINDiode.Write()<=0)
-      {
-        *fLog << err << "Unable to write MCalibrationChargePINDiode to " << oname << endl;
-        return kFALSE;
-    }
-    *fLog << inf << "ok." << endl;
-
-    *fLog << inf << " - MBadPixelsCam..." << flush;
-    if (fBadPixels.Write()<=0)
-    {
-        *fLog << err << "Unable to write MBadPixelsCam to " << oname << endl;
-        return kFALSE;
-    }
-    *fLog << inf << "ok." << endl;
+    {
+        cont.Add(&fCalibrationCam);
+        cont.Add(&fQECam);
+        cont.Add(&fCalibrationBlindCam);
+    }
+    cont.Add(&fCalibrationPINDiode);
+    cont.Add(&fBadPixels);
+    if (IsRelTimes())
+          cont.Add(IsIntensity() ? (TObject*)&fIntensRelTimeCam : (TObject*)&fRelTimeCam);
 
     if (!geom)
-        *fLog << warn << " - WARNING: MGeomCam... not found!" << endl;
-    {
-        *fLog << inf << " - MGeomCam..." << flush;
-        if (geom->Write()<=0)
-        {
-            *fLog << err << "Unable to write MGeomCam to " << oname << endl;
-            return kFALSE;
-        }
-        *fLog << inf << "ok." << endl;
-    }
-
-    if (IsRelTimes())
-    {
-      if (IsIntensity())
-        {
-          *fLog << inf << " - MCalibrationIntensityRelTimeCam..." << flush;
-          if (fIntensRelTimeCam.Write()<=0)
-            {
-              *fLog << err << "Unable to write MCalibrationIntensityRelTimeCam to " << oname << endl;
-              return kFALSE;
-            }
-          *fLog << inf << "ok." << endl;
-        }
-      else
-        {
-          *fLog << inf << " - MCalibrationRelTimeCam..." << flush;
-          if (fRelTimeCam.Write()<=0)
-            {
-              *fLog << err << "Unable to write MCalibrationRelTimeCam to " << oname << endl;
-              return kFALSE;
-            }
-          *fLog << inf << "ok." << endl;
-        }
-      
-    }
+        *fLog << warn << " - WARNING - MGeomCam... not found!" << endl;
+    else
+        cont.Add(geom);
+
+    return WriteContainer(cont);
 
     return kTRUE;
-
 }