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

Fix of a problem in msr2data introduced earlier today

Browse Source
This commit is contained in:
Bastian M. Wojek 2011-01-22 16:00:51 +00:00
parent c17f67bdb0
commit 20f61a8c2c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/msr2data.cpp
View File

@ -297,25 +297,25 @@ int msr2data_doFitting(vector<string> &arg, bool &chainfit)
* *
* <b>return:</b> * <b>return:</b>
* - template run number, or * - template run number, or
* - 0 if the string after 'msr-' is not a number * - -3 if the string after 'msr-' is not a number
* *
* \param arg list of arguments * \param arg list of arguments
* \param inputOnly flag, if true create msr-files only (no fitting) * \param inputOnly flag, if true create msr-files only (no fitting)
*/ */
unsigned int msr2data_doInputCreation(vector<string> &arg, bool &inputOnly) int msr2data_doInputCreation(vector<string> &arg, bool &inputOnly)
{ {
unsigned int temp(0); int temp(0);
string s; string s;
for (vector<string>::iterator iter(arg.begin()); iter != arg.end(); ++iter) { for (vector<string>::iterator iter(arg.begin()); iter != arg.end(); ++iter) {
if (!iter->substr(0,4).compare("msr-")) { if (!iter->substr(0,4).compare("msr-")) {
s = iter->substr(4); s = iter->substr(4);
try { try {
temp = boost::lexical_cast<unsigned int>(s); temp = boost::lexical_cast<int>(s);
arg.erase(iter); arg.erase(iter);
} }
catch(boost::bad_lexical_cast &) { catch(boost::bad_lexical_cast &) {
temp = 0; // the specified template is no number temp = -3; // the specified template is no number
} }
inputOnly = true; inputOnly = true;
break; break;
@ -549,7 +549,7 @@ int main(int argc, char *argv[])
realOutput = false; realOutput = false;
outputFile = "none"; outputFile = "none";
} }
if (!temp) { if (temp == -3) {
cerr << endl; cerr << endl;
cerr << ">> msr2data: **ERROR** The given template has not a valid run number! Quitting..." << endl; cerr << ">> msr2data: **ERROR** The given template has not a valid run number! Quitting..." << endl;
run_vec.clear(); run_vec.clear();