Changeset 6731

Timestamp:

03/03/05 22:24:52 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• callisto.cc (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -37 +37 @@
        ware meeting.
    
+   * mjobs/MJCalibrateSignal.cc
+     - updated pulse pos. calculator, can be switched off now.
+
    * mjobs/MJCalib.[h,cc]
      - added flag fPulsePosCheck

trunk/MagicSoft/Mars/callisto.cc

@@ -507 +507 @@
         job2.SetPathIn(kInpathY);
         job2.SetDataType(kDataType);
+        job2.SetPulsePosCheck();
         // job1.SetPathOut(kOutpathC); // not yet needed
         // job1.SetPathIn(kInpathC);   // not yet needed

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -122 +122 @@
 // - fIsRelTimesUpdate to kFALSE
 // - fIsHiLoCalibration to kFALSE
+// - fPulsePosCheck to kTRUE
 //
 MJCalibrateSignal::MJCalibrateSignal(const char *name, const char *title)
@@ -129 +130 @@
     fTitle = title ? title : "Tool to calibrate data";
 
+    fPulsePosCheck = kTRUE;
     //fCruns = NULL;
 }
@@ -549 +551 @@
     MFillH filtme("MHCalibrationRelTimeCam",     "MArrivalTimeCam",            "FillRelTime");
     MFillH filhil("MHCalibrationHiLoCam",        "MExtractedSignalCam",        "FillHiLoRatio");
-    MFillH filpul("MHCalibrationPulseTimeCam",   "MExtractedSignalCam",        "FillPulseTime");
+    MFillH filpul("MHCalibrationPulseTimeCam",   "MRawEvtData",                "FillPulseTime");
 
     filpin.SetBit(MFillH::kDoNotDisplay);
@@ -703 +705 @@
     if (fIsHiLoCalibration)
       tlist2.AddToList(&filhil);
-    tlist2.AddToList(&filpul);
+    if (fPulsePosCheck)
+      tlist2.AddToList(&filpul);
     tlist2.AddToList(&fill2);
     tlist2.AddToList(&calib);
@@ -774 +777 @@
     if (fPixelCheck)
       {
-        MHCalibrationPulseTimeCam *pcam = (MHCalibrationPulseTimeCam*)plist.FindObject("MHCalibrationPulseTimeCam");
-        MHCalibrationPix &pix1 = (*pcam)[fCheckedPixId];
-        pix1.DrawClone("");
-        
+        if (fPulsePosCheck)
+          {
+            MHCalibrationPulseTimeCam *pcam = (MHCalibrationPulseTimeCam*)plist.FindObject("MHCalibrationPulseTimeCam");
+            MHCalibrationPix &pix1 = (*pcam)[fCheckedPixId];
+            pix1.DrawClone("");
+          }
+        
         if (fIsHiLoCalibration)
           {
@@ -828 +834 @@
     MHCamera disp21 (geomcam, "PulseTimeRMS", "RMS of pulse arrival time cosmics");
 
-    disp11.SetCamContent(*pcam,  0);
-    disp11.SetCamError(  *pcam,  1);
-    disp21.SetCamContent(*pcam,  2);
-    disp21.SetCamError(  *pcam,  3);
-
+    if (pcam)
+      {
+        disp11.SetCamContent(*pcam,  0);
+        disp11.SetCamError(  *pcam,  1);
+        disp21.SetCamContent(*pcam,  2);
+        disp21.SetCamError(  *pcam,  3);
+      }
+    
     disp11.SetYTitle("T [FADC sl.]");
     disp21.SetYTitle("T [FADC sl.]");
 
-    TCanvas &c0 = fDisplay->AddTab("PulseTime");
-    c0.Divide(2,3);
-    
-    disp11.CamDraw(c0, 1, 2, 1);
-    disp21.CamDraw(c0, 2, 2, 1);
-
+    if (fPulsePosCheck)
+      {
+        TCanvas &c0 = fDisplay->AddTab("PulseTime");
+        c0.Divide(2,3);
+        
+        disp11.CamDraw(c0, 1, 2, 1);
+        disp21.CamDraw(c0, 2, 2, 1);
+      }
 
     if (!fIsHiLoCalibration)