Index: trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- trunk/MagicSoft/Mars/macros/calibration.C	(revision 2983)
+++ trunk/MagicSoft/Mars/macros/calibration.C	(revision 3007)
@@ -24,5 +24,5 @@
 
 const TString pedfile = "/mnt/Data/rootdata/CrabNebula/2004_01_27/20040126_12149_P_Cab-On_E.root";
-const TString calfile = "/mnt/Data/rootdata/CrabNebula/2004_01_27/20040126_1252*_C_Cab-On_E.root";
+const TString calfile = "/mnt/Data/rootdata/CrabNebula/2004_01_27/20040126_12525_C_Cab-On_E.root";
 
 //const TString pedfile = "/mnt/Data/rootdata/Miscellaneous/2003_12_19/20031218_03522_P_Park_E.root";
@@ -52,5 +52,11 @@
     MGeomApply     geomapl;
     MExtractSignal sigcalc;
+    //
+    // We saw that the signal jumps between slices, 
+    // thus set the extraction range as high as possible
+    // Sliding window will be implemented asap.
+    //		
     sigcalc.SetRange(1,14,1,14);
+
     MPedCalcPedRun pedcalc;
     pedcalc.SetUseHists();
@@ -209,5 +215,5 @@
     // faster results
     // 
-    timecalc.SetStepSize(0.5);
+    //    timecalc.SetStepSize(0.02);
 
     //
@@ -246,5 +252,5 @@
     //
     MCalibrationBlindPix *bp = calcam.GetBlindPixel();
-    //    bp->ChangeFitFunc(MHCalibrationBlindPixel::kEPolya);
+//    bp->ChangeFitFunc(MHCalibrationBlindPixel::kEPolya);
     //    bp->ChangeFitFunc(MHCalibrationBlindPixel::kEPoisson4);
 
@@ -285,7 +291,7 @@
     MHCamera disp3   (geomcam, "MCalibrationPix;SigmaCharge", "Sigma of Fitted Charges");
     MHCamera disp5   (geomcam, "MCalibrationPix;ChargeProb", "Probability of Fit");
-    MHCamera disp6   (geomcam, "MCalibrationPix;Time", "Arrival Times");
-    MHCamera disp7   (geomcam, "MCalibrationPix;SigmaTime", "Sigma of Arrival Times");
-    MHCamera disp8   (geomcam, "MCalibrationPix;TimeChiSquare", "Chi Square of Time Fit");
+    MHCamera disp6   (geomcam, "MCalibrationPix;Time", "Rel. Arrival Times");
+    MHCamera disp7   (geomcam, "MCalibrationPix;SigmaTime", "Sigma of Rel. Arrival Times");
+    MHCamera disp8   (geomcam, "MCalibrationPix;TimeProb", "Probability of Time Fit");
     MHCamera disp9   (geomcam, "MCalibrationPix;Ped", "Pedestals");
     MHCamera disp10  (geomcam, "MCalibrationPix;PedRms", "Pedestal RMS");
@@ -333,7 +339,7 @@
     disp3.SetYTitle("\\sigma_{Charge} [FADC counts]");
     disp5.SetYTitle("P_{Charge} [1]");
-    disp6.SetYTitle("Arr. Time [Time Slice Nr.]");
-    disp7.SetYTitle("\\sigma_{Time} [Time Slices]");
-    disp8.SetYTitle("\\chi^{2}_{Time} [1]");
+    disp6.SetYTitle("Arr. Time [ns]");
+    disp7.SetYTitle("\\sigma_{Time} [ns]");
+    disp8.SetYTitle("P_{Time} [1]");
     disp9.SetYTitle("Ped [FADC Counts ]");
     disp10.SetYTitle("RMS_{Ped} [FADC Counts ]");
@@ -366,9 +372,9 @@
 
     // Times
-    TCanvas &c3 = d3->AddTab("Fitted Times");
+    TCanvas &c3 = d3->AddTab("Fitted Rel. Times");
     c3.Divide(3,3);
 
     CamDraw(c3,disp6,calcam,1,3,1);
-    CamDraw(c3,disp7,calcam,2,3,0);
+    CamDraw(c3,disp7,calcam,2,3,1);
     CamDraw(c3,disp8,calcam,3,3,0);