Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 7028)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 7029)
@@ -25,4 +25,12 @@
    * mreport/MReportCC.cc:
      - fixed reading of rep-files for versions newer than V200404070 
+
+   * mpointing/MSrcPosCalc.cc
+     - took a bugfix from Wolfgang to Loc0LocToCam and implemented it
+       Wolfgang: the results are changed only minimally
+
+   * msignal/MExtractTimeAndChargeSpline.cc
+     - integration ranges were shifted by 0.2 FADC slices to the right. 
+       Fixed in the new algorithm according to Markus' change.
 
 
Index: /trunk/MagicSoft/Mars/NEWS
===================================================================
--- /trunk/MagicSoft/Mars/NEWS	(revision 7028)
+++ /trunk/MagicSoft/Mars/NEWS	(revision 7029)
@@ -45,8 +45,4 @@
      the setter functions of MSeqeunce instead)
 
-   - fixed a bug in MExtractTimeAndchargeSpline which could cause
-     different results with different compiler optimiztaion options
-     due to rounding errors.
-
    - MEventRateCalc handles the calculation of the event rate more
      accurate now in case of the start of a new run inside a sequence
@@ -63,5 +59,5 @@
        can be canged
 
-   - improved sholog such that it handles different verbosity levels
+   - improved showlog such that it handles different verbosity levels
      more accurate now. This mean you can suppress output when
      using showlog.
@@ -83,7 +79,12 @@
      kFluctuatingArrivalTimes
 
-   - the calibration now does a consistency check of the arrival time
-
    - the charge timit in the calibration has been raised from 2.5 to 4.5
+
+   - fixed reading of CC-REPORTS (weather data) for Arehucas file versions
+     newer than V200404070 
+
+   - a bug in MSrcPosCalc has been fixed (The changes were taken from
+     a bugfix of Wolfgang to Loc0LocToCam; Wolfgang: the results are
+     changed only minimally
 
    - callisto: new setup read from callisto.rc
@@ -92,6 +93,19 @@
      + MHCalibrationChargeCam.NumLoGainSaturationLimit
 
-   - fixed reading of CC-REPORTS (weather data) for Arehucas file versions
-     newer than V200404070 
+   - callisto: MExtractTimeAndChargeSpline extractor:
+     + The integration ranges were shifted by 0.2 FADC slices to the right. 
+     + unreliable handling of floating point values caused different
+       results on different platform or with different compiler options
+
+   - callisto: set new defaults in MExtractTimeAndChargeDigitalFilter:
+     + extraction range in the high gain to 4.
+     + weights file to cosmics_weights46.dat
+
+   - callisto:
+     + introduce the check for fluctuating arrival times.
+     + set charge limit to from 2.5 to 4.5
+     + introduce asymmetric exclusion due to "deviating number of phes":
+       Default: -9.0 +4.5
+     + make deviating number of phes unsuitable (see David's findings).
 
 
Index: /trunk/MagicSoft/Mars/mjobs/MJPedestal.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJPedestal.cc	(revision 7028)
+++ /trunk/MagicSoft/Mars/mjobs/MJPedestal.cc	(revision 7029)
@@ -987,5 +987,5 @@
               {
                   const MExtractTimeAndCharge &e = *static_cast<MExtractTimeAndCharge*>(fExtractor);
-                  hpedcam.SetFitStart(-5*e->GetWindowSizeHiGain());
+                  hpedcam.SetFitStart(-5*e.GetWindowSizeHiGain());
               }
               else
Index: /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc
===================================================================
--- /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc	(revision 7028)
+++ /trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc	(revision 7029)
@@ -1072,6 +1072,8 @@
     const Int_t n = TMath::Nint((last-start)/step);
 
+    start += step/2;
+
     sum = 0.;
-    for (Int_t i=1; i<=n+1; i++)
+    for (Int_t i=0; i<=n; i++)
     {
         const Float_t x = start+i*step;
@@ -1112,6 +1114,8 @@
     const Int_t n = TMath::Nint((last-start)/step);
 
+    start += step/2;
+
     sum = 0.;
-    for (Int_t i=1; i<=n+1; i++)
+    for (Int_t i=0; i<=n; i++)
     {
         const Float_t x = start+i*step;