Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 7844)
+++ trunk/MagicSoft/Mars/Changelog	(revision 7845)
@@ -68,4 +68,8 @@
      - adapted handling of sat in hi-gain extraction to changes
        above
+
+   * mjobs/MJCalibrateSignal.cc:
+     - replaced the hi-/lo-gain pulse plots by plots showing the
+       hi-/lo-gain intercalibration and the hi-/lo-gain offset
 
 
Index: trunk/MagicSoft/Mars/NEWS
===================================================================
--- trunk/MagicSoft/Mars/NEWS	(revision 7844)
+++ trunk/MagicSoft/Mars/NEWS	(revision 7845)
@@ -26,7 +26,15 @@
    - callisto: Updated absolute calibration constants (muon calibration)
 
+   - callisto: fixed a bug which caused the hi-gain saturation not
+     to be handled properly
+
+   - callisto fixed a bug which gave weird results if hi- and lo-gain
+     could not be extracted properly
+
    - callisto: Fixed a bug regarding the use of the QE which doesn't
      effect the result because the default is used anyhow.
      (The bug was there since 14/07/2005)
+
+   - callisto: Changed the default for fgLoGainStartShift
 
    - callisto: Fixed a bug which caused all hi-/lo-gain calibration
@@ -38,9 +46,14 @@
      mainly for timing studies, not for the automatic standard analysis.
 
-   - callisto: Implemented two new tabs, the pulse position of pulses
-     not saturating the hi-gain (and above 50phe) and the pulse-position
-     saturating the hi-gain (means the pulse position of signal extracted
-     from the lo-gain and above 320phe) This can be used to check (and/or
-     correct) the hi-/lo-gain offset.
+   - callisto: Now tab "HiLoCal" which shows the ratio between hi- and
+     lo-gain pulse for data pulses if hi- and lo-gain have saturated
+     and both were extracted because the hi-gain was above the 
+     LoGainSwitch.
+
+   - callisto: Now tab "HiLoOff" which shows the offset between hi- and
+     lo-gain pulse position (after application of LoGainOffset, which
+     means in the ideal case it is 0) for data pulses if hi- and lo-gain
+     have saturated and both were extracted because the hi-gain was above
+     the LoGainSwitch.
 
    - callisto: After extensive tests a new threshold level for determination
@@ -50,5 +63,5 @@
      range and starts sticking to non-floating point numbers (5, 6, 7, ...)
 
-   - star: changed the fit for the ffective on time such that initial
+   - star: changed the fit for the effective on time such that initial
      values are calculated automatically now instead of using build
      in values. This makes the fit more indepedant of the underlaying
Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 7844)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 7845)
@@ -581,7 +581,9 @@
     MHCamEvent evt7(  6, "Times",      "Calibrated Arrival Time;;T [fadc sl]");
     MHCamEvent evt8(  0, "Conv",       "Calibration Conv. Factors;;[phe/fadc cnts]");
-    MHCamEvent evt9(  7, "PulsePos",   "Pulse Position of cosmics (>15phe);;T");
-    MHCamEvent evtH( 11, "PulseHi",    "Pulse Position of Hi-Gain;;T");
-    MHCamEvent evtL( 10, "PulseLo",    "Pulse Position of Lo-Gain;;T");
+    MHCamEvent evt9(  7, "PulsePos",   "Pulse Position of cosmics (>20phe);;T");
+    //MHCamEvent evtH( 11, "PulseHi",    "Pulse Position of Hi-Gain;;T");
+    //MHCamEvent evtL( 10, "PulseLo",    "Pulse Position of Lo-Gain;;T");
+    MHCamEvent evtR(  4, "HiLoCal",    "Hi-Lo Gain ratio;;");
+    MHCamEvent evtO(  7, "HiLoOff",    "Hi-Lo Offset;;");
     evt6.SetThreshold();
 
@@ -596,6 +598,8 @@
     MFillH fill8(&evt8, "MCalibrationIntensityConstCam", "FillConv");
     MFillH fill9(&evt9, "MSignalCam",                    "FillPulse");
-    MFillH fillH(&evtH, "MSignalCam",                    "FillPulseHi");
-    MFillH fillL(&evtL, "MSignalCam",                    "FillPulseLo");
+    //MFillH fillH(&evtH, "MSignalCam",                    "FillPulseHi");
+    //MFillH fillL(&evtL, "MSignalCam",                    "FillPulseLo");
+    MFillH fillR(&evtR, "MExtractedSignalCam",           "FillHiLoCal");
+    MFillH fillO(&evtO, "MArrivalTimeCam",               "FillHiLoOff");
 
     MTaskEnv fillflorian("FinalFantasy");
@@ -726,5 +730,7 @@
     tlist2.AddToList(&fill9);
     tlist2.AddToList(&fillH);
-    tlist2.AddToList(&fillL);
+    //tlist2.AddToList(&fillL);
+    //tlist2.AddToList(&fillR);
+    tlist2.AddToList(&fillO);
 
     tlist2.AddToList(&fillflorian);