Changeset 3012 for trunk/MagicSoft/Mars/macros

Timestamp:

02/03/04 20:14:48 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/macros/calibration.C (modified) (10 diffs)

trunk/MagicSoft/Mars/macros/calibration.C

@@ -50 +50 @@
     read.DisableAutoScheme();
 
-    MGeomApply     geomapl;
-    MExtractSignal sigcalc;
+    MGeomApply      geomapl;
+    MExtractSignal2 sigcalc;
     //
     // We saw that the signal jumps between slices, 
@@ -57 +57 @@
     // Sliding window will be implemented asap.
     //          
-    sigcalc.SetRange(1,14,1,14);
+    //    sigcalc.SetRange(1,14,1,14);
 
     MPedCalcPedRun pedcalc;
-    pedcalc.SetUseHists();
+    //    MFillH fill("MPedestalCam", "MExtractedSignalCam");
 
     tlist.AddToList(&read);
@@ -66 +66 @@
     tlist.AddToList(&sigcalc);
     tlist.AddToList(&pedcalc);
+    //    tlist.AddToList(&fill);
 
     MGeomCamMagic  geomcam;
@@ -105 +106 @@
     MHCamera dispped12  (geomcam, "MPedestalPix;DeltaRmsSigma", "Rel. Diff. RMS per Slice (Calc.-Fitted)");
     MHCamera dispped14  (geomcam, "MPedestalPix;DeltaRmsSigmaError", "Rel. Diff. RMS Error per Slice (Calc.-Fitted)");
-
     dispped0.SetCamContent(pedcam, 0);
     dispped0.SetCamError(pedcam, 1);
@@ -215 +215 @@
     // faster results
     // 
-    //    timecalc.SetStepSize(0.02);
+    timecalc.SetStepSize(0.05);
 
     //
@@ -305 +305 @@
                       "Conversion Factor (Blind Pixel Method)");
     MHCamera disp16  (geomcam, "MCalibrationPix;RSigma/Charge", "Reduced Sigma per Charge");
+    MHCamera disp17  (geomcam, "MCalibrationPix;AbsTimeMean", "Abs. Arrival Times");
+    MHCamera disp18  (geomcam, "MCalibrationPix;AbsTimeRms", "RMS of Arrival Times");
 
     disp1.SetCamContent(calcam, 0);
@@ -335 +337 @@
     disp16.SetCamContent(calcam, 17);
 
+    disp17.SetCamContent(calcam, 18);
+    disp17.SetCamError(calcam, 19);
+    disp18.SetCamContent(calcam, 20);
+    disp18.SetCamError(calcam, 21);
 
     disp1.SetYTitle("Charge [FADC counts]");
     disp3.SetYTitle("\\sigma_{Charge} [FADC counts]");
     disp5.SetYTitle("P_{Charge} [1]");
-    disp6.SetYTitle("Arr. Time [ns]");
+    disp6.SetYTitle("Rel. Arr. Time [ns]");
     disp7.SetYTitle("\\sigma_{Time} [ns]");
     disp8.SetYTitle("P_{Time} [1]");
@@ -350 +356 @@
     disp15.SetYTitle("Conversion Factor [Phot/FADC Count]");
     disp16.SetYTitle("Reduced Sigma / Charge [1]");
+    disp17.SetYTitle("Mean Abs. Time [FADC slice]");
+    disp18.SetYTitle("RMS Abs. Time [FADC slices]");
 
     MStatusDisplay *d3 = new MStatusDisplay;
@@ -371 +379 @@
     CamDraw(c2,disp5,calcam,1,1,3);
 
-    // Times
+    // Rel. Times
     TCanvas &c3 = d3->AddTab("Fitted Rel. Times");
     c3.Divide(3,3);
@@ -378 +386 @@
     CamDraw(c3,disp7,calcam,2,3,1);
     CamDraw(c3,disp8,calcam,3,3,0);
+
+    // Abs. Times
+    TCanvas &c35 = d3->AddTab("Abs. Times");
+    c35.Divide(2,3);
+
+    CamDraw(c35,disp17,calcam,1,2,1);
+    CamDraw(c35,disp18,calcam,2,2,1);
 
     // Pedestals