Merge pull request #265 from rest-for-physics/jgalan_metadata_fixes

Fixing metadata retrieval from entries that contain chidren at TRestRun and TRestProcessRunner
rest-for-physics · Jul 13, 2022 · f6874df · f6874df
2 parents 0829d5f + 43506a4
commit f6874df
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/source/framework/core/src/TRestMetadata.cxx b/source/framework/core/src/TRestMetadata.cxx
@@ -702,9 +702,11 @@ TRestMetadata* TRestMetadata::InstantiateChildMetadata(int index, std::string pa
             if (pattern == "" || xmlChild.find(pattern) != string::npos) {
                 if (count == index) {
                     TClass* c = TClass::GetClass(xmlChild.c_str());
-                    if (c)  // this means we have the metadata class was found
+                    if (c)  // this means that the metadata class was found
                     {
                         TRestMetadata* md = (TRestMetadata*)c->New();
+                        if (!md) return nullptr;
+                        md->SetConfigFile(fConfigFileName);
                         TiXmlElement* rootEle = GetElementFromFile(fConfigFileName);
                         TiXmlElement* Global = GetElement("globals", rootEle);
                         md->LoadConfigFromElement(paraele, Global, {});

diff --git a/source/framework/core/src/TRestProcessRunner.cxx b/source/framework/core/src/TRestProcessRunner.cxx
@@ -37,8 +37,6 @@
 #include "unistd.h"
 #endif  // !WIN32
 
-
-
 std::mutex mutex_write;
 
 using namespace std;
@@ -689,8 +687,7 @@ void TRestProcessRunner::PauseMenu() {
             fProcStatus = kNormal;
             RESTInfo << "Continue processing..." << RESTendl;
 
-#endif // WIN32
-
+#endif  // WIN32
 
             break;
         } else if (b == 'n') {
@@ -1019,6 +1016,7 @@ TRestEventProcess* TRestProcessRunner::InstantiateProcess(TString type, TiXmlEle
     TRestEventProcess* pc = REST_Reflection::Assembly((string)type);
     if (pc == nullptr) return nullptr;
 
+    pc->SetConfigFile(fConfigFileName);
     pc->SetRunInfo(this->fRunInfo);
     pc->SetHostmgr(fHostmgr);
     pc->SetObservableValidation(fValidateObservables);

diff --git a/source/framework/core/src/TRestRun.cxx b/source/framework/core/src/TRestRun.cxx
@@ -322,6 +322,7 @@ void TRestRun::InitFromConfigFile() {
                 e = e->NextSiblingElement();
                 continue;
             }
+            meta->SetConfigFile(fConfigFileName);
             meta->SetHostmgr(fHostmgr);
             fMetadata.push_back(meta);
             meta->LoadConfigFromElement(e, fElementGlobal);