Merge pull request #32 from alibuild/alibot-cleanup-12242

gianniliveraro · web-flow · commit 46d1da196595 · 2025-07-25T07:14:09.000-03:00
Please consider the following formatting changes to #12242
diff --git a/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx b/PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx
@@ -32,25 +32,28 @@
 //  -- v0builderopts ......: V0-specific building options (topological, deduplication, etc)
 //  -- cascadebuilderopts .: cascade-specific building options (topological, etc)
 
-#include <string>
-#include <vector>
-
-#include "Framework/DataSpecUtils.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "TableHelper.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
+
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/Utils/strangenessBuilderHelper.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
+
 #include "Common/Core/TPCVDriftManager.h"
+#include "Common/DataModel/PIDResponse.h"
 #include "Tools/ML/MlResponse.h"
 #include "Tools/ML/model.h"
 
+#include "CCDB/BasicCCDBManager.h"
+#include "DataFormatsParameters/GRPMagField.h"
+#include "DataFormatsParameters/GRPObject.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/DataSpecUtils.h"
+#include "Framework/runDataProcessing.h"
+
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::ml;
@@ -159,8 +162,8 @@ struct StrangenessBuilder {
   // helper object
   o2::pwglf::strangenessBuilderHelper straHelper;
 
-  // ML model  
-  o2::ml::OnnxModel deduplication_bdt; 
+  // ML model
+  o2::ml::OnnxModel deduplication_bdt;
 
   // table index : match order above
   enum tableIndex { kV0Indices = 0,
@@ -302,27 +305,27 @@ struct StrangenessBuilder {
 
   struct : ConfigurableGroup {
     std::string prefix = "DeduplicationOpts";
-    
+
     Configurable<int> deduplicationAlgorithm{"deduplicationAlgorithm", 1,
-                                              "0: disabled;" 
-                                              "1: best pointing angle wins;" 
-                                              "2: best DCA daughters wins;" 
-                                              "3: best pointing and best DCA wins;"
-                                              "4: best BDT score wins;"
-                                              "5: selects on PA (not a winner takes it all approach!);"
-                                              "6: selects on BDT score (not a winner takes it all approach!)"};
-
-    // BDT settings                                              
+                                             "0: disabled;"
+                                             "1: best pointing angle wins;"
+                                             "2: best DCA daughters wins;"
+                                             "3: best pointing and best DCA wins;"
+                                             "4: best BDT score wins;"
+                                             "5: selects on PA (not a winner takes it all approach!);"
+                                             "6: selects on BDT score (not a winner takes it all approach!)"};
+
+    // BDT settings
     Configurable<std::string> BDTLocalPath{"BDTLocalPath", "Deduplication_BDTModel.onnx", "(std::string) Path to the local .onnx file."};
     Configurable<std::string> BDTPathCCDB{"BDTPathCCDB", "Users/g/gsetouel/MLModels2", "Path on CCDB"};
     Configurable<int64_t> timestampCCDB{"timestampCCDB", -1, "timestamp of the ONNX file for ML model used to query in CCDB.  Exceptions: > 0 for the specific timestamp, 0 gets the run dependent timestamp"};
     Configurable<bool> loadModelsFromCCDB{"loadModelsFromCCDB", false, "Flag to enable or disable the loading of models from CCDB"};
-    Configurable<bool> enableOptimizations{"enableOptimizations", false, "Enables the ONNX extended model-optimization: sessionOptions.SetGraphOptimizationLevel(GraphOptimizationLevel::ORT_ENABLE_EXTENDED)"};    
-    
+    Configurable<bool> enableOptimizations{"enableOptimizations", false, "Enables the ONNX extended model-optimization: sessionOptions.SetGraphOptimizationLevel(GraphOptimizationLevel::ORT_ENABLE_EXTENDED)"};
+
     // Selection based duplicates removal
     Configurable<float> PAthreshold{"PAthreshold", 0.02, "PA cut to remove duplicates."};
     Configurable<float> BDTthreshold{"BDTthreshold", 0.7, "BDT score cut to remove duplicates."};
-    
+
   } DeduplicationOpts;
 
   // V0 buffer for V0s used in cascades: master switch
@@ -545,14 +548,14 @@ struct StrangenessBuilder {
     int mcParticleBachelor;
   };
   mcCascinfo thisCascInfo;
-  //*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*      
+  //*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*
   // Helper structure to save v0 duplicates auxiliary info
-  struct V0DuplicateExtra {    
+  struct V0DuplicateExtra {
     bool isBestPA;
     bool isBestDCADau;
     bool isBestMLScore;
     bool isBuildOk;
-    float PA;    
+    float PA;
     float V0DCAToPVz;
     float V0zVtx;
     float MLScore;
@@ -635,14 +638,14 @@ struct StrangenessBuilder {
       hFindable->GetXaxis()->SetBinLabel(6, "Cascades with collId -1");
     }
 
-    if (DeduplicationOpts.deduplicationAlgorithm.value > 0){
+    if (DeduplicationOpts.deduplicationAlgorithm.value > 0) {
       histos.add("DeduplicationQA/hMLScore", "hMLScore", kTH1F, {{200, 0.0f, 1.0f}});
       histos.add("DeduplicationQA/hPA", "hPA", kTH1F, {{200, 0.0f, 0.4f}});
       histos.add("DeduplicationQA/hBestPA", "hBestPA", kTH1F, {{200, 0.0f, 0.4f}});
       histos.add("DeduplicationQA/hBestDCADau", "hBestDCADau", kTH1F, {{200, -10.0f, 10.0f}});
       histos.add("DeduplicationQA/hBestMLScore", "hBestMLScore", kTH1F, {{200, 0.0f, 1.0f}});
     }
-    
+
     auto hPrimaryV0s = histos.add<TH1>("hPrimaryV0s", "hPrimaryV0s", kTH1D, {{2, -0.5f, 1.5f}});
     hPrimaryV0s->GetXaxis()->SetBinLabel(1, "All V0s");
     hPrimaryV0s->GetXaxis()->SetBinLabel(2, "Primary V0s");
@@ -764,22 +767,21 @@ struct StrangenessBuilder {
     straHelper.cascadeselections.lambdaMassWindow = cascadeBuilderOpts.lambdaMassWindow;
     straHelper.cascadeselections.maxDaughterEta = cascadeBuilderOpts.maxDaughterEta;
 
-        // Loading BDT model
-    if (DeduplicationOpts.deduplicationAlgorithm.value==4 || DeduplicationOpts.deduplicationAlgorithm.value==6){
-      if (DeduplicationOpts.loadModelsFromCCDB) { 
-        
+    // Loading BDT model
+    if (DeduplicationOpts.deduplicationAlgorithm.value == 4 || DeduplicationOpts.deduplicationAlgorithm.value == 6) {
+      if (DeduplicationOpts.loadModelsFromCCDB) {
+
         /// Fetching model for specific timestamp
         LOG(info) << "Fetching model for timestamp: " << DeduplicationOpts.timestampCCDB.value;
-        
+
         bool retrieveSuccess = ccdbApi.retrieveBlob(DeduplicationOpts.BDTPathCCDB.value, ".", metadata, DeduplicationOpts.timestampCCDB.value, false, DeduplicationOpts.BDTLocalPath.value);
         if (retrieveSuccess) {
           deduplication_bdt.initModel(DeduplicationOpts.BDTLocalPath.value, DeduplicationOpts.enableOptimizations.value);
         } else {
           LOG(fatal) << "Error encountered while fetching/loading the Gamma model from CCDB! Maybe the model doesn't exist yet for this runnumber/timestamp?";
         }
-      }
-      else{
-        deduplication_bdt.initModel(DeduplicationOpts.BDTLocalPath.value, DeduplicationOpts.enableOptimizations.value);      
+      } else {
+        deduplication_bdt.initModel(DeduplicationOpts.BDTLocalPath.value, DeduplicationOpts.enableOptimizations.value);
       }
     }
   }
@@ -799,35 +801,36 @@ struct StrangenessBuilder {
   }
 
   // Simple function to rank vectors based on values
-  std::vector<int> rankSort(const std::vector<float>& v_temp, bool descending = false) {
+  std::vector<int> rankSort(const std::vector<float>& v_temp, bool descending = false)
+  {
     std::vector<std::pair<float, size_t>> v_sort(v_temp.size());
 
     // Pair each value with its original index
     for (size_t i = 0U; i < v_temp.size(); ++i) {
-        v_sort[i] = std::make_pair(v_temp[i], i);
+      v_sort[i] = std::make_pair(v_temp[i], i);
     }
 
     // Sort by value - ascending: lowest gets rank 1, descending: highest gets rank 1
 
     if (descending) {
-        std::sort(v_sort.begin(), v_sort.end(), [](const auto& a, const auto& b) {
-            return a.first > b.first;
-        });
+      std::sort(v_sort.begin(), v_sort.end(), [](const auto& a, const auto& b) {
+        return a.first > b.first;
+      });
     } else {
-        std::sort(v_sort.begin(), v_sort.end(), [](const auto& a, const auto& b) {
-            return a.first < b.first;
-        });
+      std::sort(v_sort.begin(), v_sort.end(), [](const auto& a, const auto& b) {
+        return a.first < b.first;
+      });
     }
 
     std::pair<float, size_t> rank_tracker = std::make_pair(std::numeric_limits<float>::quiet_NaN(), 0);
     std::vector<int> result(v_temp.size());
 
     for (size_t i = 0U; i < v_sort.size(); ++i) {
-        // Only update rank if value is different from previous
-        if (v_sort[i].first != rank_tracker.first) {
-            rank_tracker = std::make_pair(v_sort[i].first, i + 1);  // +1 for 1-based rank
-        }
-        result[v_sort[i].second] = rank_tracker.second;  // assign rank to original index
+      // Only update rank if value is different from previous
+      if (v_sort[i].first != rank_tracker.first) {
+        rank_tracker = std::make_pair(v_sort[i].first, i + 1); // +1 for 1-based rank
+      }
+      result[v_sort[i].second] = rank_tracker.second; // assign rank to original index
     }
 
     return result;
@@ -861,27 +864,27 @@ struct StrangenessBuilder {
 
     // Defining context variables
     int NDuplicates = 0;
-    float AvgPA = 0.0f;    
+    float AvgPA = 0.0f;
 
     // Containers for ranking
     std::vector<float> paVec(V0Grouped[iV0].collisionIds.size(), 999.f);
     std::vector<float> v0zVec(V0Grouped[iV0].collisionIds.size(), 999.f);
 
     // Auxiliary vector to store V0 duplicate info
-    std::vector<V0DuplicateExtra> V0DuplicateExtras; 
+    std::vector<V0DuplicateExtra> V0DuplicateExtras;
 
-    // Loop over duplicates 
+    // Loop over duplicates
     for (size_t ic = 0; ic < V0Grouped[iV0].collisionIds.size(); ic++) {
 
       // Helper structure to save duplicates info - initializing with dummy values
-      V0DuplicateExtra v0DuplicateInfo;            
+      V0DuplicateExtra v0DuplicateInfo;
       v0DuplicateInfo.isBestPA = false;
       v0DuplicateInfo.isBestDCADau = false;
       v0DuplicateInfo.isBestMLScore = false;
       v0DuplicateInfo.isBuildOk = false;
-      v0DuplicateInfo.PA = 10; 
-      v0DuplicateInfo.V0DCAToPVz = 999.f; 
-      v0DuplicateInfo.V0zVtx = 999.f; 
+      v0DuplicateInfo.PA = 10;
+      v0DuplicateInfo.V0DCAToPVz = 999.f;
+      v0DuplicateInfo.V0zVtx = 999.f;
       v0DuplicateInfo.MLScore = -1;
 
       // We include V0DuplicateExtra info in the vector at this point to avoid indexing issues later
@@ -916,7 +919,7 @@ struct StrangenessBuilder {
       // <false>: do not apply selections: do as much as possible to preserve
       // candidate at this level and do not select with topo selections
       if (straHelper.buildV0Candidate<false>(V0Grouped[iV0].collisionIds[ic], collision.posX(), collision.posY(), collision.posZ(), pTrack, nTrack, posTrackPar, negTrackPar, true, false, true)) {
-      
+
         // candidate built, check pointing angle
         if (straHelper.v0.pointingAngle < bestPointingAngle) {
           bestPointingAngle = straHelper.v0.pointingAngle;
@@ -928,33 +931,32 @@ struct StrangenessBuilder {
         }
 
         // Calculating features for ML Analysis
-        if (DeduplicationOpts.deduplicationAlgorithm.value==4 || DeduplicationOpts.deduplicationAlgorithm.value==6){                                                
-          AvgPA += straHelper.v0.pointingAngle;                    
+        if (DeduplicationOpts.deduplicationAlgorithm.value == 4 || DeduplicationOpts.deduplicationAlgorithm.value == 6) {
+          AvgPA += straHelper.v0.pointingAngle;
           paVec[ic] = straHelper.v0.pointingAngle;
-          v0zVec[ic] = std::abs(straHelper.v0.position[2]);                    
+          v0zVec[ic] = std::abs(straHelper.v0.position[2]);
           NDuplicates++;
         }
-                
+
         // Updating values in the struct
-        V0DuplicateExtras[ic].isBuildOk = true;        
-        V0DuplicateExtras[ic].PA = straHelper.v0.pointingAngle;        
-        V0DuplicateExtras[ic].V0DCAToPVz = std::abs(straHelper.v0.v0DCAToPVz); 
-        V0DuplicateExtras[ic].V0zVtx = std::abs(straHelper.v0.position[2]); 
+        V0DuplicateExtras[ic].isBuildOk = true;
+        V0DuplicateExtras[ic].PA = straHelper.v0.pointingAngle;
+        V0DuplicateExtras[ic].V0DCAToPVz = std::abs(straHelper.v0.v0DCAToPVz);
+        V0DuplicateExtras[ic].V0zVtx = std::abs(straHelper.v0.position[2]);
       } // end build V0
     } // end candidate loop
-    
 
     // Additional loop to perform ML Analysis if requested
-    if (DeduplicationOpts.deduplicationAlgorithm.value==4 || DeduplicationOpts.deduplicationAlgorithm.value==6){
-      
-      // Preparing features    
+    if (DeduplicationOpts.deduplicationAlgorithm.value == 4 || DeduplicationOpts.deduplicationAlgorithm.value == 6) {
+
+      // Preparing features
       if (NDuplicates > 0)
-        AvgPA /= NDuplicates;        
-      
+        AvgPA /= NDuplicates;
+
       // Get vector of ranks
       std::vector<int> paRanks = rankSort(paVec, false);
       std::vector<int> v0zRanks = rankSort(v0zVec, false);
-      
+
       // Fill the ML score for all candidates
       for (size_t ic = 0; ic < V0Grouped[iV0].collisionIds.size(); ic++) {
 
@@ -963,28 +965,27 @@ struct StrangenessBuilder {
           continue;
 
         // Input vector for BDT
-        std::vector<float> inputFeatures{V0DuplicateExtras[ic].V0DCAToPVz,      // 1. V0DCAToPVz
-                                         V0DuplicateExtras[ic].PA,              // 2. Pointing Angle
-                                         V0DuplicateExtras[ic].V0zVtx,          // 3. V0 Vtx z-position 
-                                         static_cast<float>(paRanks[ic]),       // 4. Pointing Angle Rank
-                                         static_cast<float>(NDuplicates),       // 5. N. of Duplicates
-                                         AvgPA,                                 // 6. Avg Pointing Angle
-                                         static_cast<float>(v0zRanks[ic])};     // 7. V0 Vtx z Rank 
+        std::vector<float> inputFeatures{V0DuplicateExtras[ic].V0DCAToPVz,  // 1. V0DCAToPVz
+                                         V0DuplicateExtras[ic].PA,          // 2. Pointing Angle
+                                         V0DuplicateExtras[ic].V0zVtx,      // 3. V0 Vtx z-position
+                                         static_cast<float>(paRanks[ic]),   // 4. Pointing Angle Rank
+                                         static_cast<float>(NDuplicates),   // 5. N. of Duplicates
+                                         AvgPA,                             // 6. Avg Pointing Angle
+                                         static_cast<float>(v0zRanks[ic])}; // 7. V0 Vtx z Rank
 
+        float* BDTProbability = deduplication_bdt.evalModel(inputFeatures);
 
-        float* BDTProbability = deduplication_bdt.evalModel(inputFeatures); 
-      
         if (BDTProbability[1] > bestMLScore) {
           bestMLScore = BDTProbability[1];
           bestMLScoreIndex = ic;
-        } 
-      
+        }
+
         // QA histo
-        histos.fill(HIST("DeduplicationQA/hMLScore"), BDTProbability[1]);        
+        histos.fill(HIST("DeduplicationQA/hMLScore"), BDTProbability[1]);
         histos.fill(HIST("DeduplicationQA/hPA"), V0DuplicateExtras[ic].PA);
 
-        // Updating BDT score info in the struct 
-        V0DuplicateExtras[ic].MLScore = BDTProbability[1];        
+        // Updating BDT score info in the struct
+        V0DuplicateExtras[ic].MLScore = BDTProbability[1];
       }
     }
 
@@ -993,12 +994,15 @@ struct StrangenessBuilder {
     histos.fill(HIST("DeduplicationQA/hBestMLScore"), bestMLScore);
 
     // Final step: Defining the winners:
-    if (bestPointingAngleIndex != static_cast<size_t>(-1)) V0DuplicateExtras[bestPointingAngleIndex].isBestPA = true;
-    if (bestDCADaughtersIndex != static_cast<size_t>(-1)) V0DuplicateExtras[bestDCADaughtersIndex].isBestDCADau = true;
-    if (bestMLScoreIndex != static_cast<size_t>(-1)) V0DuplicateExtras[bestMLScoreIndex].isBestMLScore = true;
-
-   // return vector with duplicates info 
-   return V0DuplicateExtras;
+    if (bestPointingAngleIndex != static_cast<size_t>(-1))
+      V0DuplicateExtras[bestPointingAngleIndex].isBestPA = true;
+    if (bestDCADaughtersIndex != static_cast<size_t>(-1))
+      V0DuplicateExtras[bestDCADaughtersIndex].isBestDCADau = true;
+    if (bestMLScoreIndex != static_cast<size_t>(-1))
+      V0DuplicateExtras[bestMLScoreIndex].isBestMLScore = true;
+
+    // return vector with duplicates info
+    return V0DuplicateExtras;
   }
 
   template <typename TCollisions>
@@ -1177,7 +1181,7 @@ struct StrangenessBuilder {
 
           // skip if empty
           if (deduplicationOutput.empty()) {
-            continue; 
+            continue;
           }
 
           // mark de-duplicated candidates
diff --git a/PWGLF/Utils/strangenessBuilderHelper.h b/PWGLF/Utils/strangenessBuilderHelper.h
@@ -355,7 +355,7 @@ class strangenessBuilderHelper
 
     // propagate to collision vertex
     o2::base::Propagator::Instance()->propagateToDCABxByBz({pvX, pvY, pvZ}, V0Temp, 2.f, fitter.getMatCorrType(), &dcaV0Info);
-    v0.v0DCAToPVxy = dcaV0Info[0]; 
+    v0.v0DCAToPVxy = dcaV0Info[0];
     v0.v0DCAToPVz = dcaV0Info[1];
 
     v0.positiveTrackX = fitter.getTrack(0).getX();
