TRestEventProcess::InitFromConfigFile. Now mathematical expressions are also evaluated

jgalan · jgalan · commit 1f4a11a2d5be · 2021-07-13T10:35:27.000+02:00
diff --git a/source/framework/core/inc/TRestEventProcess.h b/source/framework/core/inc/TRestEventProcess.h
@@ -168,7 +168,8 @@ class TRestEventProcess : public TRestMetadata {
     virtual void InitFromConfigFile() {
         map<string, string> parameters = GetParametersList();
 
-        for (auto& p : parameters) p.second = fRunInfo->ReplaceMetadataMembers(p.second);
+        for (auto& p : parameters)
+            p.second = ReplaceMathematicalExpressions(fRunInfo->ReplaceMetadataMembers(p.second));
 
         ReadParametersList(parameters);
     }

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,8 @@ class TRestEventProcess : public TRestMetadata {`
`168`	`168`	`virtual void InitFromConfigFile() {`
`169`	`169`	`map<string, string> parameters = GetParametersList();`
`170`	`170`
`171`		`- for (auto& p : parameters) p.second = fRunInfo->ReplaceMetadataMembers(p.second);`
	`171`	`+ for (auto& p : parameters)`
	`172`	`+ p.second = ReplaceMathematicalExpressions(fRunInfo->ReplaceMetadataMembers(p.second));`
`172`	`173`
`173`	`174`	`ReadParametersList(parameters);`
`174`	`175`	`}`