Changeset 6676 for trunk/MagicSoft

Timestamp:

02/25/05 16:19:13 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/02/24 Markus Gaug
+
+   * mjobs/MJCalibrateSignal.cc
+     - include display of pulse times (calculated in the post-process)
+
 
  2005/02/24 Thomas Hengstebeck

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -264 +264 @@
     MHCalibrationChargePINDiode hpndiod;
     MHCalibrationRelTimeCam     hrelcam;
-    MHCalibrationPulseTimeCam   hpulcam;
 
     MCalibrationChargeCam      calcam;
@@ -574 +573 @@
     MFillH fill7(&evt7, "MArrivalTime",            "FillTimes");
     MFillH fill8(&evt8, "MCalibConstCam",          "FillConv");
-    MFillH fill9(&evt9, "MCalibrationPulseTimeCam","FillTestTime");
+    MFillH fill9(&evt9, "MCalibrationPulseTimeCam","FillPulseTime");
 
     MTaskEnv fillflorian("FinalFantasy");
@@ -768 +767 @@
         return;
 
-    if (!fIsHiLoCalibration)
-      return;
-
     //
     // Get container from list
     //
-    MGeomCam        &geomcam = *(MGeomCam*)plist.FindObject("MGeomCam");
-    MCalibrationHiLoCam *cam = (MCalibrationHiLoCam*)plist.FindObject("MCalibrationHiLoCam");
+    MGeomCam        &geomcam       = *(MGeomCam*)plist.FindObject("MGeomCam");
+    MCalibrationPulseTimeCam *pcam = (MCalibrationPulseTimeCam*)plist.FindObject("MCalibrationPulseTimeCam");
+
+    MHCamera disp11 (geomcam, "PulseTime", "Mean pulse arrival time cosmics");
+    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);
+
+    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 (!fIsHiLoCalibration)
+      return;
+
+    MCalibrationHiLoCam *hcam      = (MCalibrationHiLoCam*)plist.FindObject("MCalibrationHiLoCam");
 
     // Create histograms to display
@@ -781 +800 @@
     MHCamera disp2 (geomcam, "HiLoDiff", "Arrival Time Diff. HiGain vs. LoGain (Times)");
 
-    disp1.SetCamContent(*cam,  0);
-    disp1.SetCamError(  *cam,  1);
-    disp2.SetCamContent(*cam,  5);
-    disp2.SetCamError(  *cam,  6);
+    disp1.SetCamContent(*hcam,  0);
+    disp1.SetCamError(  *hcam,  1);
+    disp2.SetCamContent(*hcam,  5);
+    disp2.SetCamError(  *hcam,  6);
 
     disp1.SetYTitle("R [1]");