Remove redundant configurables in D* selector

Author: Marcellocosti

PWGHF/TableProducer/candidateSelectorDstarToD0Pi.cxx

@@ -99,18 +99,11 @@ struct HfCandidateSelectorDstarToD0Pi {
   Configurable<std::vector<std::string>> namesInputFeatures{"namesInputFeatures", std::vector<std::string>{"feature1", "feature2"}, "Names of ML model input features"};
   // ML inference D0
   Configurable<bool> applyMlD0Daug{"applyMlD0Daug", false, "Flag to apply ML selections on D0 daughter"};
-  Configurable<std::vector<double>> binsPtMlD0Daug{"binsPtMlD0Daug", std::vector<double>{hf_cuts_ml::vecBinsPt}, "pT bin limits for ML application on D0 daughter"};
-  Configurable<std::vector<int>> cutDirMlD0Daug{"cutDirMlD0Daug", std::vector<int>{hf_cuts_ml::vecCutDir}, "Whether to reject score values greater or smaller than the threshold on D0 daughter"};
-  Configurable<LabeledArray<double>> cutsMlD0Daug{"cutsMlD0Daug", {hf_cuts_ml::Cuts[0], hf_cuts_ml::NBinsPt, hf_cuts_ml::NCutScores, hf_cuts_ml::labelsPt, hf_cuts_ml::labelsCutScore}, "ML selections per pT bin on D0 daughter"};
-  Configurable<int> nClassesMlD0Daug{"nClassesMlD0Daug", static_cast<int>(hf_cuts_ml::NCutScores), "Number of classes in ML model on D0 daughter"};
-  Configurable<std::vector<std::string>> namesInputFeaturesD0Daug{"namesInputFeaturesD0Daug", std::vector<std::string>{"feature1", "feature2"}, "Names of ML model input features on D0 daughter"};
 
   // CCDB configuration
   Configurable<std::string> ccdbUrl{"ccdbUrl", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
   Configurable<std::vector<std::string>> modelPathsCCDB{"modelPathsCCDB", std::vector<std::string>{""}, "Paths of models on CCDB"};
-  Configurable<std::vector<std::string>> modelPathsCCDBD0Daug{"modelPathsCCDBD0Daug", std::vector<std::string>{""}, "Paths of models on CCDB for D0 daughter"};
   Configurable<std::vector<std::string>> onnxFileNames{"onnxFileNames", std::vector<std::string>{"Model.onnx"}, "ONNX file names for each pT bin (if not from CCDB full path)"};
-  Configurable<std::vector<std::string>> onnxFileNamesD0Daug{"onnxFileNamesD0Daug", std::vector<std::string>{"Model.onnx"}, "ONNX file names for each pT bin (if not from CCDB full path) for D0 daughter"};
   Configurable<int64_t> timestampCCDB{"timestampCCDB", -1, "timestamp of the ONNX file for ML model used to query in CCDB"};
   Configurable<bool> loadModelsFromCCDB{"loadModelsFromCCDB", false, "Flag to enable or disable the loading of models from CCDB"};
 
@@ -119,16 +112,13 @@ struct HfCandidateSelectorDstarToD0Pi {
 
   HfHelper hfHelper;
   o2::analysis::HfMlResponseDstarToD0Pi<float> hfMlResponse;
-  o2::analysis::HfMlResponseDstarToD0Pi<float> hfMlResponseD0Daughter;
   std::vector<float> outputMlDstarToD0Pi = {};
-  std::vector<float> outputMlD0ToKPi = {};
   o2::ccdb::CcdbApi ccdbApi;
 
   TrackSelectorPi selectorPion;
   TrackSelectorKa selectorKaon;
 
   using TracksSel = soa::Join<aod::TracksWDcaExtra, aod::TracksPidPi, aod::PidTpcTofFullPi, aod::TracksPidKa, aod::PidTpcTofFullKa>;
-  // using TracksSel = soa::Join<aod::Tracks, aod::TracksPidPi, aod::TracksPidKa>;
   using HfFullDstarCandidate = soa::Join<aod::HfD0FromDstar, aod::HfCandDstarsWPid>;
 
   AxisSpec axisBdtScore{100, 0.f, 1.f};
@@ -165,14 +155,14 @@ struct HfCandidateSelectorDstarToD0Pi {
         registry.get<TH2>(HIST("QA/hSelections"))->GetXaxis()->SetBinLabel(iBin + 1, labels[iBin].data());
       }
 
-      if (applyMl) {
+      if (applyMl || applyMlD0Daug) {
         registry.add("QA/hBdtScore1VsStatus", ";BDT score", {HistType::kTH1F, {axisBdtScore}});
         registry.add("QA/hBdtScore2VsStatus", ";BDT score", {HistType::kTH1F, {axisBdtScore}});
         registry.add("QA/hBdtScore3VsStatus", ";BDT score", {HistType::kTH1F, {axisBdtScore}});
       }
     }
 
-    if (applyMl) {
+    if (applyMl || applyMlD0Daug) {
       hfMlResponse.configure(binsPtMl, cutsMl, cutDirMl, nClassesMl);
       if (loadModelsFromCCDB) {
         ccdbApi.init(ccdbUrl);
@@ -183,18 +173,6 @@ struct HfCandidateSelectorDstarToD0Pi {
       hfMlResponse.cacheInputFeaturesIndices(namesInputFeatures);
       hfMlResponse.init();
     }
-
-    if (applyMlD0Daug) {
-      hfMlResponseD0Daughter.configure(binsPtMlD0Daug, cutsMlD0Daug, cutDirMlD0Daug, nClassesMlD0Daug);
-      if (loadModelsFromCCDB) {
-        ccdbApi.init(ccdbUrl);
-        hfMlResponseD0Daughter.setModelPathsCCDB(onnxFileNamesD0Daug, ccdbApi, modelPathsCCDBD0Daug, timestampCCDB);
-      } else {
-        hfMlResponseD0Daughter.setModelPathsLocal(onnxFileNamesD0Daug);
-      }
-      hfMlResponseD0Daughter.cacheInputFeaturesIndices(namesInputFeaturesD0Daug);
-      hfMlResponseD0Daughter.init();
-    }
   }
 
   /// Conjugate-independent topological cuts on D0
@@ -258,14 +236,6 @@ struct HfCandidateSelectorDstarToD0Pi {
       return false;
     }
 
-    if (applyMlD0Daug) {
-      outputMlD0ToKPi.clear();
-      std::vector<float> inputFeaturesD0 = hfMlResponseD0Daughter.getInputFeaturesTrigger(candidate);
-      bool isSelectedMlD0 = hfMlResponseD0Daughter.isSelectedMl(inputFeaturesD0, candpT, outputMlD0ToKPi);
-      if (!isSelectedMlD0) {
-        return false;
-      }
-    }
     return true;
   }
 
@@ -404,7 +374,7 @@ struct HfCandidateSelectorDstarToD0Pi {
 
       if (!TESTBIT(candDstar.hfflag(), aod::hf_cand_2prong::DecayType::D0ToPiK)) {
         hfSelDstarCandidate(statusDstar, statusD0Flag, statusTopol, statusCand, statusPID);
-        if (applyMl) {
+        if (applyMl || applyMlD0Daug) {
           hfMlDstarCandidate(outputMlDstarToD0Pi);
         }
         if (activateQA) {
@@ -420,7 +390,7 @@ struct HfCandidateSelectorDstarToD0Pi {
 
       if (!selectionDstar(candDstar)) {
         hfSelDstarCandidate(statusDstar, statusD0Flag, statusTopol, statusCand, statusPID);
-        if (applyMl) {
+        if (applyMl || applyMlD0Daug) {
           hfMlDstarCandidate(outputMlDstarToD0Pi);
         }
         continue;
@@ -433,7 +403,7 @@ struct HfCandidateSelectorDstarToD0Pi {
       bool topoDstar = selectionTopolConjugate(candDstar);
       if (!topoDstar) {
         hfSelDstarCandidate(statusDstar, statusD0Flag, statusTopol, statusCand, statusPID);
-        if (applyMl) {
+        if (applyMl || applyMlD0Daug) {
           hfMlDstarCandidate(outputMlDstarToD0Pi);
         }
         continue;
@@ -481,7 +451,7 @@ struct HfCandidateSelectorDstarToD0Pi {
 
       if (pidDstar == 0) {
         hfSelDstarCandidate(statusDstar, statusD0Flag, statusTopol, statusCand, statusPID);
-        if (applyMl) {
+        if (applyMl || applyMlD0Daug) {
           hfMlDstarCandidate(outputMlDstarToD0Pi);
         }
         continue;
@@ -496,11 +466,16 @@ struct HfCandidateSelectorDstarToD0Pi {
       }
       statusPID = true;
 
-      if (applyMl) {
+      if (applyMl || applyMlD0Daug) {
         // ML selections
         bool isSelectedMlDstar = false;
 
-        std::vector<float> inputFeatures = hfMlResponse.getInputFeatures(candDstar);
+        std::vector<float> inputFeatures{};
+        if (applyMlD0Daug) {
+          inputFeatures = hfMlResponse.getInputFeaturesTrigger(candDstar);
+        } else {
+          inputFeatures = hfMlResponse.getInputFeatures(candDstar);
+        }
         isSelectedMlDstar = hfMlResponse.isSelectedMl(inputFeatures, ptCand, outputMlDstarToD0Pi);
 
         hfMlDstarCandidate(outputMlDstarToD0Pi);