Fix on TRestMetadata and TRestDataSet add-ons

macros/REST_GenerateDataSet.C

@@ -0,0 +1,29 @@
+#include "TRestDataSet.h"
+#include "TRestTask.h"
+
+#ifndef RestTask_GenerateDataSet
+#define RestTask_GenerateDataSet
+
+//*******************************************************************************************************
+//*** Description: This macro will launch the generation of datasets defined
+//*** inside a particular RML file `datasets.rml` that contains the dataset
+//*** definitions. The second argument will allow to specify the datasets
+//*** to be generated from the existing ones inside `dataset.rml`.
+//***
+//*** --------------
+//*** Usage: restManager GenerateDataSet datasets.rml set1,set2,set3
+//***
+//*******************************************************************************************************
+
+Int_t REST_GenerateDataSet(std::string inputRML, std::string datasets) {
+    std::vector<std::string> sets = REST_StringHelper::Split(datasets, ",");
+
+    for (const auto& set : sets) {
+        std::cout << "Set : " << set << std::endl;
+        TRestDataSet d(inputRML.c_str(), set.c_str());
+        d.GenerateDataSet();
+        d.Export("dataset_" + set + ".root");
+    }
+    return 0;
+}
+#endif

source/framework/core/inc/TRestDataSet.h

@@ -65,7 +65,7 @@ class TRestDataSet : public TRestMetadata {
     /// A list of metadata members where filters will be applied
     std::vector<std::string> fFilterMetadata;  //<
 
-    /// If not empty it will check if the metadata member contains the value
+    /// If not empty it will check if the metadata member contains the string
     std::vector<std::string> fFilterContains;  //<
 
     /// If the corresponding element is not empty it will check if the metadata member is greater
@@ -74,6 +74,9 @@ class TRestDataSet : public TRestMetadata {
     /// If the corresponding element is not empty it will check if the metadata member is lower
     std::vector<Double_t> fFilterLowerThan;  //<
 
+    /// If the corresponding element is not empty it will check if the metadata member is equal
+    std::vector<Double_t> fFilterEqualsTo;  //<
+
     /// The properties of a relevant quantity that we want to store together with the dataset
     std::map<std::string, RelevantQuantity> fQuantity;  //<
 
@@ -116,7 +119,7 @@ class TRestDataSet : public TRestMetadata {
     TTree* GetTree() const {
         if (fTree == nullptr) {
             RESTError << "Tree has not been yet initialized" << RESTendl;
-            RESTError << "You should invoke TRestDataSet::Initialize() before trying to access the tree"
+            RESTError << "You should invoke TRestDataSet::GenerateDataSet() before trying to access the tree"
                       << RESTendl;
         }
         return fTree;
@@ -145,6 +148,7 @@ class TRestDataSet : public TRestMetadata {
     inline auto GetFilterContains() const { return fFilterContains; }
     inline auto GetFilterGreaterThan() const { return fFilterGreaterThan; }
     inline auto GetFilterLowerThan() const { return fFilterLowerThan; }
+    inline auto GetFilterEqualsTo() const { return fFilterEqualsTo; }
     inline auto GetQuantity() const { return fQuantity; }
     inline auto GetCut() const { return fCut; }
 

source/framework/core/src/TRestDataSet.cxx

@@ -273,7 +273,8 @@ void TRestDataSet::Initialize() { SetSectionName(this->ClassName()); }
 ///
 void TRestDataSet::GenerateDataSet() {
     if (fTree != nullptr) {
-        RESTWarning << "Tree has already been loaded. Skipping TRestDataSet::Initialize ... " << RESTendl;
+        RESTWarning << "Tree has already been loaded. Skipping TRestDataSet::GenerateDataSet ... "
+                    << RESTendl;
         return;
     }
 
@@ -378,6 +379,9 @@ std::vector<std::string> TRestDataSet::FileSelection() {
             if (fFilterLowerThan[n] != -1)
                 if (StringToDouble(mdValue) >= fFilterLowerThan[n]) accept = false;
 
+            if (fFilterEqualsTo[n] != -1)
+                if (StringToDouble(mdValue) != fFilterEqualsTo[n]) accept = false;
+
             n++;
         }
 
@@ -511,6 +515,7 @@ void TRestDataSet::PrintMetadata() {
             if (!fFilterContains[n].empty()) RESTMetadata << " Contains: " << fFilterContains[n];
             if (fFilterGreaterThan[n] != -1) RESTMetadata << " Greater than: " << fFilterGreaterThan[n];
             if (fFilterLowerThan[n] != -1) RESTMetadata << " Lower than: " << fFilterLowerThan[n];
+            if (fFilterEqualsTo[n] != -1) RESTMetadata << " Equals to: " << fFilterEqualsTo[n];
 
             RESTMetadata << RESTendl;
             n++;
@@ -559,10 +564,12 @@ void TRestDataSet::InitFromConfigFile() {
         if (contains == "Not defined") contains = "";
         Double_t greaterThan = StringToDouble(GetFieldValue("greaterThan", filterDefinition));
         Double_t lowerThan = StringToDouble(GetFieldValue("lowerThan", filterDefinition));
+        Double_t equalsTo = StringToDouble(GetFieldValue("equalsTo", filterDefinition));
 
         fFilterContains.push_back(contains);
         fFilterGreaterThan.push_back(greaterThan);
         fFilterLowerThan.push_back(lowerThan);
+        fFilterEqualsTo.push_back(equalsTo);
 
         filterDefinition = GetNextElement(filterDefinition);
     }
@@ -688,6 +695,7 @@ void TRestDataSet::Export(const std::string& filename) {
                 if (!fFilterContains[n].empty()) fprintf(f, " Contains: %s.", fFilterContains[n].c_str());
                 if (fFilterGreaterThan[n] != -1) fprintf(f, " Greater than: %6.3lf.", fFilterGreaterThan[n]);
                 if (fFilterLowerThan[n] != -1) fprintf(f, " Lower than: %6.3lf.", fFilterLowerThan[n]);
+                if (fFilterEqualsTo[n] != -1) fprintf(f, " Equals to: %6.3lf.", fFilterLowerThan[n]);
                 fprintf(f, "\n");
                 n++;
             }
@@ -763,6 +771,7 @@ TRestDataSet& TRestDataSet::operator=(TRestDataSet& dS) {
     fFilterContains = dS.GetFilterContains();
     fFilterGreaterThan = dS.GetFilterGreaterThan();
     fFilterLowerThan = dS.GetFilterLowerThan();
+    fFilterEqualsTo = dS.GetFilterEqualsTo();
     fQuantity = dS.GetQuantity();
     fTotalDuration = dS.GetTotalTimeInSeconds();
     fCut = dS.GetCut();

source/framework/core/src/TRestMetadata.cxx

@@ -2327,6 +2327,8 @@ std::vector<string> TRestMetadata::GetDataMemberValues(string memberName, Int_t
 
     result = Replace(result, "{", "");
     result = Replace(result, "}", "");
+    result = Replace(result, "(", "");
+    result = Replace(result, ")", "");
 
     std::vector<std::string> results = REST_StringHelper::Split(result, ",");