[boinc-app-seti] 01/03: Imported Upstream version 7.28~svn2408

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository boinc-app-seti.

commit e18d96a2052a593b55d6cdc6c70aa8e49c6fbf51
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sat Jun 28 15:19:39 2014 +0200

    Imported Upstream version 7.28~svn2408
---
 client/analyzeReport.cpp | 6 ------
 client/autocorr.cpp      | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/client/analyzeReport.cpp b/client/analyzeReport.cpp
index 524e53d..fada3e0 100644
--- a/client/analyzeReport.cpp
+++ b/client/analyzeReport.cpp
@@ -203,12 +203,6 @@ int result_autocorr(AUTOCORR_INFO &ai) {
   call_stack.enter("result_autocorr()");
 #endif 
 
-  //R: & JWS: sanity check for found result
-  if(ai.a.peak_power > 100.0){
-    boinc_temporary_exit(5*60,"Improbable Autocorr, retrying from checkpoint.");
-  }
-
-
   int retval=0;
 
   retval = outfile.printf("%s", ai.a.print_xml(0,0,1).c_str());
diff --git a/client/autocorr.cpp b/client/autocorr.cpp
index 1c3521a..d5bbb0b 100644
--- a/client/autocorr.cpp
+++ b/client/autocorr.cpp
@@ -116,6 +116,11 @@ int FindAutoCorrelation(
 
     m = k; 		// save the "lowest" highest.
 
+    //JWS: Sanity check, delayed peaks cannot be higher than the zero delay power.
+    if (temp > AutoCorrelation[0]) {
+      boinc_temporary_exit(5*60,"Impossible Autocorr power, retrying from checkpoint.");
+    }
+
     //  autocorr info
     ai.a.peak_power 	 = temp/MeanPower;
     ai.a.mean_power	 = 1.0;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc-app-seti.git