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

FIXED wrong asymmetry fit plotting if data range is not provided (MUSR-203). Added units to run duration in TPsiRunHeader

Browse Source
This commit is contained in:
nemu
2011-09-09 06:37:22 +00:00
parent fc31214dec
commit 7cedf2eb14
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tests/PsiRoot/TPsiRunHeader.cpp
View File

@@ -641,7 +641,7 @@ TObjArray* TPsiRunHeader::GetHeader(UInt_t &count)
fHeader.AddLast(tostr);
// add run duration
str.Form("%03d - Run Duration: %d", count++, GetRunDuration());
str.Form("%03d - Run Duration: %d sec", count++, GetRunDuration());
tostr = new TObjString(str);
fHeader.AddLast(tostr);
@@ -1021,12 +1021,12 @@ Bool_t TPsiRunHeader::ExtractHeaderInformation(TObjArray *headerInfo, TString pa
} else if (str.Contains("- Run Number: ")) {
tokens = str.Tokenize(":");
if (tokens->GetEntries() < 2) {
cerr << endl << ">> TPsiRunHeader::ExtractHeaderInformation(..) **ERROR** " << str.Data() << " couldn't tokenize it." << endl << endl;
cerr << endl << ">> TPsiRunHeader::ExtractHeaderInformation(..) **ERROR** '" << str.Data() << "' couldn't tokenize it." << endl << endl;
return false;
}
ostr = dynamic_cast<TObjString*>(tokens->At(1));
if (!ostr->GetString().IsDigit()) {
cerr << endl << ">> TPsiRunHeader::ExtractHeaderInformation(..) **ERROR** " << str.Data() << " doesn't contain a valid run number" << endl << endl;
cerr << endl << ">> TPsiRunHeader::ExtractHeaderInformation(..) **ERROR** '" << str.Data() << "' doesn't contain a valid run number" << endl << endl;
return false;
}
fRunNumber = ostr->GetString().Atoi();
@@ -1550,7 +1550,7 @@ void TPsiRunHeader::DumpHeader() const
cout << endl << setw(name_width) << left << "Run Stop Time" << setw(old_width) << ": " << GetStopTimeString();
// write run duration
cout << endl << setw(name_width) << left << "Run Duration" << setw(old_width) << ": " << GetRunDuration();
cout << endl << setw(name_width) << left << "Run Duration" << setw(old_width) << ": " << GetRunDuration() << " sec";
// write laboratory
cout << endl << setw(name_width) << left << "Laboratory" << setw(old_width) << ": " << GetLaboratory().Data();