Skip to content

TRestRun::TRestRun(string) constructor supports both root file and rml file initialization. #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nkx111 merged 5 commits into from
Mar 28, 2022
Merged

TRestRun::TRestRun(string) constructor supports both root file and rml file initialization. #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
afcde57
Update TRestRun.h
nkx111 Mar 25, 2022
63fa89b
TRestRun::TRestRun(string) supports both root file and rml file
nkx111 Mar 25, 2022
a3f0b6f
Update TRestRun.cxx
jgalan Mar 25, 2022
4183d1a
remove the use of ferr that may cause the garfield problem
nkx111 Mar 26, 2022
3e629ab
TRestRun constructor. Fixing typo
jgalan Mar 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions source/framework/core/inc/TRestRun.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,15 @@ class TRestRun : public TRestMetadata {
int fEventIndexCounter = 0; //!
bool fHangUpEndFile = false; //!
bool fFromRML = false; //!

void InitFromConfigFile();

private:
string ReplaceMetadataMember(const string instr);

public:
/// REST run class
void Initialize();
void InitFromConfigFile();

// file operation
void OpenInputFile(int i);
Expand Down Expand Up @@ -239,7 +241,7 @@ class TRestRun : public TRestMetadata {

// Construtor & Destructor
TRestRun();
TRestRun(string rootfilename);
TRestRun(string filename);
~TRestRun();

ClassDef(TRestRun, 4);
Expand Down
13 changes: 10 additions & 3 deletions source/framework/core/src/TRestRun.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,16 @@ ClassImp(TRestRun);

TRestRun::TRestRun() { Initialize(); }

TRestRun::TRestRun(string rootfilename) {
Initialize();
OpenInputFile(rootfilename);
TRestRun::TRestRun(string filename) {
if (filename.find(".root") != string::npos) {
Initialize();
OpenInputFile(filename);
} else if (filename.find(".rml") != string::npos) {
Initialize();
LoadConfigFromFile(filename);
} else {
ferr << "TRestRun::TRestRun(): input file error!" << endl;
}
}

TRestRun::~TRestRun() {
Expand Down