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

Tried to fix two bugs in the msr2data global-option:

Browse Source 
* Functions in the RUN blocks are now correctly ignored
* Function lines which contain parameters with adjacent characters (+-*/()\t) should now be handled correctly [-> more tests are needed here]
This commit is contained in:
Bastian M. Wojek
2010-06-22 21:29:01 +00:00
parent e7d8a0c5f1
commit 10993ff2ee
1 changed files with 53 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/classes/PMsr2Data.cpp
View File

@ -494,7 +494,7 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
vector<int> *tempMap; vector<int> *tempMap;
PMsrLines *tempLines; PMsrLines *tempLines;
vector<string> tempVec; vector<string> tempVec;
string line; string line, tempString;
if (!wasSorted) { if (!wasSorted) {
// Sort the parameters: global ones first, then run-specific // Sort the parameters: global ones first, then run-specific
@ -507,7 +507,7 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
bool mapExists(false); bool mapExists(false);
for (unsigned int i(0); i < tempLines->size(); ++i) { for (unsigned int i(0); i < tempLines->size(); ++i) {
line = (*tempLines)[i].fLine.Data(); line = (*tempLines)[i].fLine.Data();
split( tempVec, line, is_any_of(" ") ); // split the theory line at spaces split( tempVec, line, is_any_of(" \t") ); // split the theory line at spaces
for (unsigned int j(1); j < tempVec.size(); ++j) { for (unsigned int j(1); j < tempVec.size(); ++j) {
try { try {
tempPar = boost::lexical_cast<unsigned int>(tempVec[j]); tempPar = boost::lexical_cast<unsigned int>(tempVec[j]);
@ -577,11 +577,12 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
} }
// FUNCTIONS block // FUNCTIONS block
string::size_type pos(0);
tempLines = fMsrHandler->GetMsrFunctions(); tempLines = fMsrHandler->GetMsrFunctions();
for (unsigned int i(0); i < tempLines->size(); ++i) { for (unsigned int i(0); i < tempLines->size(); ++i) {
line = (*tempLines)[i].fLine.Data(); line = (*tempLines)[i].fLine.Data();
split( tempVec, line, is_any_of(" ") ); // split the function line at spaces split( tempVec, line, is_any_of(" ()+-*/=\t") ); // split the function line at spaces and some characters that might be juxtaposed to the parameters
for (unsigned int j(2); j < tempVec.size(); ++j) { for (unsigned int j(1); j < tempVec.size(); ++j) {
if (!tempVec[j].substr(0,3).compare("par")) { if (!tempVec[j].substr(0,3).compare("par")) {
try { try {
tempPar = boost::lexical_cast<unsigned int>(tempVec[j].substr(3)); tempPar = boost::lexical_cast<unsigned int>(tempVec[j].substr(3));
@ -589,8 +590,16 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
for (unsigned int k(0); k < msrParamList->size(); ++k) { for (unsigned int k(0); k < msrParamList->size(); ++k) {
if (tempPar == msrParamList->at(k).fNo) { if (tempPar == msrParamList->at(k).fNo) {
if (msrParamList->at(k).fIsGlobal) { if (msrParamList->at(k).fIsGlobal) {
tempVec[j] = "par"; pos = line.find(tempVec[j], pos);
tempVec[j].append(boost::lexical_cast<string>(k + 1)); if ( pos != string::npos ) {
tempString = "par";
tempString.append(boost::lexical_cast<string>(k + 1));
line.replace(pos, tempVec[j].length(), tempString);
} else {
cerr << endl << ">> msr2data: **ERROR** A previously identified parameter in the FUNCTIONS block is not found any more!";
cerr << endl << ">> msr2data: **ERROR** This should not happen! Please report a bug!";
cerr << endl;
}
} else { } else {
cerr << endl << ">> msr2data: **WARNING** The parameter " << msrParamList->at(k).fName.Data() \ cerr << endl << ">> msr2data: **WARNING** The parameter " << msrParamList->at(k).fName.Data() \
<< " is recognized as run specific!"; << " is recognized as run specific!";
@ -618,22 +627,27 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
} }
} }
if (mapExists) { if (!mapExists) {
tempVec[j] = "map";
tempVec[j].append(boost::lexical_cast<string>(l + 1));
mapExists = false;
} else {
for (l = 0; l < tempMap->size(); ++l) { for (l = 0; l < tempMap->size(); ++l) {
if (!(*tempMap)[l]) { if (!(*tempMap)[l]) {
break; break;
} }
} }
for (unsigned int m(0); m < fNumTempRunBlocks; ++m) { for (unsigned int m(0); m < fNumTempRunBlocks; ++m) {
msrRunList->at(m).SetMap(tempPar, l); // write the template parameter to the map - it will be replaced later msrRunList->at(m).SetMap(tempPar, l);
} }
tempVec[j] = "map";
tempVec[j].append(boost::lexical_cast<string>(l + 1));
} }
pos = line.find(tempVec[j], pos);
if ( pos != string::npos ) {
tempString = "map";
tempString.append(boost::lexical_cast<string>(l + 1));
line.replace(pos, tempVec[j].length(), tempString);
} else {
cerr << endl << ">> msr2data: **ERROR** A previously identified parameter in the FUNCTIONS block is not found any more!";
cerr << endl << ">> msr2data: **ERROR** This should not happen! Please report a bug!";
cerr << endl;
}
mapExists = false;
} }
break; break;
} }
@ -646,13 +660,12 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
return false; return false;
} }
} }
++pos;
} }
// replace the old function line by the new one // replace the old function line by the new one
(*tempLines)[i].fLine.Clear(); (*tempLines)[i].fLine = TString(line);
for (unsigned int j(0); j < tempVec.size(); ++j) {
(*tempLines)[i].fLine += TString(tempVec[j]) + TString(" ");
}
tempVec.clear(); tempVec.clear();
pos = 0;
} }
// RUN blocks // RUN blocks
@ -794,7 +807,8 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
tempLines = fMsrHandler->GetMsrTheory(); tempLines = fMsrHandler->GetMsrTheory();
for (unsigned int i(0); i < tempLines->size(); ++i) { for (unsigned int i(0); i < tempLines->size(); ++i) {
line = (*tempLines)[i].fLine.Data(); line = (*tempLines)[i].fLine.Data();
split( tempVec, line, is_any_of(" ") ); // split the theory line at spaces split( tempVec, line, is_any_of(" \t") ); // split the theory line at spaces
for (unsigned int j(1); j < tempVec.size(); ++j) { for (unsigned int j(1); j < tempVec.size(); ++j) {
try { try {
tempPar = boost::lexical_cast<unsigned int>(tempVec[j]); tempPar = boost::lexical_cast<unsigned int>(tempVec[j]);
@ -864,10 +878,11 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
// FUNCTIONS block // FUNCTIONS block
tempLines = fMsrHandler->GetMsrFunctions(); tempLines = fMsrHandler->GetMsrFunctions();
string::size_type pos(0);
for (unsigned int i(0); i < tempLines->size(); ++i) { for (unsigned int i(0); i < tempLines->size(); ++i) {
line = (*tempLines)[i].fLine.Data(); line = (*tempLines)[i].fLine.Data();
split( tempVec, line, is_any_of(" ") ); // split the function line at spaces split( tempVec, line, is_any_of(" ()+-*/=\t") ); // split the function line at spaces and some characters that might be juxtaposed to the parameters
for (unsigned int j(2); j < tempVec.size(); ++j) { for (unsigned int j(1); j < tempVec.size(); ++j) {
if (!tempVec[j].substr(0,3).compare("par")) { if (!tempVec[j].substr(0,3).compare("par")) {
try { try {
tempPar = boost::lexical_cast<unsigned int>(tempVec[j].substr(3)); tempPar = boost::lexical_cast<unsigned int>(tempVec[j].substr(3));
@ -900,12 +915,7 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
} }
} }
if (mapExists) { if (!mapExists) {
tempVec[j] = "map";
tempVec[j].append(boost::lexical_cast<string>(l + 1));
lineChanged = true;
mapExists = false;
} else {
for (l = 0; l < tempMap->size(); ++l) { for (l = 0; l < tempMap->size(); ++l) {
if (!(*tempMap)[l]) { if (!(*tempMap)[l]) {
break; break;
@ -914,13 +924,21 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
for (unsigned int m(0); m < fNumTempRunBlocks; ++m) { for (unsigned int m(0); m < fNumTempRunBlocks; ++m) {
msrRunList->at(m).SetMap(tempPar, l); msrRunList->at(m).SetMap(tempPar, l);
} }
tempVec[j] = "map"; }
tempVec[j].append(boost::lexical_cast<string>(l + 1)); pos = line.find(tempVec[j], pos);
if ( pos != string::npos ) {
tempString = "map";
tempString.append(boost::lexical_cast<string>(l + 1));
line.replace(pos, tempVec[j].length(), tempString);
} else {
cerr << endl << ">> msr2data: **ERROR** A previously identified parameter in the FUNCTIONS block is not found any more!";
cerr << endl << ">> msr2data: **ERROR** This should not happen! Please report a bug!";
cerr << endl;
}
mapExists = false;
lineChanged = true; lineChanged = true;
} }
} }
break;
}
catch(boost::bad_lexical_cast &) { catch(boost::bad_lexical_cast &) {
cerr << endl << ">> msr2data: **ERROR** Something is wrong with the parameters used in the FUNCTIONS block!"; cerr << endl << ">> msr2data: **ERROR** Something is wrong with the parameters used in the FUNCTIONS block!";
@ -929,16 +947,15 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
return false; return false;
} }
} }
++pos;
} }
// replace the old function line by the new one // replace the old function line by the new one
if (lineChanged) { if (lineChanged) {
(*tempLines)[i].fLine.Clear(); (*tempLines)[i].fLine = TString(line);
for (unsigned int j(0); j < tempVec.size(); ++j) {
(*tempLines)[i].fLine += TString(tempVec[j]) + TString(" ");
}
lineChanged = false; lineChanged = false;
} }
tempVec.clear(); tempVec.clear();
pos = 0;
} }
} }
@ -946,7 +963,7 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
// look in the following order through the RUN-blocks: norm, bkg-fit, alpha, beta, lifetime, maps // look in the following order through the RUN-blocks: norm, bkg-fit, alpha, beta, lifetime, maps
for (unsigned int i(0); i < fNumTempRunBlocks; ++i) { for (unsigned int i(0); i < fNumTempRunBlocks; ++i) {
tempPar = msrRunList->at(i).GetNormParamNo(); tempPar = msrRunList->at(i).GetNormParamNo();
if (tempPar > 0) { if ((tempPar > 0) && (tempPar < MSR_PARAM_FUN_OFFSET)) { // if the norm-parameter is given by a function we do not have to care about it here!
if (msrParamList->at(tempPar-1).fIsGlobal) { // norm of RUN block i is global if (msrParamList->at(tempPar-1).fIsGlobal) { // norm of RUN block i is global
msrRunList->at(i).SetParGlobal(norm, 1); msrRunList->at(i).SetParGlobal(norm, 1);
} else { } else {