Changeset 6078 for trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

Timestamp:

01/28/05 11:18:44 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -126 +126 @@
 Bool_t MJCalibrateSignal::WriteResult(TObjArray &cont)
 {
-    if (fPathOut.IsNull())
-    {
-        *fLog << inf << "No output path specified via SetPathOut - no output written." << endl;
-        return kTRUE;
-    }
-
-    const TString oname = Form("%s/signal%08d.root", (const char*)fPathOut, fSequence.GetSequence());
-
-    *fLog << inf << "Writing to file: " << oname << endl;
-
-    TFile file(oname, "RECREATE");
-
-    *fLog << inf << " - MStatusDisplay..." << flush;
-    if (fDisplay && fDisplay->Write()<=0)
-    {
-        *fLog << err << "Unable to write MStatusDisplay to " << oname << endl;
-        return kFALSE;
-    }
-    *fLog << inf << "ok." << endl;
-
-    return fIsInterlaced ? WriteContainer(cont) : kTRUE;
+    const TString name(Form("signal%08d.root", fSequence.GetSequence()));
+    return WriteContainer(cont, name);
 }
 
@@ -272 +253 @@
     MBadPixelsIntensityCam              ibdcam;
 
-    TObjArray interlacedcont;
-    interlacedcont.Add(&ichcam);
-    interlacedcont.Add(&iqecam);
-    interlacedcont.Add(&iblcam);
-    interlacedcont.Add(&itmcam);
-    interlacedcont.Add(&ibdcam);
-
     MHCalibrationChargeCam      hchacam;
     MHCalibrationChargeBlindCam hbndcam;
     MHCalibrationChargePINDiode hpndiod;
     MHCalibrationRelTimeCam     hrelcam;
-
-    interlacedcont.Add(&hchacam);
-    interlacedcont.Add(&hbndcam);
-    interlacedcont.Add(&hpndiod);
-    if (fIsRelTimesUpdate)
-      interlacedcont.Add(&hrelcam);
 
     MCalibrationChargeCam      calcam;
@@ -297 +265 @@
     MCalibrationHiLoCam        hilcam;
 
-    if (fIsHiLoCalibration)
-      interlacedcont.Add(&hilcam);      
-
     MBadPixelsCam              badpix;
 
@@ -351 +316 @@
     plist.AddToList(&calibcont);
     plist.AddToList(&hilcam);
-
-    if (fIsInterlaced)
-      plist.AddToList(&interlacedcont);
 
     // Setup Tasklist
@@ -739 +701 @@
     DisplayResult(plist);
 
+    TObjArray interlacedcont;
+    if (fIsInterlaced)
+    {
+        interlacedcont.Add(&ichcam);
+        interlacedcont.Add(&iqecam);
+        interlacedcont.Add(&iblcam);
+        interlacedcont.Add(&itmcam);
+        interlacedcont.Add(&ibdcam);
+        interlacedcont.Add(&hchacam);
+        interlacedcont.Add(&hbndcam);
+        interlacedcont.Add(&hpndiod);
+        if (fIsRelTimesUpdate)
+            interlacedcont.Add(&hrelcam);
+        if (fIsHiLoCalibration)
+            interlacedcont.Add(&hilcam);
+    }
+
     if (!WriteResult(interlacedcont))
         return kFALSE;