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

some more work on PSI-ROOT

Browse Source
This commit is contained in:
nemu
2011-08-31 13:19:07 +00:00
parent 956fd23a10
commit 928e067f36
3 changed files with 72 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,6 +109,7 @@ TPsiRunHeader::TPsiRunHeader()
fInstrument = TString("n/a"); fInstrument = TString("n/a");
fMuonSpecies = TString("n/a"); fMuonSpecies = TString("n/a");
fSetup = TString("n/a"); fSetup = TString("n/a");
fComment = TString("n/a");
fSample = TString("n/a"); fSample = TString("n/a");
fOrientation = TString("n/a"); fOrientation = TString("n/a");
fSampleCryo = TString("n/a"); fSampleCryo = TString("n/a");
@ -199,6 +200,9 @@ Bool_t TPsiRunHeader::IsValid(Bool_t strict)
} else if (!fSetup.CompareTo("n/a", TString::kIgnoreCase)) { } else if (!fSetup.CompareTo("n/a", TString::kIgnoreCase)) {
cerr << endl << ">> **ERROR** TPsiRunHeader::IsValid(): 'Setup' not set." << endl; cerr << endl << ">> **ERROR** TPsiRunHeader::IsValid(): 'Setup' not set." << endl;
return false; return false;
} else if (!fComment.CompareTo("n/a", TString::kIgnoreCase)) {
cerr << endl << ">> **ERROR** TPsiRunHeader::IsValid(): 'Comment' not set." << endl;
return false;
} else if (!fSample.CompareTo("n/a", TString::kIgnoreCase)) { } else if (!fSample.CompareTo("n/a", TString::kIgnoreCase)) {
cerr << endl << ">> **ERROR** TPsiRunHeader::IsValid(): 'Sample' not set." << endl; cerr << endl << ">> **ERROR** TPsiRunHeader::IsValid(): 'Sample' not set." << endl;
return false; return false;
@ -307,6 +311,9 @@ Bool_t TPsiRunHeader::IsValid(Bool_t strict)
if (!fSetup.CompareTo("n/a", TString::kIgnoreCase)) { if (!fSetup.CompareTo("n/a", TString::kIgnoreCase)) {
cerr << endl << ">> **WARNING** TPsiRunHeader::IsValid(): 'Setup' not set." << endl; cerr << endl << ">> **WARNING** TPsiRunHeader::IsValid(): 'Setup' not set." << endl;
} }
if (!fComment.CompareTo("n/a", TString::kIgnoreCase)) {
cerr << endl << ">> **WARNING** TPsiRunHeader::IsValid(): 'Comment' not set." << endl;
}
if (!fSample.CompareTo("n/a", TString::kIgnoreCase)) { if (!fSample.CompareTo("n/a", TString::kIgnoreCase)) {
cerr << endl << ">> **WARNING** TPsiRunHeader::IsValid(): 'Sample' not set." << endl; cerr << endl << ">> **WARNING** TPsiRunHeader::IsValid(): 'Sample' not set." << endl;
} }
@ -587,66 +594,66 @@ TObjArray* TPsiRunHeader::GetHeader(UInt_t &count)
UInt_t digit=0, digit_d=0; UInt_t digit=0, digit_d=0;
// add version // add version
str.Form("%02d - Version: %s", count++, fVersion.Data()); str.Form("%03d - Version: %s", count++, fVersion.Data());
tostr = new TObjString(str); tostr = new TObjString(str);
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add generator // add generator
str.Form("%02d - Generator: %s", count++, fGenerator.Data()); str.Form("%03d - Generator: %s", count++, fGenerator.Data());
tostr = new TObjString(str); tostr = new TObjString(str);
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add file name // add file name
str.Form("%02d - File Name: %s", count++, fFileName.Data()); str.Form("%03d - File Name: %s", count++, fFileName.Data());
tostr = new TObjString(str); tostr = new TObjString(str);
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add run title // add run title
str.Form("%02d - Run Title: %s", count++, fRunTitle.Data()); str.Form("%03d - Run Title: %s", count++, fRunTitle.Data());
tostr = new TObjString(str); tostr = new TObjString(str);
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add run number // add run number
str.Form("%02d - Run Number: %d", count++, fRunNumber); str.Form("%03d - Run Number: %d", count++, fRunNumber);
tostr = new TObjString(str); tostr = new TObjString(str);
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add run start time // add run start time
str.Form("%02d - Run Start Time: %s", count++, fStartTime.AsSQLString()); str.Form("%03d - Run Start Time: %s", count++, fStartTime.AsSQLString());
tostr = new TObjString(str); tostr = new TObjString(str);
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add run stop time // add run stop time
str.Form("%02d - Run Stop Time: %s", count++, fStopTime.AsSQLString()); str.Form("%03d - Run Stop Time: %s", count++, fStopTime.AsSQLString());
tostr = new TObjString(str); tostr = new TObjString(str);
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add laboratory // add laboratory
str.Form("%02d - Laboratory: %s", count++, fLaboratory.Data()); str.Form("%03d - Laboratory: %s", count++, fLaboratory.Data());
tostr = new TObjString(str); tostr = new TObjString(str);
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add area // add area
str.Form("%02d - Area: %s", count++, fArea.Data()); str.Form("%03d - Area: %s", count++, fArea.Data());
tostr = new TObjString(str); tostr = new TObjString(str);
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add instrument // add instrument
str.Form("%02d - Instrument: %s", count++, fInstrument.Data()); str.Form("%03d - Instrument: %s", count++, fInstrument.Data());
tostr = new TObjString(str); tostr = new TObjString(str);
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add muon momentum // add muon momentum
prop = GetProperty("Muon Momentum"); prop = GetProperty("Muon Beam Momentum");
if (prop) { if (prop) {
digit = GetDecimalPlace(prop->GetError()); digit = GetDecimalPlace(prop->GetError());
digit_d = GetLeastSignificantDigit(prop->GetDemand()); digit_d = GetLeastSignificantDigit(prop->GetDemand());
if (prop->GetDescription().CompareTo("n/a")) { if (prop->GetDescription().CompareTo("n/a")) {
fmt.Form("%%02d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf; %%s", digit, digit, digit_d); fmt.Form("%%03d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf; %%s", digit, digit, digit_d);
str.Form(fmt.Data(), count++, prop->GetLabel().Data(), prop->GetValue(), prop->GetError(), str.Form(fmt.Data(), count++, prop->GetLabel().Data(), prop->GetValue(), prop->GetError(),
prop->GetUnit().Data(), prop->GetDemand(), prop->GetDescription().Data()); prop->GetUnit().Data(), prop->GetDemand(), prop->GetDescription().Data());
} else { } else {
fmt.Form("%%02d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf", digit, digit, digit_d); fmt.Form("%%03d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf", digit, digit, digit_d);
str.Form(fmt.Data(), count++, prop->GetLabel().Data(), prop->GetValue(), prop->GetError(), str.Form(fmt.Data(), count++, prop->GetLabel().Data(), prop->GetValue(), prop->GetError(),
prop->GetUnit().Data(), prop->GetDemand()); prop->GetUnit().Data(), prop->GetDemand());
} }
@ -655,18 +662,23 @@ TObjArray* TPsiRunHeader::GetHeader(UInt_t &count)
} }
// add muon species // add muon species
str.Form("%02d - Muon Species: %s", count++, fMuonSpecies.Data()); str.Form("%03d - Muon Species: %s", count++, fMuonSpecies.Data());
tostr = new TObjString(str); tostr = new TObjString(str);
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add setup // add setup
str.Form("%02d - Setup: %s", count++, fSetup.Data()); str.Form("%03d - Setup: %s", count++, fSetup.Data());
tostr = new TObjString(str);
fHeader.AddLast(tostr);
// add comment
str.Form("%03d - Comment: %s", count++, fComment.Data());
tostr = new TObjString(str); tostr = new TObjString(str);
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add sample // add sample
str.Form("%02d - Sample: %s", count++, fSample.Data()); str.Form("%03d - Sample: %s", count++, fSample.Data());
tostr = new TObjString(str); tostr = new TObjString(str);
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
@ -676,11 +688,11 @@ TObjArray* TPsiRunHeader::GetHeader(UInt_t &count)
digit = GetDecimalPlace(prop->GetError()); digit = GetDecimalPlace(prop->GetError());
digit_d = GetLeastSignificantDigit(prop->GetDemand()); digit_d = GetLeastSignificantDigit(prop->GetDemand());
if (prop->GetDescription().CompareTo("n/a")) { if (prop->GetDescription().CompareTo("n/a")) {
fmt.Form("%%02d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf; %%s", digit, digit, digit_d); fmt.Form("%%03d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf; %%s", digit, digit, digit_d);
str.Form(fmt.Data(), count++, prop->GetLabel().Data(), prop->GetValue(), prop->GetError(), str.Form(fmt.Data(), count++, prop->GetLabel().Data(), prop->GetValue(), prop->GetError(),
prop->GetUnit().Data(), prop->GetDemand(), prop->GetDescription().Data()); prop->GetUnit().Data(), prop->GetDemand(), prop->GetDescription().Data());
} else { } else {
fmt.Form("%%02d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf", digit, digit, digit_d); fmt.Form("%%03d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf", digit, digit, digit_d);
str.Form(fmt.Data(), count++, prop->GetLabel().Data(), prop->GetValue(), prop->GetError(), str.Form(fmt.Data(), count++, prop->GetLabel().Data(), prop->GetValue(), prop->GetError(),
prop->GetUnit().Data(), prop->GetDemand()); prop->GetUnit().Data(), prop->GetDemand());
} }
@ -694,11 +706,11 @@ TObjArray* TPsiRunHeader::GetHeader(UInt_t &count)
digit = GetDecimalPlace(prop->GetError()); digit = GetDecimalPlace(prop->GetError());
digit_d = GetLeastSignificantDigit(prop->GetDemand()); digit_d = GetLeastSignificantDigit(prop->GetDemand());
if (prop->GetDescription().CompareTo("n/a")) { if (prop->GetDescription().CompareTo("n/a")) {
fmt.Form("%%02d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf; %%s", digit, digit, digit_d); fmt.Form("%%03d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf; %%s", digit, digit, digit_d);
str.Form(fmt.Data(), count++, prop->GetLabel().Data(), prop->GetValue(), prop->GetError(), str.Form(fmt.Data(), count++, prop->GetLabel().Data(), prop->GetValue(), prop->GetError(),
prop->GetUnit().Data(), prop->GetDemand(), prop->GetDescription().Data()); prop->GetUnit().Data(), prop->GetDemand(), prop->GetDescription().Data());
} else { } else {
fmt.Form("%%02d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf", digit, digit, digit_d); fmt.Form("%%03d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf", digit, digit, digit_d);
str.Form(fmt.Data(), count++, prop->GetLabel().Data(), prop->GetValue(), prop->GetError(), str.Form(fmt.Data(), count++, prop->GetLabel().Data(), prop->GetValue(), prop->GetError(),
prop->GetUnit().Data(), prop->GetDemand()); prop->GetUnit().Data(), prop->GetDemand());
} }
@ -707,12 +719,12 @@ TObjArray* TPsiRunHeader::GetHeader(UInt_t &count)
} }
// add number of histograms // add number of histograms
str.Form("%02d - No of Histos: %d", count++, fNoOfHistos); str.Form("%03d - No of Histos: %d", count++, fNoOfHistos);
tostr = new TObjString(str); tostr = new TObjString(str);
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add histogram names // add histogram names
str.Form("%02d - Histo Names: ", count++); str.Form("%03d - Histo Names: ", count++);
for (UInt_t i=0; i<fHistoName.size()-1; i++) for (UInt_t i=0; i<fHistoName.size()-1; i++)
str += fHistoName[i] + TString("; "); str += fHistoName[i] + TString("; ");
str += fHistoName[fHistoName.size()-1]; str += fHistoName[fHistoName.size()-1];
@ -720,19 +732,19 @@ TObjArray* TPsiRunHeader::GetHeader(UInt_t &count)
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add histogram length // add histogram length
str.Form("%02d - Histo Length: %d", count++, fHistoLength); str.Form("%03d - Histo Length: %d", count++, fHistoLength);
tostr = new TObjString(str); tostr = new TObjString(str);
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add time resolution // add time resolution
digit_d = GetLeastSignificantDigit(GetTimeResolution("ns")); digit_d = GetLeastSignificantDigit(GetTimeResolution("ns"));
fmt.Form("%%02d - Time Resolution: %%.%dlf ns", digit_d); fmt.Form("%%03d - Time Resolution: %%.%dlf ns", digit_d);
str.Form(fmt, count++, GetTimeResolution("ns")); str.Form(fmt, count++, GetTimeResolution("ns"));
tostr = new TObjString(str); tostr = new TObjString(str);
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add time zero bins // add time zero bins
str.Form("%02d - Time Zero Bin: ", count++); str.Form("%03d - Time Zero Bin: ", count++);
for (UInt_t i=0; i<fTimeZeroBin.size()-1; i++) { for (UInt_t i=0; i<fTimeZeroBin.size()-1; i++) {
str += fTimeZeroBin[i]; str += fTimeZeroBin[i];
str += TString("; "); str += TString("; ");
@ -742,7 +754,7 @@ TObjArray* TPsiRunHeader::GetHeader(UInt_t &count)
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add first good bins // add first good bins
str.Form("%02d - First Good Bin: ", count++); str.Form("%03d - First Good Bin: ", count++);
for (UInt_t i=0; i<fFirstGoodBin.size()-1; i++) { for (UInt_t i=0; i<fFirstGoodBin.size()-1; i++) {
str += fFirstGoodBin[i]; str += fFirstGoodBin[i];
str += TString("; "); str += TString("; ");
@ -752,7 +764,7 @@ TObjArray* TPsiRunHeader::GetHeader(UInt_t &count)
fHeader.AddLast(tostr); fHeader.AddLast(tostr);
// add last good bins // add last good bins
str.Form("%02d - Last Good Bin: ", count++); str.Form("%03d - Last Good Bin: ", count++);
for (UInt_t i=0; i<fLastGoodBin.size()-1; i++) { for (UInt_t i=0; i<fLastGoodBin.size()-1; i++) {
str += fLastGoodBin[i]; str += fLastGoodBin[i];
str += TString("; "); str += TString("; ");
@ -763,7 +775,7 @@ TObjArray* TPsiRunHeader::GetHeader(UInt_t &count)
// add red/green mode histogram offsets if present // add red/green mode histogram offsets if present
if (fRedGreenOffset.size() > 0) { if (fRedGreenOffset.size() > 0) {
str.Form("%02d - Red/Green offsets: ", count++); str.Form("%03d - Red/Green offsets: ", count++);
for (UInt_t i=0; i<fRedGreenOffset.size()-1; i++) { for (UInt_t i=0; i<fRedGreenOffset.size()-1; i++) {
str += fRedGreenOffset[i]; str += fRedGreenOffset[i];
str += TString("; "); str += TString("; ");
@ -775,7 +787,7 @@ TObjArray* TPsiRunHeader::GetHeader(UInt_t &count)
// add red/green mode descriptions if present // add red/green mode descriptions if present
if (fRedGreenDescription.size() > 0) { if (fRedGreenDescription.size() > 0) {
str.Form("%02d - Red/Green description: ", count++); str.Form("%03d - Red/Green description: ", count++);
for (UInt_t i=0; i<fRedGreenDescription.size()-1; i++) { for (UInt_t i=0; i<fRedGreenDescription.size()-1; i++) {
str += fRedGreenDescription[i] + TString("; "); str += fRedGreenDescription[i] + TString("; ");
} }
@ -807,17 +819,17 @@ TObjArray* TPsiRunHeader::GetSampleEnv(UInt_t &count)
UInt_t digit=0, digit_d=0; UInt_t digit=0, digit_d=0;
// add cryo // add cryo
str.Form("%02d - Cryo: %s", count++, fSampleCryo.Data()); str.Form("%03d - Cryo: %s", count++, fSampleCryo.Data());
tostr = new TObjString(str); tostr = new TObjString(str);
fSampleEnv.AddLast(tostr); fSampleEnv.AddLast(tostr);
// add insert // add insert
str.Form("%02d - Insert: %s", count++, fSampleCryoInsert.Data()); str.Form("%03d - Insert: %s", count++, fSampleCryoInsert.Data());
tostr = new TObjString(str); tostr = new TObjString(str);
fSampleEnv.AddLast(tostr); fSampleEnv.AddLast(tostr);
// add orientation // add orientation
str.Form("%02d - Orientation: %s", count++, fOrientation.Data()); str.Form("%03d - Orientation: %s", count++, fOrientation.Data());
tostr = new TObjString(str); tostr = new TObjString(str);
fSampleEnv.AddLast(tostr); fSampleEnv.AddLast(tostr);
@ -827,11 +839,11 @@ TObjArray* TPsiRunHeader::GetSampleEnv(UInt_t &count)
digit = GetDecimalPlace(fProperties[i].GetError()); digit = GetDecimalPlace(fProperties[i].GetError());
digit_d = GetLeastSignificantDigit(fProperties[i].GetDemand()); digit_d = GetLeastSignificantDigit(fProperties[i].GetDemand());
if (fProperties[i].GetDescription().CompareTo("n/a")) { if (fProperties[i].GetDescription().CompareTo("n/a")) {
fmt.Form("%%02d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf; %%s", digit, digit, digit_d); fmt.Form("%%03d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf; %%s", digit, digit, digit_d);
str.Form(fmt.Data(), count++, fProperties[i].GetLabel().Data(), fProperties[i].GetValue(), fProperties[i].GetError(), str.Form(fmt.Data(), count++, fProperties[i].GetLabel().Data(), fProperties[i].GetValue(), fProperties[i].GetError(),
fProperties[i].GetUnit().Data(), fProperties[i].GetDemand(), fProperties[i].GetDescription().Data()); fProperties[i].GetUnit().Data(), fProperties[i].GetDemand(), fProperties[i].GetDescription().Data());
} else { } else {
fmt.Form("%%02d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf", digit, digit, digit_d); fmt.Form("%%03d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf", digit, digit, digit_d);
str.Form(fmt.Data(), count++, fProperties[i].GetLabel().Data(), fProperties[i].GetValue(), fProperties[i].GetError(), str.Form(fmt.Data(), count++, fProperties[i].GetLabel().Data(), fProperties[i].GetValue(), fProperties[i].GetError(),
fProperties[i].GetUnit().Data(), fProperties[i].GetDemand()); fProperties[i].GetUnit().Data(), fProperties[i].GetDemand());
} }
@ -863,7 +875,7 @@ TObjArray* TPsiRunHeader::GetMagFieldEnv(UInt_t &count)
UInt_t digit=0, digit_d=0; UInt_t digit=0, digit_d=0;
// add version // add version
str.Form("%02d - Magnet Name: %s", count++, fMagnetName.Data()); str.Form("%03d - Magnet Name: %s", count++, fMagnetName.Data());
tostr = new TObjString(str); tostr = new TObjString(str);
fMagFieldEnv.AddLast(tostr); fMagFieldEnv.AddLast(tostr);
@ -873,11 +885,11 @@ TObjArray* TPsiRunHeader::GetMagFieldEnv(UInt_t &count)
digit = GetDecimalPlace(fProperties[i].GetError()); digit = GetDecimalPlace(fProperties[i].GetError());
digit_d = GetLeastSignificantDigit(fProperties[i].GetDemand()); digit_d = GetLeastSignificantDigit(fProperties[i].GetDemand());
if (fProperties[i].GetDescription().CompareTo("n/a")) { if (fProperties[i].GetDescription().CompareTo("n/a")) {
fmt.Form("%%02d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf; %%s", digit, digit, digit_d); fmt.Form("%%03d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf; %%s", digit, digit, digit_d);
str.Form(fmt.Data(), count++, fProperties[i].GetLabel().Data(), fProperties[i].GetValue(), fProperties[i].GetError(), str.Form(fmt.Data(), count++, fProperties[i].GetLabel().Data(), fProperties[i].GetValue(), fProperties[i].GetError(),
fProperties[i].GetUnit().Data(), fProperties[i].GetDemand(), fProperties[i].GetDescription().Data()); fProperties[i].GetUnit().Data(), fProperties[i].GetDemand(), fProperties[i].GetDescription().Data());
} else { } else {
fmt.Form("%%02d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf", digit, digit, digit_d); fmt.Form("%%03d - %%s: %%.%dlf +- %%.%dlf %%s; SP: %%.%dlf", digit, digit, digit_d);
str.Form(fmt.Data(), count++, fProperties[i].GetLabel().Data(), fProperties[i].GetValue(), fProperties[i].GetError(), str.Form(fmt.Data(), count++, fProperties[i].GetLabel().Data(), fProperties[i].GetValue(), fProperties[i].GetError(),
fProperties[i].GetUnit().Data(), fProperties[i].GetDemand()); fProperties[i].GetUnit().Data(), fProperties[i].GetDemand());
} }
@ -908,7 +920,7 @@ TObjArray* TPsiRunHeader::GetBeamline(UInt_t &count)
TObjString *tostr; TObjString *tostr;
// add version // add version
str.Form("%02d - To Be Defined Yet.", count++); str.Form("%03d - To Be Defined Yet.", count++);
tostr = new TObjString(str); tostr = new TObjString(str);
fBeamline.AddLast(tostr); fBeamline.AddLast(tostr);
@ -934,7 +946,7 @@ TObjArray* TPsiRunHeader::GetScaler(UInt_t &count)
TObjString *tostr; TObjString *tostr;
// add version // add version
str.Form("%02d - To Be Defined Yet.", count++); str.Form("%03d - To Be Defined Yet.", count++);
tostr = new TObjString(str); tostr = new TObjString(str);
fScalers.AddLast(tostr); fScalers.AddLast(tostr);
@ -1031,6 +1043,10 @@ Bool_t TPsiRunHeader::ExtractHeaderInformation(TObjArray *headerInfo, TString pa
idx = str.Index(":"); idx = str.Index(":");
str.Remove(0, idx+2); str.Remove(0, idx+2);
fSetup = str; fSetup = str;
} else if (str.Contains("- Comment: ")) {
idx = str.Index(":");
str.Remove(0, idx+2);
fComment = str;
} else if (str.Contains("- Sample: ")) { } else if (str.Contains("- Sample: ")) {
idx = str.Index(":"); idx = str.Index(":");
str.Remove(0, idx+2); str.Remove(0, idx+2);
@ -1521,12 +1537,25 @@ void TPsiRunHeader::DumpHeader() const
// write instrument // write instrument
cout << endl << setw(name_width) << left << "Instrument" << setw(old_width) << ": " << GetInstrument().Data(); cout << endl << setw(name_width) << left << "Instrument" << setw(old_width) << ": " << GetInstrument().Data();
// write muon momentum
prop = GetProperty("Muon Beam Momentum");
if (prop != 0) {
cout << endl << setw(name_width) << left << prop->GetLabel().Data() << setw(old_width) << ": " << prop->GetValue() << " +- " << prop->GetError() << " " << prop->GetUnit().Data();
cout << "; SP: " << prop->GetDemand();
if (prop->GetDescription().CompareTo("n/a", TString::kIgnoreCase)) {
cout << "; " << prop->GetDescription().Data();
}
}
// write muon species // write muon species
cout << endl << setw(name_width) << left << "Muon Species" << setw(old_width) << ": " << GetMuonSpecies().Data(); cout << endl << setw(name_width) << left << "Muon Species" << setw(old_width) << ": " << GetMuonSpecies().Data();
// write setup // write setup
cout << endl << setw(name_width) << left << "Setup" << setw(old_width) << ": " << GetSetup().Data(); cout << endl << setw(name_width) << left << "Setup" << setw(old_width) << ": " << GetSetup().Data();
// write comment
cout << endl << setw(name_width) << left << "Comment" << setw(old_width) << ": " << GetComment().Data();
// write sample // write sample
cout << endl << setw(name_width) << left << "Sample" << setw(old_width) << ": " << GetSample().Data(); cout << endl << setw(name_width) << left << "Sample" << setw(old_width) << ": " << GetSample().Data();

3
src/tests/PsiRoot/TPsiRunHeader.h
View File

@ -98,6 +98,7 @@ public:
virtual TString GetInstrument() const { return fInstrument; } virtual TString GetInstrument() const { return fInstrument; }
virtual TString GetMuonSpecies() const { return fMuonSpecies; } virtual TString GetMuonSpecies() const { return fMuonSpecies; }
virtual TString GetSetup() const { return fSetup; } virtual TString GetSetup() const { return fSetup; }
virtual TString GetComment() const { return fComment; }
virtual TString GetSample() const { return fSample; } virtual TString GetSample() const { return fSample; }
virtual TString GetOrientation() const { return fOrientation; } virtual TString GetOrientation() const { return fOrientation; }
virtual TString GetSampleCryo() const { return fSampleCryo; } virtual TString GetSampleCryo() const { return fSampleCryo; }
@ -143,6 +144,7 @@ public:
virtual void SetInstrument(TString insturment) { fInstrument = insturment; } virtual void SetInstrument(TString insturment) { fInstrument = insturment; }
virtual void SetMuonSpecies(TString muonSpecies) { fMuonSpecies = muonSpecies; } virtual void SetMuonSpecies(TString muonSpecies) { fMuonSpecies = muonSpecies; }
virtual void SetSetup(TString setup) { fSetup = setup; } virtual void SetSetup(TString setup) { fSetup = setup; }
virtual void SetComment(TString comment) { fComment = comment; }
virtual void SetSample(TString sample) { fSample = sample; } virtual void SetSample(TString sample) { fSample = sample; }
virtual void SetOrientation(TString orientation) { fOrientation = orientation; } virtual void SetOrientation(TString orientation) { fOrientation = orientation; }
virtual void SetSampleCryo(TString cryoName) { fSampleCryo = cryoName; } virtual void SetSampleCryo(TString cryoName) { fSampleCryo = cryoName; }
@ -183,6 +185,7 @@ private:
TString fInstrument; ///< instrument name like: GPS, LEM, .... TString fInstrument; ///< instrument name like: GPS, LEM, ....
TString fMuonSpecies; ///< postive muon or negative muon TString fMuonSpecies; ///< postive muon or negative muon
TString fSetup; ///< setup TString fSetup; ///< setup
TString fComment; ///< additional comment
TString fSample; ///< sample name TString fSample; ///< sample name
TString fOrientation; ///< sample orientation TString fOrientation; ///< sample orientation
TString fSampleCryo; ///< sample cryo TString fSampleCryo; ///< sample cryo

1
src/tests/PsiRoot/psi_runHeader_test.cpp
View File

@ -67,6 +67,7 @@ int main(int argc, char *argv[])
header->AddProperty("Muon Beam Momentum", 28.0, 28.0, 0.7, "MeV/c"); header->AddProperty("Muon Beam Momentum", 28.0, 28.0, 0.7, "MeV/c");
header->SetMuonSpecies("positive Muon"); header->SetMuonSpecies("positive Muon");
header->SetSetup("Konti-4, WEW"); header->SetSetup("Konti-4, WEW");
header->SetComment("This is a comment");
header->SetSample("Eu2CuO4 MOD thin film"); header->SetSample("Eu2CuO4 MOD thin film");
header->AddProperty("Sample Temperature", 30.0, 30.01, 0.05, "K"); header->AddProperty("Sample Temperature", 30.0, 30.01, 0.05, "K");
header->AddProperty("Sample Magnetic Field", 3.0, 3.0003, 0.000025, "T"); header->AddProperty("Sample Magnetic Field", 3.0, 3.0003, 0.000025, "T");