Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 7189)
+++ trunk/MagicSoft/Mars/Changelog	(revision 7190)
@@ -26,5 +26,23 @@
 
    * mcalib/MCalibrationChargeCalc.cc:
-      simplified FinalizeUnsuitablePixels()
+     - simplified FinalizeUnsuitablePixels()
+
+   * mcalib/MCalibCalcFromPast.cc:
+     - when finalizing of unsuitable pixels fails return kERROR in
+       Process
+
+   * mcalib/MCalibrationRelTimeCalc.cc:
+     - simplified counting unreliable pixels
+
+   * mfilter/MFMagicCuts.[h,cc]:
+     - replaced the m3long cut. m3long now is used to determin which
+       origin might be the correct impact of the shower. This gives
+       not so steep theta plots and the 2D plot can be done at the
+       same time.
+     - The sign of Disp stored in the paremeter list is now correctly
+       aligned along the major axis of the shower. >0 for along major
+       axis, <0 otherwise.
+     - comment have been updated.
+     - some old code had been removed
 
 
Index: trunk/MagicSoft/Mars/NEWS
===================================================================
--- trunk/MagicSoft/Mars/NEWS	(revision 7189)
+++ trunk/MagicSoft/Mars/NEWS	(revision 7190)
@@ -103,4 +103,9 @@
      The result for the sigma of the gauss(sqrt(x)) fit was a factor
      sqrt(2) to large
+
+   - ganymed: The intercalibration is now done using a full f-factor
+     method instead of a simple update. This makes things slower but
+     more reliable in terms of gain-fluctuations and sudden VCSEL gain
+     changes.
 
    - sponde: the zenith angle distribution is now weighted instead of
Index: trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc	(revision 7189)
+++ trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc	(revision 7190)
@@ -288,5 +288,7 @@
   if (fChargeCalc)
     {
-      fChargeCalc->Finalize();
+      if (!fChargeCalc->Finalize())
+          return kERROR;
+
       if (fUpdateNumPhes)
         {
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 7189)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 7190)
@@ -2238,6 +2238,4 @@
   }
 
-  return kTRUE;
-
   if (unsuitcnt > fUnsuitablesLimit*fGeom->GetNumPixels())
   {