From aa2e6cead0eaa65632cb59e8c7164afb499bc485 Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Fri, 29 Jun 2012 13:54:12 +0000
Subject: [PATCH] changed timeout handling for musrfit

---
 ChangeLog       |  1 +
 src/musrfit.cpp | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b19022c..7173bbc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@ NEW 2012-04-24 added a first version for negative muon fitting. At the same
 	       logx/logy handling).
 FIXED 2012-05-30 fixed RRF  bug in single histo plotting.
 FIXED 2012-05-18 fixed wrong forward/backward tag for ROOT-PPC (MUSR-215) 
+CHANGED 2012-06-29 changed handling of the timeout for musrfit.
 CHANGED 2012-05-10 prevent any2many from overwriting an input file. At the
    some additional bug fixing of any2many has be carried out.
 CHANGED 2012-05-08 updating docu
diff --git a/src/musrfit.cpp b/src/musrfit.cpp
index c7d15b50..8bfcf353 100644
--- a/src/musrfit.cpp
+++ b/src/musrfit.cpp
@@ -107,7 +107,7 @@ void musrfit_syntax()
   cout << endl << "       --dump <type> is writing a data file with the fit data and the theory";
   cout << endl << "              <type> can be 'ascii', 'root'";
   cout << endl << "       --timeout <timeout_tag>: overwrites to predefined timeout of " << timeout << " (sec).";
-  cout << endl << "              <timeout_tag> = 'none' means timeout facility is not enabled. <timeout_tag> = nn";
+  cout << endl << "              <timeout_tag> <= 0 means timeout facility is not enabled. <timeout_tag> = nn";
   cout << endl << "              will set the timeout to nn (sec).";
   cout << endl;
   cout << endl << "       At the end of a fit, musrfit writes the fit results into an <mlog-file> and";
@@ -437,16 +437,16 @@ int main(int argc, char *argv[])
       }
     } else if (!strcmp(argv[i], "--timeout")) {
       if (i<argc-1) {
-        if (!strcmp(argv[i+1], "none")) {
-          timeout_enabled = false;
-        } else {
-          TString str(argv[i+1]);
-          if (str.IsDigit()) {
-            timeout = str.Atoi();
-          } else {
-            show_syntax = true;
-            break;
+        TString str(argv[i+1]);
+        if (str.IsFloat()) {
+          timeout = str.Atoi();
+          if (timeout <= 0) {
+            timeout_enabled = false;
+            cout << endl << ">> musrfit: timeout disabled." << endl;
           }
+        } else {
+          show_syntax = true;
+          break;
         }
         i++;
       } else {