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

Put in line the time-resolution output of single-histogram and asymmetry data.

Browse Source 
Now both have a line break at the end--before this has only been true for the asymmetry data.
(If the line break is not needed it should be consistently removed and replaced by a cout.flush()
followed by a line break when musrview is terminated.)
This commit is contained in:
Bastian M. Wojek 2011-03-03 13:49:22 +00:00
parent 103283400a
commit 34e462e05f
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/classes/PRunMuMinus.cpp
View File

@ -151,7 +151,7 @@ Bool_t PRunMuMinus::PrepareData()
{ {
Bool_t success = true; Bool_t success = true;
cout << endl << "in PRunMuMinus::PrepareData(): will feed fData"; cout << endl << "in PRunMuMinus::PrepareData(): will feed fData" << endl;
return success; return success;
} }

2
src/classes/PRunSingleHisto.cpp
View File

@ -513,7 +513,7 @@ Bool_t PRunSingleHisto::PrepareData()
// keep the time resolution in (us) // keep the time resolution in (us)
fTimeResolution = runData->GetTimeResolution()/1.0e3; fTimeResolution = runData->GetTimeResolution()/1.0e3;
cout.precision(8); cout.precision(8);
cout << endl << ">> PRunSingleHisto::PrepareData(): time resolution=" << fixed << runData->GetTimeResolution() << "(ns)"; cout << endl << ">> PRunSingleHisto::PrepareData(): time resolution=" << fixed << runData->GetTimeResolution() << "(ns)" << endl;
if (fHandleTag == kFit) if (fHandleTag == kFit)
success = PrepareFitData(runData, histoNo[0]); success = PrepareFitData(runData, histoNo[0]);

22
src/musrview.cpp
View File

@ -112,7 +112,7 @@ int main(int argc, char *argv[])
} else { } else {
// check if filename has extension msr or mlog // check if filename has extension msr or mlog
if (!strstr(argv[1], ".msr") && !strstr(argv[1], ".mlog")) { if (!strstr(argv[1], ".msr") && !strstr(argv[1], ".mlog")) {
cout << endl << "**ERROR** " << argv[1] << " is not a msr/mlog-file, nor is it a supported graphics extension." << endl; cerr << endl << "**ERROR** " << argv[1] << " is not a msr/mlog-file, nor is it a supported graphics extension." << endl;
show_syntax = true; show_syntax = true;
} else { } else {
strcpy(fileName, argv[1]); strcpy(fileName, argv[1]);
@ -127,7 +127,7 @@ int main(int argc, char *argv[])
strcpy(graphicsExtension, argv[1]+2); strcpy(graphicsExtension, argv[1]+2);
// check if filename has extension msr or mlog // check if filename has extension msr or mlog
if (!strstr(argv[2], ".msr") && !strstr(argv[2], ".mlog")) { if (!strstr(argv[2], ".msr") && !strstr(argv[2], ".mlog")) {
cout << endl << "**ERROR** " << argv[2] << " is not a msr/mlog-file, nor is it a supported graphics extension." << endl; cerr << endl << "**ERROR** " << argv[2] << " is not a msr/mlog-file, nor is it a supported graphics extension." << endl;
show_syntax = true; show_syntax = true;
} else { } else {
strcpy(fileName, argv[2]); strcpy(fileName, argv[2]);
@ -139,7 +139,7 @@ int main(int argc, char *argv[])
strcpy(graphicsExtension, argv[2]+2); strcpy(graphicsExtension, argv[2]+2);
// check if filename has extension msr or mlog // check if filename has extension msr or mlog
if (!strstr(argv[1], ".msr") && !strstr(argv[1], ".mlog")) { if (!strstr(argv[1], ".msr") && !strstr(argv[1], ".mlog")) {
cout << endl << "**ERROR** " << argv[1] << " is not a msr/mlog-file, nor is it a supported graphics extension." << endl; cerr << endl << "**ERROR** " << argv[1] << " is not a msr/mlog-file, nor is it a supported graphics extension." << endl;
show_syntax = true; show_syntax = true;
} else { } else {
strcpy(fileName, argv[1]); strcpy(fileName, argv[1]);
@ -200,13 +200,13 @@ int main(int argc, char *argv[])
if (status != PMUSR_SUCCESS) { if (status != PMUSR_SUCCESS) {
switch (status) { switch (status) {
case PMUSR_MSR_FILE_NOT_FOUND: case PMUSR_MSR_FILE_NOT_FOUND:
cout << endl << "**ERROR** couldn't find '" << fileName << "'" << endl << endl; cerr << endl << "**ERROR** couldn't find '" << fileName << "'" << endl << endl;
break; break;
case PMUSR_MSR_SYNTAX_ERROR: case PMUSR_MSR_SYNTAX_ERROR:
cout << endl << "**SYNTAX ERROR** in file " << fileName << ", full stop here." << endl << endl; cerr << endl << "**SYNTAX ERROR** in file " << fileName << ", full stop here." << endl << endl;
break; break;
default: default:
cout << endl << "**UNKNOWN ERROR** when trying to read the msr-file" << endl << endl; cerr << endl << "**UNKNOWN ERROR** when trying to read the msr-file" << endl << endl;
break; break;
} }
return status; return status;
@ -240,7 +240,7 @@ int main(int argc, char *argv[])
success = dataHandler->IsAllDataAvailable(); success = dataHandler->IsAllDataAvailable();
if (!success) { if (!success) {
cout << endl << "**ERROR** Couldn't read all data files, will quit ..." << endl; cerr << endl << "**ERROR** Couldn't read all data files, will quit ..." << endl;
} }
// generate the necessary histogramms for the view // generate the necessary histogramms for the view
@ -260,8 +260,8 @@ int main(int argc, char *argv[])
if (runPresent) { if (runPresent) {
success = runListCollection->Add(i, kView); success = runListCollection->Add(i, kView);
if (!success) { if (!success) {
cout << endl << "**ERROR** Couldn't handle run no " << i << " "; cerr << endl << "**ERROR** Couldn't handle run no " << i << " ";
cout << (*msrHandler->GetMsrRunList())[i].GetRunName()->Data(); cerr << (*msrHandler->GetMsrRunList())[i].GetRunName()->Data();
break; break;
} }
} }
@ -295,8 +295,8 @@ int main(int argc, char *argv[])
10+i*100, 10+i*100, 800, 600, graphicsOutput); 10+i*100, 10+i*100, 800, 600, graphicsOutput);
if (!musrCanvas->IsValid()) { if (!musrCanvas->IsValid()) {
cout << endl << "**SEVERE ERROR** Couldn't invoke all necessary objects, will quit."; cerr << endl << "**SEVERE ERROR** Couldn't invoke all necessary objects, will quit.";
cout << endl; cerr << endl;
ok = false; ok = false;
break; break;
} }