Adding possibility to add a cut on observable parameters in TRestDataSet

source/framework/core/inc/TRestDataSet.h

@@ -76,11 +76,14 @@ class TRestDataSet : public TRestMetadata {
     /// The properties of a relevant quantity that we want to store together with the dataset
     std::map<std::string, RelevantQuantity> fQuantity;  //<
 
+    /// Parameter cuts over the selected dataset
+    std::vector<std::pair<std::string, std::string> > fParamCut;
+
     /// The total integrated run time of selected files
     Double_t fTotalDuration = 0;  //<
 
-    /// The resulting RDataFrame object after initialization
-    ROOT::RDataFrame fDataSet = 0;  //!
+    /// The resulting RDF::RNode object after initialization
+    ROOT::RDF::RNode fDataSet = ROOT::RDataFrame(0);  //!
 
     /// A pointer to the generated tree
     TTree* fTree = nullptr;  //!
@@ -95,7 +98,7 @@ class TRestDataSet : public TRestMetadata {
 
    public:
     /// Gives access to the RDataFrame
-    ROOT::RDataFrame GetDataFrame() const {
+    ROOT::RDF::RNode GetDataFrame() const {
         if (fTree == nullptr) RESTWarning << "DataFrame has not been yet initialized" << RESTendl;
         return fDataSet;
     }

source/framework/core/src/TRestDataSet.cxx

@@ -103,6 +103,10 @@
 ///    // Will add to the final tree only the specific observables
 ///    <observables list="g4Ana_totalEdep:hitsAna_energy" />
 ///
+///    // Will apply a cut to the observables
+///    <cut variable="rawAna_NumberOfGoodSignals" condition=">10" />
+///    <cut variable="rawAna_NumberOfGoodSignals" condition="<100" />
+///
 ///    // Will add all the observables from the process `rawAna`
 ///    <processObservables list="rate:rawAna" />
 ///
@@ -266,7 +270,7 @@ void TRestDataSet::Initialize() {
     if (fFileSelection.empty()) return;
 
     ///// Disentangling process observables --> producing finalList
-    TRestRun run(fFileSelection[0]);
+    TRestRun run(fFileSelection.front());
     std::vector<std::string> finalList;
     finalList.push_back("runOrigin");
     finalList.push_back("eventID");
@@ -284,7 +288,25 @@ void TRestDataSet::Initialize() {
 
     ROOT::EnableImplicitMT();
 
-    fDataSet = ROOT::RDataFrame("AnalysisTree", fFileSelection);
+    ROOT::RDataFrame df("AnalysisTree", fFileSelection);
+
+    std::string pCut = "";
+    for (const auto& [param, cut] : fParamCut) {
+        if (std::find(finalList.begin(), finalList.end(), param) != finalList.end()) {
+            if (!pCut.empty()) pCut += " && ";
+            pCut += param + cut;
+        } else {
+            RESTWarning << " Cut observable " << param << " not found in observable list, skipping..."
+                        << RESTendl;
+        }
+    }
+
+    if (!pCut.empty()) {
+        RESTDebug << "Applying cut " << pCut << RESTendl;
+        fDataSet = df.Filter(pCut);
+    } else {
+        fDataSet = df;
+    }
 
     std::string user = getenv("USER");
     std::string fOutName = "/tmp/rest_output_" + user + ".root";
@@ -562,6 +584,25 @@ void TRestDataSet::InitFromConfigFile() {
 
         quantityDefinition = GetNextElement(quantityDefinition);
     }
+
+    TiXmlElement* cutDefinition = GetElement("cut");
+    while (cutDefinition != nullptr) {
+        std::string variable = GetFieldValue("variable", cutDefinition);
+        if (variable.empty() || variable == "Not defined") {
+            RESTError << "< paramCut variable key does not contain a name!" << RESTendl;
+            exit(1);
+        }
+
+        std::string condition = GetFieldValue("condition", cutDefinition);
+        if (condition.empty() || condition == "Not defined") {
+            RESTError << "< paramCut condition key does not contain a metadata value!" << RESTendl;
+            exit(1);
+        }
+
+        fParamCut.push_back(std::make_pair(variable, condition));
+
+        cutDefinition = GetNextElement(cutDefinition);
+    }
 }
 
 ///////////////////////////////////////////////