Changeset 6680 for trunk/MagicSoft/Mars/mjobs

Timestamp:

02/25/05 18:08:21 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -55 +55 @@
 #include "MPedestalCam.h"
 #include "MBadPixelsCam.h"
+#include "MArrivalTimeCam.h"
 
 #include "MCalibrationQECam.h"
@@ -79 +80 @@
 #include "MHCalibrationRelTimeCam.h"
 #include "MHCalibrationPulseTimeCam.h"
+#include "MHCalibrationHiLoCam.h"
 #include "MHCamera.h"
 
@@ -287 +289 @@
         interlacedcont.Add(&hpndiod);
         if (fIsRelTimesUpdate)
-            interlacedcont.Add(&hrelcam);
-        if (fIsHiLoCalibration)
-            interlacedcont.Add(&hilcam);
+          interlacedcont.Add(&hrelcam);
     }
 
@@ -395 +395 @@
     plist.AddToList(&pedcambias);
     plist.AddToList(&pedcamab);
+
+    MArrivalTimeCam timecam;
+    plist.AddToList(&timecam);
 
     // Check for interleaved events
@@ -551 +554 @@
     MHCamEvent evt6(2, "Unsuitable", "Fraction of unsuitable events per Pixel;;[1]");
     MHCamEvent evt7(0, "Times",      "Calibrated Arrival Time;;T [fadc sl]");
-    MHCamEvent evt8(2, "Conv",       "Calibration Conv. Factors;;[phe/fadc cnts]");
-    MHCamEvent evt9(0, "TimeTest",   "Tested Arrival Time of Cherenkov Events;;[fadc sl]");
+    MHCamEvent evt8(0, "Conv",       "Calibration Conv. Factors;;[phe/fadc cnts]");
 
     evt0.EnableSqrtVariance();
@@ -562 +564 @@
     evt7.EnableSqrtVariance();
     evt8.EnableSqrtVariance();
-    evt9.EnableSqrtVariance();
 
     MFillH fill0(&evt0, "MPedestalFundamental",    "FillPedFLG");
@@ -573 +574 @@
     MFillH fill7(&evt7, "MArrivalTime",            "FillTimes");
     MFillH fill8(&evt8, "MCalibConstCam",          "FillConv");
-    MFillH fill9(&evt9, "MCalibrationPulseTimeCam","FillPulseTime");
 
     MTaskEnv fillflorian("FinalFantasy");
@@ -695 +695 @@
     if (extractor2 || extractor1->InheritsFrom("MExtractTimeAndCharge"))
       tlist2.AddToList(&fill7);
-    tlist2.AddToList(&fill9);
 
     tlist2.AddToList(&fillflorian);
@@ -750 +749 @@
     DisplayResult(plist);
 
+    if (fPixelCheck)
+      {
+        MHCalibrationPulseTimeCam *pcam = (MHCalibrationPulseTimeCam*)plist.FindObject("MHCalibrationPulseCam");
+        MHCalibrationPix &pix1 = (*pcam)[fCheckedPixId];
+        pix1.DrawClone("");
+        
+        if (fIsHiLoCalibration)
+          {
+            MHCalibrationHiLoCam *hcam = (MHCalibrationHiLoCam*)plist.FindObject("MHCalibrationPulseCam");
+            MHCalibrationPix &pix2 = (*hcam)[fCheckedPixId];
+            pix2.DrawClone("");
+          }
+}
+
+
     if (!WriteResult(interlacedcont))
-        return kFALSE;
+      return kFALSE;
+
+    TObjArray addcont;
+    addcont.Add(&pulcam);
+
+    if (fIsHiLoCalibration)
+      addcont.Add(&hilcam);
+
+    if (!WriteResult(addcont))
+      return kFALSE;
 
     // return if job went ok