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

see MUSR-155

Browse Source
This commit is contained in:
Bastian M. Wojek 2010-11-10 23:02:10 +00:00
parent f4d6e349fe
commit 2e49d42cfb
3 changed files with 151 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
src/classes/PMsr2Data.cpp
View File

@ -39,6 +39,7 @@
#include <fstream> #include <fstream>
#include <iomanip> #include <iomanip>
#include <algorithm> #include <algorithm>
#include <limits>
using namespace std; using namespace std;
#include <boost/algorithm/string/trim.hpp> // for stripping leading whitespace in std::string #include <boost/algorithm/string/trim.hpp> // for stripping leading whitespace in std::string
@ -74,7 +75,7 @@ void writeValues(ofstream &outFile, const double &value, const unsigned int &wid
* *
* \param ext extension/suffix of the msr-files to be processed * \param ext extension/suffix of the msr-files to be processed
*/ */
PMsr2Data::PMsr2Data(const string &ext) : fFileExtension(ext), fRunListFile(false), fNumGlobalParam(0), fNumSpecParam(0), fNumTempRunBlocks(0) PMsr2Data::PMsr2Data(const string &ext) : fFileExtension(ext), fRunListFile(false), fNumGlobalParam(0), fNumSpecParam(0), fNumTempRunBlocks(0), fRunNumberDigits(4)
{ {
fRunVector.clear(); fRunVector.clear();
fRunVectorIter = fRunVector.end(); fRunVectorIter = fRunVector.end();
@ -118,6 +119,96 @@ PMsr2Data::~PMsr2Data()
} }
} }
//-------------------------------------------------------------
/**
* <p> Determines the number of digits used for the run number in the data file name from the first msr-file that is processed
*
* <p><b>return:</b>
* - 0 if the number has been determined and set successfully
* - -1 in case the msr-file cannot be read
* - -2 if the msr-file-number does not match the data-file-number
* - -3 if the msr-file does not contain a RUN block
*
* \param runNo run number of an existing msr-file
*
*/
int PMsr2Data::DetermineRunNumberDigits(unsigned int runNo) const
{
ostringstream strInfile;
strInfile << runNo << fFileExtension << ".msr";
ifstream in(strInfile.str().c_str());
if (!in) {
cerr << endl << ">> msr2data: **ERROR** The msr-file " << strInfile.str() << " cannot be opened! Please check!";
cerr << endl;
return -1;
}
ostringstream tempRunNumber;
tempRunNumber.fill('0');
tempRunNumber.setf(ios::internal, ios::adjustfield);
tempRunNumber.width(fRunNumberDigits);
tempRunNumber << runNo;
string line, firstOnLine;
istringstream strLine;
while (getline(in, line)) {
strLine.clear();
strLine.str(line);
strLine >> firstOnLine;
if (!firstOnLine.compare("RUN")) {
string::size_type loc = line.rfind(tempRunNumber.str());
if ( loc != string::npos ) {
while ( --loc >= 0 ) {
if(isdigit(line.at(loc))) {
++fRunNumberDigits;
} else {
in.close();
//cout << endl << "Number of digits: " << fRunNumberDigits << endl;
return 0;
}
}
} else {
cerr << endl << ">> msr2data: **ERROR** The first processed run file number does not match the \"file index\"!";
cerr << endl << ">> msr2data: **ERROR** The number of digits to be used for formatting the run numbers cannot be determined!";
cerr << endl << ">> msr2data: **ERROR** Please check the first msr-file that should be processed;";
cerr << endl << ">> msr2data: **ERROR** this is either some template or the first file from the run list.";
cerr << endl;
in.close();
return -2;
}
}
}
cerr << endl << ">> msr2data: **ERROR** Please check the first msr-file that should be processed;";
cerr << endl << ">> msr2data: **ERROR** this is either some template or the first file from the run list.";
cerr << endl << ">> msr2data: **ERROR** Obviously it contains no RUN block...";
cerr << endl;
return -3;
}
//-------------------------------------------------------------
/**
* <p> Checks if all given run numbers are in the range covered by the number of digits used in the data file name
*
* <p><b>return:</b>
* - 0 if everything is fine
* - -1 if a given run number is too big
*/
int PMsr2Data::CheckRunNumbersInRange() const
{
double max(pow(static_cast<double>(10), static_cast<int>(fRunNumberDigits)) - 1.0);
unsigned int max_UInt;
max > static_cast<double>(numeric_limits<unsigned int>::max()) ? max_UInt = numeric_limits<unsigned int>::max()
: max_UInt = static_cast<unsigned int>(max);
for (vector<unsigned int>::const_iterator iter(fRunVector.begin()); iter != fRunVector.end(); ++iter) {
if (*iter > max_UInt) {
return -1;
}
}
return 0;
}
//------------------------------------------------------------- //-------------------------------------------------------------
/** /**
* <p> Determines the current run number * <p> Determines the current run number
@ -146,7 +237,7 @@ unsigned int PMsr2Data::GetPresentRun() const
*/ */
int PMsr2Data::SetRunNumbers(unsigned int runNo) int PMsr2Data::SetRunNumbers(unsigned int runNo)
{ {
if (runNo > 9999 || runNo < 1) if (runNo < 1)
return 1; return 1;
fRunVector.clear(); fRunVector.clear();
@ -169,7 +260,7 @@ int PMsr2Data::SetRunNumbers(unsigned int runNo)
*/ */
int PMsr2Data::SetRunNumbers(unsigned int runNoStart, unsigned int runNoEnd) int PMsr2Data::SetRunNumbers(unsigned int runNoStart, unsigned int runNoEnd)
{ {
if ((runNoStart > 9999) || (runNoEnd > 9999) || (runNoStart < 1) || (runNoEnd < 1)) if ((runNoStart < 1) || (runNoEnd < 1))
return 1; return 1;
fRunVector.clear(); fRunVector.clear();
@ -202,7 +293,7 @@ int PMsr2Data::SetRunNumbers(const vector<unsigned int> &runListVector)
return -1; return -1;
for (vector<unsigned int>::const_iterator iter(runListVector.begin()); iter!=runListVector.end(); iter++) { for (vector<unsigned int>::const_iterator iter(runListVector.begin()); iter!=runListVector.end(); iter++) {
if (*iter > 9999 || *iter < 1) if (*iter < 1)
return 1; return 1;
} }
@ -267,7 +358,7 @@ int PMsr2Data::SetRunNumbers(const string &runListFile)
strLine.clear(); strLine.clear();
strLine.str(splitVec[0]); strLine.str(splitVec[0]);
strLine >> runNo; strLine >> runNo;
if (runNo > 9999 || runNo < 1) if (runNo < 1)
return 1; return 1;
fRunVector.push_back(runNo); fRunVector.push_back(runNo);
} }
@ -387,8 +478,6 @@ bool PMsr2Data::PrepareNewInputFile(unsigned int tempRun) const
if (*fRunVectorIter == tempRun) if (*fRunVectorIter == tempRun)
return true; return true;
const unsigned int N(4); // number of digits for the runnumber
ostringstream strInfile; ostringstream strInfile;
strInfile << tempRun << fFileExtension << ".msr"; strInfile << tempRun << fFileExtension << ".msr";
ifstream in(strInfile.str().c_str()); ifstream in(strInfile.str().c_str());
@ -409,13 +498,13 @@ bool PMsr2Data::PrepareNewInputFile(unsigned int tempRun) const
ostringstream tempRunNumber; ostringstream tempRunNumber;
tempRunNumber.fill('0'); tempRunNumber.fill('0');
tempRunNumber.setf(ios::internal, ios::adjustfield); tempRunNumber.setf(ios::internal, ios::adjustfield);
tempRunNumber.width(N); tempRunNumber.width(fRunNumberDigits);
tempRunNumber << tempRun; tempRunNumber << tempRun;
ostringstream newRunNumber; ostringstream newRunNumber;
newRunNumber.fill('0'); newRunNumber.fill('0');
newRunNumber.setf(ios::internal, ios::adjustfield); newRunNumber.setf(ios::internal, ios::adjustfield);
newRunNumber.width(N); newRunNumber.width(fRunNumberDigits);
newRunNumber << *fRunVectorIter; newRunNumber << *fRunVectorIter;
cout << endl << ">> msr2data: **INFO** Generating new input msr file " << strOutfile.str() << endl; cout << endl << ">> msr2data: **INFO** Generating new input msr file " << strOutfile.str() << endl;
@ -441,7 +530,7 @@ bool PMsr2Data::PrepareNewInputFile(unsigned int tempRun) const
if (!firstOnLine.compare("RUN")) { if (!firstOnLine.compare("RUN")) {
string::size_type loc = line.rfind(tempRunNumber.str()); string::size_type loc = line.rfind(tempRunNumber.str());
if ( loc != string::npos ) { if ( loc != string::npos ) {
line.replace(loc, N, newRunNumber.str()); line.replace(loc, fRunNumberDigits, newRunNumber.str());
} else { } else {
cerr << endl << ">> msr2data: **WARNING** The template run file number does not match the \"file index\""; cerr << endl << ">> msr2data: **WARNING** The template run file number does not match the \"file index\"";
cerr << endl << ">> msr2data: **WARNING** Unexpected things will happen... (for sure)"; cerr << endl << ">> msr2data: **WARNING** Unexpected things will happen... (for sure)";
@ -500,7 +589,6 @@ bool compare_parameters(const PMsrParamStructure &par1, const PMsrParamStructure
*/ */
bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOutFile) const bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOutFile) const
{ {
const unsigned int N(4); // number of digits for the runnumber
const TString alpha("alpha"), beta("beta"), norm("norm"), bkgfit("bkgfit"), lifetime("lifetime"); const TString alpha("alpha"), beta("beta"), norm("norm"), bkgfit("bkgfit"), lifetime("lifetime");
ostringstream strInfile; ostringstream strInfile;
@ -522,7 +610,7 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
ostringstream tempRunNumber; ostringstream tempRunNumber;
tempRunNumber.fill('0'); tempRunNumber.fill('0');
tempRunNumber.setf(ios::internal, ios::adjustfield); tempRunNumber.setf(ios::internal, ios::adjustfield);
tempRunNumber.width(N); tempRunNumber.width(fRunNumberDigits);
tempRunNumber << tempRun; tempRunNumber << tempRun;
string tempRunName; string tempRunName;
@ -544,7 +632,7 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
for (unsigned int i(0); i < msrParamList->size(); ++i) { for (unsigned int i(0); i < msrParamList->size(); ++i) {
tempParamName = msrParamList->at(i).fName.Data(); tempParamName = msrParamList->at(i).fName.Data();
string::size_type loc = tempParamName.rfind(tempRunNumber.str()); string::size_type loc = tempParamName.rfind(tempRunNumber.str());
if ((tempParamName.length() > N) && (loc == tempParamName.length() - N)) { if ((tempParamName.length() > fRunNumberDigits) && (loc == tempParamName.length() - fRunNumberDigits)) {
msrParamList->at(i).fIsGlobal = false; msrParamList->at(i).fIsGlobal = false;
++fNumSpecParam; ++fNumSpecParam;
} else { } else {
@ -1096,7 +1184,7 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
ostringstream newRunNumber; ostringstream newRunNumber;
newRunNumber.fill('0'); newRunNumber.fill('0');
newRunNumber.setf(ios::internal, ios::adjustfield); newRunNumber.setf(ios::internal, ios::adjustfield);
newRunNumber.width(N); newRunNumber.width(fRunNumberDigits);
newRunNumber << *fRunVectorIter; newRunNumber << *fRunVectorIter;
//cout << "Number of run specific parameters: " << fNumSpecParam << endl; //cout << "Number of run specific parameters: " << fNumSpecParam << endl;
@ -1107,7 +1195,7 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
tempParamName = msrParamList->at(l).fName.Data(); tempParamName = msrParamList->at(l).fName.Data();
string::size_type loc = tempParamName.rfind(tempRunNumber.str()); string::size_type loc = tempParamName.rfind(tempRunNumber.str());
if ( loc != string::npos ) { if ( loc != string::npos ) {
tempParamName.replace(loc, N, newRunNumber.str()); tempParamName.replace(loc, fRunNumberDigits, newRunNumber.str());
msrParamList->at(l).fName = tempParamName; msrParamList->at(l).fName = tempParamName;
} else { } else {
cerr << endl << ">> msr2data: **ERROR** The indices of the run specific parameters do not match the template run number!"; cerr << endl << ">> msr2data: **ERROR** The indices of the run specific parameters do not match the template run number!";
@ -1120,7 +1208,7 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
tempRunName = msrRunList->at(i).GetRunName()->Data(); tempRunName = msrRunList->at(i).GetRunName()->Data();
string::size_type loc = tempRunName.rfind(tempRunNumber.str()); string::size_type loc = tempRunName.rfind(tempRunNumber.str());
if ( loc != string::npos ) { if ( loc != string::npos ) {
tempRunName.replace(loc, N, newRunNumber.str()); tempRunName.replace(loc, fRunNumberDigits, newRunNumber.str());
tempTstr = TString(tempRunName); tempTstr = TString(tempRunName);
msrRunList->at(i).SetRunName(tempTstr, 0); msrRunList->at(i).SetRunName(tempTstr, 0);
} else { } else {
@ -1164,7 +1252,7 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
newRunNumber.clear(); newRunNumber.clear();
newRunNumber.fill('0'); newRunNumber.fill('0');
newRunNumber.setf(ios::internal, ios::adjustfield); newRunNumber.setf(ios::internal, ios::adjustfield);
newRunNumber.width(N); newRunNumber.width(fRunNumberDigits);
newRunNumber << *fRunVectorIter; newRunNumber << *fRunVectorIter;
// add parameters for each run // add parameters for each run
@ -1173,7 +1261,7 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
tempParamName = msrParamList->back().fName.Data(); tempParamName = msrParamList->back().fName.Data();
string::size_type loc = tempParamName.rfind(tempRunNumber.str()); string::size_type loc = tempParamName.rfind(tempRunNumber.str());
if ( loc != string::npos ) { if ( loc != string::npos ) {
tempParamName.replace(loc, N, newRunNumber.str()); tempParamName.replace(loc, fRunNumberDigits, newRunNumber.str());
msrParamList->back().fName = tempParamName; msrParamList->back().fName = tempParamName;
msrParamList->back().fNo += fNumSpecParam; msrParamList->back().fNo += fNumSpecParam;
} else { } else {
@ -1189,7 +1277,7 @@ bool PMsr2Data::PrepareGlobalInputFile(unsigned int tempRun, const string &msrOu
tempRunName = msrRunList->back().GetRunName()->Data(); tempRunName = msrRunList->back().GetRunName()->Data();
string::size_type loc = tempRunName.rfind(tempRunNumber.str()); string::size_type loc = tempRunName.rfind(tempRunNumber.str());
if ( loc != string::npos ) { if ( loc != string::npos ) {
tempRunName.replace(loc, N, newRunNumber.str()); tempRunName.replace(loc, fRunNumberDigits, newRunNumber.str());
tempTstr = TString(tempRunName); tempTstr = TString(tempRunName);
msrRunList->back().SetRunName(tempTstr, 0); msrRunList->back().SetRunName(tempTstr, 0);
} else { } else {
@ -1290,12 +1378,10 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, bool withHeader, bool
return PMUSR_SUCCESS; return PMUSR_SUCCESS;
} }
const unsigned int N(4);
ostringstream curRunNumber; ostringstream curRunNumber;
curRunNumber.fill('0'); curRunNumber.fill('0');
curRunNumber.setf(ios::internal, ios::adjustfield); curRunNumber.setf(ios::internal, ios::adjustfield);
curRunNumber.width(N); curRunNumber.width(fRunNumberDigits);
curRunNumber << *fRunVectorIter; curRunNumber << *fRunVectorIter;
string msrTitle(fMsrHandler->GetMsrTitle()->Data()); string msrTitle(fMsrHandler->GetMsrTitle()->Data());
@ -1313,14 +1399,14 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, bool withHeader, bool
if (!fNumGlobalParam && !fNumSpecParam && !fNumTempRunBlocks) { // if not all parameters are zero they have been determined before if (!fNumGlobalParam && !fNumSpecParam && !fNumTempRunBlocks) { // if not all parameters are zero they have been determined before
tempRunNumber.fill('0'); tempRunNumber.fill('0');
tempRunNumber.setf(ios::internal, ios::adjustfield); tempRunNumber.setf(ios::internal, ios::adjustfield);
tempRunNumber.width(N); tempRunNumber.width(fRunNumberDigits);
tempRunNumber << fRunVector.front(); tempRunNumber << fRunVector.front();
// search parameter list for run-specific parameters // search parameter list for run-specific parameters
for (unsigned int i(0); i < msrParamList->size(); ++i) { for (unsigned int i(0); i < msrParamList->size(); ++i) {
tempName = msrParamList->at(i).fName.Data(); tempName = msrParamList->at(i).fName.Data();
string::size_type loc = tempName.rfind(tempRunNumber.str()); string::size_type loc = tempName.rfind(tempRunNumber.str());
if ((tempName.length() > N) && (loc == tempName.length() - N)) { if ((tempName.length() > fRunNumberDigits) && (loc == tempName.length() - fRunNumberDigits)) {
if (!fNumSpecParam) { if (!fNumSpecParam) {
fNumGlobalParam = i; fNumGlobalParam = i;
} }
@ -1384,13 +1470,13 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, bool withHeader, bool
tempRunNumber.str(""); tempRunNumber.str("");
tempRunNumber.fill('0'); tempRunNumber.fill('0');
tempRunNumber.setf(ios::internal, ios::adjustfield); tempRunNumber.setf(ios::internal, ios::adjustfield);
tempRunNumber.width(N); tempRunNumber.width(fRunNumberDigits);
tempRunNumber << fRunVector[a]; tempRunNumber << fRunVector[a];
for (unsigned int i(0); i < fNumSpecParam; ++i) { for (unsigned int i(0); i < fNumSpecParam; ++i) {
tempName = msrParamList->at(fNumGlobalParam + a*fNumSpecParam + i).fName.Data(); tempName = msrParamList->at(fNumGlobalParam + a*fNumSpecParam + i).fName.Data();
string::size_type loc = tempName.rfind(tempRunNumber.str()); string::size_type loc = tempName.rfind(tempRunNumber.str());
if (!(tempName.length() > N) || !(loc == tempName.length() - N)) { if (!(tempName.length() > fRunNumberDigits) || !(loc == tempName.length() - fRunNumberDigits)) {
okP = false; okP = false;
break; break;
} }
@ -1413,7 +1499,7 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, bool withHeader, bool
tempRunNumber.str(""); tempRunNumber.str("");
tempRunNumber.fill('0'); tempRunNumber.fill('0');
tempRunNumber.setf(ios::internal, ios::adjustfield); tempRunNumber.setf(ios::internal, ios::adjustfield);
tempRunNumber.width(N); tempRunNumber.width(fRunNumberDigits);
tempRunNumber << fRunVector[a]; tempRunNumber << fRunVector[a];
for (unsigned int i(0); i < fNumTempRunBlocks; ++i) { for (unsigned int i(0); i < fNumTempRunBlocks; ++i) {
@ -1617,7 +1703,7 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, bool withHeader, bool
for (unsigned int i(0); i < fNumSpecParam; ++i) { for (unsigned int i(0); i < fNumSpecParam; ++i) {
tempName = (*msrParamList)[fNumGlobalParam + fNumSpecParam*counter + i].fName.Data(); tempName = (*msrParamList)[fNumGlobalParam + fNumSpecParam*counter + i].fName.Data();
string::size_type loc = tempName.rfind(curRunNumber.str()); string::size_type loc = tempName.rfind(curRunNumber.str());
if (loc == tempName.length() - N) { if (loc == tempName.length() - fRunNumberDigits) {
outFile << tempName.substr(0, loc) << endl; outFile << tempName.substr(0, loc) << endl;
} else { } else {
cerr << endl << ">> msr2data: **ERROR** The run index of some parameter does not match the run number being processed!"; cerr << endl << ">> msr2data: **ERROR** The run index of some parameter does not match the run number being processed!";
@ -1668,7 +1754,7 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, bool withHeader, bool
for (unsigned int i(0); i < fNumSpecParam; ++i) { for (unsigned int i(0); i < fNumSpecParam; ++i) {
tempName = (*msrParamList)[fNumGlobalParam + fNumSpecParam*counter + i].fName.Data(); tempName = (*msrParamList)[fNumGlobalParam + fNumSpecParam*counter + i].fName.Data();
string::size_type loc = tempName.rfind(curRunNumber.str()); string::size_type loc = tempName.rfind(curRunNumber.str());
if (loc == tempName.length() - N) { if (loc == tempName.length() - fRunNumberDigits) {
outFile << " " << tempName.substr(0, loc); outFile << " " << tempName.substr(0, loc);
} else { } else {
cerr << endl << ">> msr2data: **ERROR** The run index of some parameter does not match the run number being processed!"; cerr << endl << ">> msr2data: **ERROR** The run index of some parameter does not match the run number being processed!";
@ -1731,7 +1817,7 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, bool withHeader, bool
idx = fNumGlobalParam + fNumSpecParam*counter + i; idx = fNumGlobalParam + fNumSpecParam*counter + i;
tempName = (*msrParamList)[idx].fName.Data(); tempName = (*msrParamList)[idx].fName.Data();
string::size_type loc = tempName.rfind(curRunNumber.str()); string::size_type loc = tempName.rfind(curRunNumber.str());
if (loc == tempName.length() - N) { if (loc == tempName.length() - fRunNumberDigits) {
outFile << tempName.substr(0, loc) << " = " << (*msrParamList)[idx].fValue << ", "; outFile << tempName.substr(0, loc) << " = " << (*msrParamList)[idx].fValue << ", ";
if ((*msrParamList)[idx].fPosErrorPresent) if ((*msrParamList)[idx].fPosErrorPresent)
outFile << (*msrParamList)[idx].fPosError << ", "; outFile << (*msrParamList)[idx].fPosError << ", ";
@ -1790,8 +1876,8 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, bool withHeader, bool
for (unsigned int i(0); i < fNumSpecParam; ++i) { for (unsigned int i(0); i < fNumSpecParam; ++i) {
s = (*msrParamList)[fNumGlobalParam + fNumSpecParam*counter + i].fName.Data(); s = (*msrParamList)[fNumGlobalParam + fNumSpecParam*counter + i].fName.Data();
string::size_type loc = s.rfind(curRunNumber.str()); string::size_type loc = s.rfind(curRunNumber.str());
if (loc == s.length() - N) { if (loc == s.length() - fRunNumberDigits) {
length = s.length() - N; length = s.length() - fRunNumberDigits;
if (length > maxlength) if (length > maxlength)
maxlength = length; maxlength = length;
} else { } else {
@ -1842,7 +1928,7 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, bool withHeader, bool
for (unsigned int i(0); i < fNumSpecParam; ++i) { for (unsigned int i(0); i < fNumSpecParam; ++i) {
s = (*msrParamList)[fNumGlobalParam + fNumSpecParam*counter + i].fName.Data(); s = (*msrParamList)[fNumGlobalParam + fNumSpecParam*counter + i].fName.Data();
string::size_type loc = s.rfind(curRunNumber.str()); string::size_type loc = s.rfind(curRunNumber.str());
if (loc == s.length() - N) { if (loc == s.length() - fRunNumberDigits) {
s = s.substr(0, loc); s = s.substr(0, loc);
outFile << setw(maxlength) << left << s \ outFile << setw(maxlength) << left << s \
<< setw(maxlength + 6) << left << s + "PosErr" \ << setw(maxlength + 6) << left << s + "PosErr" \

4
src/include/PMsr2Data.h
View File

@ -63,6 +63,9 @@ class PMsr2Data
int SetRunNumbers(const vector<unsigned int>&); // explicit run list specified using [ ] int SetRunNumbers(const vector<unsigned int>&); // explicit run list specified using [ ]
unsigned int GetPresentRun() const; unsigned int GetPresentRun() const;
int DetermineRunNumberDigits(unsigned int) const;
int CheckRunNumbersInRange() const;
int ParseXmlStartupFile(); int ParseXmlStartupFile();
int ReadMsrFile(const string&) const; int ReadMsrFile(const string&) const;
bool ReadRunDataFile(); bool ReadRunDataFile();
@ -86,6 +89,7 @@ class PMsr2Data
mutable unsigned int fNumGlobalParam; mutable unsigned int fNumGlobalParam;
mutable unsigned int fNumSpecParam; mutable unsigned int fNumSpecParam;
mutable unsigned int fNumTempRunBlocks; mutable unsigned int fNumTempRunBlocks;
mutable unsigned int fRunNumberDigits;
}; };

31
src/msr2data.cpp
View File

@ -40,6 +40,7 @@
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <limits>
using namespace std; using namespace std;
@ -289,7 +290,7 @@ int main(int argc, char *argv[])
return 0; return 0;
} }
// use a string-vector for the arguments to get rid of god damn char* as far as possible... // use a string-vector for the arguments to get rid of char* as far as possible...
vector<string> arg; vector<string> arg;
for (int i(1); i<argc; i++) { for (int i(1); i<argc; i++) {
arg.push_back(argv[i]); arg.push_back(argv[i]);
@ -304,7 +305,7 @@ int main(int argc, char *argv[])
runTAG = 1; runTAG = 1;
unsigned int firstRunNumberInArg(0), lastRunNumberInArg(0); unsigned int firstRunNumberInArg(0), lastRunNumberInArg(0);
unsigned int rightbracket(999); unsigned int rightbracket(numeric_limits<unsigned int>::max());
if (!arg[0].compare("[")) if (!arg[0].compare("["))
firstRunNumberInArg = 1; firstRunNumberInArg = 1;
@ -324,7 +325,7 @@ int main(int argc, char *argv[])
break; break;
} }
} }
if (rightbracket == 999) { if (rightbracket == numeric_limits<unsigned int>::max()) {
cout << endl; cout << endl;
cout << ">> msr2data: **ERROR** You used the list specification without closing bracket (])! Quitting now." << endl; cout << ">> msr2data: **ERROR** You used the list specification without closing bracket (])! Quitting now." << endl;
return 0; return 0;
@ -469,6 +470,30 @@ int main(int argc, char *argv[])
} }
} }
// At this point it should be clear if any template for input-file generation is given or not.
// Therefore, the number of digits in the run number format is determined only here.
if(temp > 0) {
status = msr2dataHandler.DetermineRunNumberDigits(temp);
} else {
status = msr2dataHandler.DetermineRunNumberDigits(msr2dataHandler.GetPresentRun());
}
if(status) {
run_vec.clear();
arg.clear();
return status;
}
// Check if all given run numbers are covered by the formatting of the data file name
status = msr2dataHandler.CheckRunNumbersInRange();
if(status) {
cout << endl;
cout << ">> msr2data: **ERROR** At least one given run number is out of range! Quitting..." << endl;
run_vec.clear();
arg.clear();
return status;
}
bool writeHeader(false), writeSummary(false); bool writeHeader(false), writeSummary(false);
if (realOutput) { if (realOutput) {