Merge pull request #165 from rest-for-physics/nkx111-patch-2

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

Author: nkx111

source/framework/core/inc/TRestRun.h

@@ -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);
@@ -239,7 +241,7 @@ class TRestRun : public TRestMetadata {
 
     // Construtor & Destructor
     TRestRun();
-    TRestRun(string rootfilename);
+    TRestRun(string filename);
     ~TRestRun();
 
     ClassDef(TRestRun, 4);

source/framework/core/src/TRestRun.cxx

@@ -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() {