TRestDataSet. Now observables separator is a comma

rest-for-physics · Dec 12, 2022 · b388349 · b388349
1 parent 467a25c
commit b388349
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/examples/dataset.rml b/examples/dataset.rml
@@ -5,9 +5,9 @@
     <parameter name="filePattern" value="../../framework-data/pipeline/dataset/BabyIAXO_TrueWolterMicromegasTest*.root"/>
     <filter metadata="TRestRun::fRunNumber" greaterThan="370" lowerThan="375"/>
     <filter metadata="TRestRun::fRunTag" contains="Test"/>
-    <observables list="window_transmission:optics_efficiency:axionPhoton_probability:axionPhoton_transmission:boreExitGate_transmission"/>
+    <observables list="window_transmission,optics_efficiency,axionPhoton_probability,axionPhoton_transmission,boreExitGate_transmission"/>
     <processObservables list="final"/>
-    <quantity name="Nsim" metadata="TRestProcessRunner::fEventsToProcess" strategy="accumulate" description="The total number of simulated events."/>
-    <quantity name="SolarFlux" metadata="TRestAxionGeneratorProcess::fTotalFlux" strategy="unique" description="The integrated solar flux at earth (in cm-2 s-1) at the given energy range."/>
-    <quantity name="GeneratorArea" metadata="3.1416 * axGen::fTargetRadius * axGen::fTargetRadius" strategy="unique" description="The area where the generator launched events (in mm2)."/>
+    <quantity name="Nsim" metadata="[TRestProcessRunner::fEventsToProcess]" strategy="accumulate" description="The total number of simulated events."/>
+    <quantity name="SolarFlux" metadata="[axionGen-&gt;fTotalFlux]" strategy="unique" description="The integrated solar flux at earth (in cm-2 s-1) at the given energy range."/>
+    <quantity name="GeneratorArea" metadata="3.1416 * [axionGen::fTargetRadius]/10 * [axionGen::fTargetRadius]/10" strategy="unique" description="The area where the generator launched events (in cm2)."/>
 </TRestDataSet>
diff --git a/source/framework/core/src/TRestDataSet.cxx b/source/framework/core/src/TRestDataSet.cxx
@@ -506,7 +506,7 @@ void TRestDataSet::InitFromConfigFile() {
             exit(1);
         }
 
-        std::vector<std::string> obsList = REST_StringHelper::Split(observables, ":");
+        std::vector<std::string> obsList = REST_StringHelper::Split(observables, ",");
 
         for (const auto& l : obsList) fObservablesList.push_back(l);
 
@@ -522,7 +522,7 @@ void TRestDataSet::InitFromConfigFile() {
             exit(1);
         }
 
-        std::vector<std::string> obsList = REST_StringHelper::Split(observables, ":");
+        std::vector<std::string> obsList = REST_StringHelper::Split(observables, ",");
 
         for (const auto& l : obsList) fProcessObservablesList.push_back(l);