Changeset 8293 for trunk/MagicSoft/Mars/msignal

Timestamp:

02/03/07 14:17:41 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndCharge.cc,v 1.59 2006-11-02 17:44:09 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndCharge.cc,v 1.60 2007-02-03 14:16:12 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -176 +176 @@
     if (sat0<=0)
         return 0;
+    if (sat0==1)
+        return sig[0]>maxcont/2 ? 0 : 0.5;
+
+    if (sig[p]>sig[p+1] || sig[p+1]>sig[p+2])
+        return sat[p+1]>maxcont/2 ? sat0-1 : sat0-0.5;
 
     // Find the place at which the signal is maxcont/2