Changeset 6084 for trunk/MagicSoft/Mars/mjobs

Timestamp:

01/28/05 13:21:14 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -267 +267 @@
     MBadPixelsCam              badpix;
 
+    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);
+    }
+
     MExtractor *extractor1=0;
     MExtractor *extractor2=0;
@@ -314 +331 @@
     plist.AddToList(this); // take care of fDisplay!
     plist.AddToList(&badcam);
-    plist.AddToList(&calibcont);
     plist.AddToList(&hilcam);
-
-    if (fIsInterlaced)
-      {
-        plist.AddToList(&ichcam);
-        plist.AddToList(&iqecam);
-        plist.AddToList(&iblcam);
-        plist.AddToList(&itmcam);
-        plist.AddToList(&ibdcam);
-      }
+    plist.AddToList(&calibcont);       // Using AddToList(TObjArray *)
+    plist.AddToList(&interlacedcont);  // Using AddToList(TObjArray *)
 
     // Setup Tasklist
@@ -710 +719 @@
     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;