LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

changed timeout handling for musrfit

Browse Source
This commit is contained in:
suter_a 2012-06-29 13:54:12 +00:00
parent 2ce287ec3e
commit aa2e6cead0
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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

20
src/musrfit.cpp
View File

@ -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 {