Index: trunk/MagicSoft/Mars/NEWS
===================================================================
--- trunk/MagicSoft/Mars/NEWS	(revision 7830)
+++ trunk/MagicSoft/Mars/NEWS	(revision 7831)
@@ -37,12 +37,8 @@
 
    - callisto: Implemented two new tabs, the pulse position of pulses
-     not saturating the hi-gain (and above 20phe) and the pulse-position
+     not saturating the hi-gain (and above 15phe) and the pulse-position
      saturating the hi-gain (means the pulse position of signal extracted
      from the lo-gain) This can be used to check (and/or correct) the
      hi-/lo-gain offset.
-
-   - callisto: The signal threshold for the pulse position has been
-     changed from 15phe to 20phe and the scaling of the outer pixels has
-     been switched off. 
 
    - star: changed the fit for the ffective on time such that initial
Index: trunk/MagicSoft/Mars/msignal/MSignalCam.cc
===================================================================
--- trunk/MagicSoft/Mars/msignal/MSignalCam.cc	(revision 7830)
+++ trunk/MagicSoft/Mars/msignal/MSignalCam.cc	(revision 7831)
@@ -647,5 +647,5 @@
         // otherwise to many large pixels survive (maybe because the
         // fluctuations scale different than expected)
-        if (pix->IsPixelUnmapped() || pix->GetNumPhotons()<20)
+        if (pix->IsPixelUnmapped() || pix->GetNumPhotons()*ratio<15)
             return kFALSE;
         val = pix->GetArrivalTime();
@@ -663,13 +663,10 @@
 
     case 11: // hi gain time
-        if (pix->IsPixelUnmapped() || pix->IsLoGainUsed())
-            return kFALSE;
-
         // The number of photons is not scaled with the ratio because
         // otherwise to many large pixels survive (maybe because the
         // fluctuations scale different than expected)
-        if (pix->GetNumPhotons()<20)
+        if (pix->IsPixelUnmapped() || pix->IsLoGainUsed() ||
+            pix->GetNumPhotons()*ratio<15)
             return kFALSE;
-
         val = pix->GetArrivalTime();
         return kTRUE;