Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 8456)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 8457)
@@ -22,6 +22,7 @@
 
    * datacenter/scripts/runcallisto:
-     - modified the ccfile and cacofile search to not find ccfiles twice 
-       if one runnumber is part of a higher runnumber (as 23456 and 223456)
+     - modified the ccfile and cacofile search to not find ccfiles
+       twice if one runnumber is part of a higher runnumber (as 23456
+       and 223456)
 
 
@@ -77,5 +78,5 @@
        and time) it is ok.  
 
-   * mjobs/MJCalibration.cc:
+   * mjobs/MJCalibration.[h,cc]:
      - let MCalibrationRelTimeCalc run after MCalibrationChargeCalc
        otherwise almost all unsuitable pixels have deviating
@@ -103,4 +104,12 @@
    * resources/calibration_spline.rc:
      - added muon calibration factors up to period 55... to be corrected.
+
+   * mjobs/MJCut.[h,cc]:
+     - reanimated the use of an energy estimator in ganymed for the
+       purpose of having it as additional cut value if looking
+       for events after cuts
+
+   * ganymed.rc, ganymed_onoff.rc, ganymed_wobble.rc:
+     - added a corresponding example
 
 
Index: /trunk/MagicSoft/Mars/NEWS
===================================================================
--- /trunk/MagicSoft/Mars/NEWS	(revision 8456)
+++ /trunk/MagicSoft/Mars/NEWS	(revision 8457)
@@ -91,4 +91,16 @@
    - ganymed: Added a plot showing the source position in the camera also
      for wobble mode
+
+   - ganymed: In addition to the existing task which can be setup to
+     be executed after Cut1 a final task called "EstimateEnergy"
+     has been added, executed before writing the final output
+     (ganymed00000000.root). The task setup in all three cases
+     can be choosen individually. (For all three(!) cases you 
+     can for example choose MRanForestCalc. For examples see all
+     sponde*.rc and all ganymed*rc)
+
+   - ganymed: If a container "MEstimatedEnergy" is found in the 
+     parameter list (eg. because it was setup by MEstimateEnergy)
+     it will be written to the output file.