Changeset 6624 for trunk/MagicSoft/Mars

Timestamp:

02/19/05 14:30:46 (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

@@ -77 +77 @@
 #include "MHCalibrationChargePINDiode.h"
 #include "MHCalibrationRelTimeCam.h"
+#include "MHCalibrationPulseTimeCam.h"
 #include "MHCamera.h"
 
@@ -262 +263 @@
     MHCalibrationChargePINDiode hpndiod;
     MHCalibrationRelTimeCam     hrelcam;
+    MHCalibrationPulseTimeCam   hpulcam;
 
     MCalibrationChargeCam      calcam;
@@ -339 +341 @@
     plist.AddToList(&calibcont);       // Using AddToList(TObjArray *)
     plist.AddToList(&interlacedcont);  // Using AddToList(TObjArray *)
+    plist.AddToList(&hpulcam);
 
     // Setup Tasklist
@@ -519 +522 @@
     MFillH filtme("MHCalibrationRelTimeCam",     "MArrivalTimeCam",            "FillRelTime");
     MFillH filhil("MHCalibrationHiLoCam",        "MExtractedSignalCam",        "FillHiLoRatio");
+    MFillH filpul("MHCalibrationPulseTimeCam",   "MExtractedSignalCam",        "FillPulseTime");
 
     filpin.SetBit(MFillH::kDoNotDisplay);
@@ -525 +529 @@
     filtme.SetBit(MFillH::kDoNotDisplay);
     filhil.SetBit(MFillH::kDoNotDisplay);
+    filpul.SetBit(MFillH::kDoNotDisplay);
 
     MCalibrateRelTimes caltm;
@@ -546 +551 @@
     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]");
 
     evt0.EnableSqrtVariance();
@@ -555 +561 @@
     evt7.EnableSqrtVariance();
     evt8.EnableSqrtVariance();
-
-    MFillH fill0(&evt0, "MPedestalFundamental",       "FillPedFLG");
+    evt9.EnableSqrtVariance();
+
+    MFillH fill0(&evt0, "MPedestalFundamental",    "FillPedFLG");
     MFillH fill1(&evt1, "MPedestalFromExtractorRndm", "FillPedRmsFLG");
-    MFillH fill2(&evt2, "MExtractedSignalCam",        "FillExtracted");
-    // MFillH fill3(&evt3, "MPedPhotFundamental",     "FillPedPhot");
-    MFillH fill4(&evt4, "MPedPhotFromExtractorRndm",  "FillPedRMS");
-    MFillH fill5(&evt5, "MCerPhotEvt",                "FillInterpolated");
-    MFillH fill6(&evt6, "MBadPixelsCam",              "FillUnsuitable");
-    MFillH fill7(&evt7, "MArrivalTime",               "FillTimes");
-    MFillH fill8(&evt8, "MCalibConstCam",             "FillConv");
+    MFillH fill2(&evt2, "MExtractedSignalCam",     "FillExtracted");
+    // MFillH fill3(&evt3, "MPedPhotFundamental",  "FillPedPhot");
+    MFillH fill4(&evt4, "MPedPhotFromExtractorRndm", "FillPedRMS");
+    MFillH fill5(&evt5, "MCerPhotEvt",             "FillInterpolated");
+    MFillH fill6(&evt6, "MBadPixelsCam",           "FillUnsuitable");
+    MFillH fill7(&evt7, "MArrivalTime",            "FillTimes");
+    MFillH fill8(&evt8, "MCalibConstCam",          "FillConv");
+    MFillH fill9(&evt9, "MCalibrationPulseTimeCam","FillTestTime");
 
     MTaskEnv fillflorian("FinalFantasy");
@@ -671 +679 @@
     if (fIsHiLoCalibration)
       tlist2.AddToList(&filhil);
+    tlist2.AddToList(&filpul);
     tlist2.AddToList(&fill2);
     tlist2.AddToList(&calib);
@@ -685 +694 @@
     if (extractor2 || extractor1->InheritsFrom("MExtractTimeAndCharge"))
       tlist2.AddToList(&fill7);
+    tlist2.AddToList(&fill9);
 
     tlist2.AddToList(&fillflorian);