Index: trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- trunk/MagicSoft/Mars/macros/calibration.C	(revision 5710)
+++ trunk/MagicSoft/Mars/macros/calibration.C	(revision 5711)
@@ -411,40 +411,45 @@
     gLog << "           with the following parameters, if 'maxbin' defines the mean position" << endl;
     gLog << "           of the High-Gain FADC slice carrying the pulse maximum: " << endl;
-    gLog << "     1:           SetRange('maxbin'-1,'maxbin'+2,'maxbin'+0.5,'maxbin'+3.5) " << endl;
-    gLog << "     2:           SetRange('maxbin'-1,'maxbin'+2,'maxbin'-0.5,'maxbin'+4.5)" << endl;
-    gLog << "     3:           SetRange('maxbin'-2,'maxbin'+3,'maxbin'-0.5,'maxbin'+4.5)" << endl;
-    gLog << "     4:           SetRange('maxbin'-3,'maxbin'+4,'maxbin'-1.5,'maxbin'+5.5)" << endl;
-    gLog << "     5:           SetRange('maxbin'-5,'maxbin'+8,'maxbin'-1.5,'maxbin'+7.5)" << endl;
+    gLog << "     1:           SetRange(4,7,6,9) " << endl;
+    gLog << "     2:           SetRange(4,7,5,10)" << endl;
+    gLog << "     3:           SetRange(3,8,5,10)" << endl;
+    gLog << "     4:           SetRange(2,9,4,11)" << endl;
+    gLog << "     5:           SetRange(0,13,4,13)" << endl;
     gLog << "       MExtractFixedWindowSpline: " << endl;
-    gLog << "     6:           SetRange('maxbin'-1,'maxbin'+2,'maxbin'+0.5,'maxbin'+3.5)" << endl;
-    gLog << "     7:           SetRange('maxbin'-1,'maxbin'+2,'maxbin'-0.5,'maxbin'+4.5)" << endl;
-    gLog << "     8:           SetRange('maxbin'-2,'maxbin'+3,'maxbin'-0.5,'maxbin'+4.5)" << endl;
-    gLog << "     9:           SetRange('maxbin'-3,'maxbin'+4,'maxbin'-1.5,'maxbin'+5.5)" << endl;
-    gLog << "     10:          SetRange('maxbin'-5,'maxbin'+8,'maxbin'-1.5,'maxbin'+7.5)" << endl;
+    gLog << "     6:           SetRange(3,7,5,9)" << endl;
+    gLog << "     7:           SetRange(3,7,5,11)" << endl;
+    gLog << "     8:           SetRange(3,9,5,11)" << endl;
+    gLog << "     9:           SetRange(2,10,4,12)" << endl;
+    gLog << "     10:          SetRange(0,14,4,14)" << endl;
     gLog << "       MExtractFixedWindowPeakSearch: " << endl;
     gLog << "                  SetRange(0,18,2,14) and the following parameters:" << endl;
     gLog << "     11:          SetWindows(2,2,2)" << endl;
+    gLog << "                  SetOffsetFromWindow(0)" << endl;
     gLog << "     12:          SetWindows(4,4,2)" << endl;
-    gLog << "     13:          SetWindows(6,6,4)" << endl;
-    gLog << "     14:          SetWindows(4,6,4)" << endl;
+    gLog << "                  SetOffsetFromWindow(1)" << endl;
+    gLog << "     13:          SetWindows(4,6,4)" << endl;
+    gLog << "                  SetOffsetFromWindow(0)" << endl;
+    gLog << "     14:          SetWindows(6,6,4)" << endl;
+    gLog << "                  SetOffsetFromWindow(1)" << endl;
     gLog << "     15:          SetWindows(8,8,4)" << endl;
+    gLog << "                  SetOffsetFromWindow(1)" << endl;
     gLog << "     16:          SetWindows(14,10,4)" << endl;
+    gLog << "                  SetOffsetFromWindow(2)" << endl;
     gLog << "      MExtractTimeAndChargeSlidingWindow:" << endl;
     gLog << "                  SetRange(0,18,2,14) and the following parameters:" << endl;
     gLog << "     17:          SetWindowSize(2,2)" << endl;
     gLog << "     18:          SetWindowSize(4,4)" << endl;
-    gLog << "     19:          SetWindowSize(6,6)" << endl;
-    gLog << "     20:          SetWindowSize(4,6)" << endl;
+    gLog << "     19:          SetWindowSize(4,6)" << endl;
+    gLog << "     20:          SetWindowSize(6,6)" << endl;
     gLog << "     21:          SetWindowSize(8,8)" << endl;
     gLog << "     22:          SetWindowSize(14,10)" << endl;
     gLog << "      MExtractTimeAndChargeSpline: " << endl; 
-    gLog << "                  SetChargeType(MExtractTimeAndChargeSpline::kIntegral) and:" << endl;
-    gLog << "                  SetRange(0,18,2,14) and the following parameters:" << endl; 
-    gLog << "     23:          SetRiseTime(1.5); SetFallTime(4.5)" << endl;
-    gLog << "     24:          SetRiseTime(0.5); SetFallTime(2.5)" << endl;
+    gLog << "     23:          SetChargeType(MExtractTimeAndChargeSpline::kAmplitude) and:" << endl;
+    gLog << "                  SetRange(0,13,2,13) " << endl; 
+    gLog << "     24:          SetChargeType(MExtractTimeAndChargeSpline::kIntegral) and:" << endl;
+    gLog << "                  SetRiseTime(0.5); SetFallTime(0.5)" << endl;
     gLog << "     25:          SetRiseTime(0.5); SetFallTime(1.5)" << endl;
-    gLog << "     26:          SetRiseTime(0.5); SetFallTime(0.5)" << endl;
-    gLog << "     27:          SetChargeType(MExtractTimeAndChargeSpline::kAmplitude" << endl;
-    gLog << "                  SetRange(0,10,4,11)" << endl; 
+    gLog << "     26:          SetRiseTime(1.0); SetFallTime(3.0)" << endl;
+    gLog << "     27           SetRiseTime(1.5); SetFallTime(4.5)" << endl;
     gLog << "      MExtractTimeAndChargeDigitalFilter" << endl;
     gLog << "                  SetRange(0,18,2,14) and the following parameters:" << endl;