Refactor UPC gap determination thresholds using ConfigurableGroup

minjungkim12 · claude · minjungkim12 · commit 488109c3b576 · 2025-11-14T19:11:05.000+01:00
- Add HfUpcGapThresholds ConfigurableGroup in utilsUpcHf.h - Includes fv0aThreshold, ft0aThreshold, ft0cThreshold, zdcThreshold - Enables reusability across multiple HF tasks - Uses "upc" as JSON group name prefix - Add determineGapType() overload accepting HfUpcGapThresholds - Simplifies function calls by passing threshold group directly - Improves code readability and maintainability - Replace individual Configurables in taskD0.cxx and taskDplus.cxx - Remove 4 separate threshold Configurables per task - Replace with single HfUpcGapThresholds member - Simplify determineGapType() calls from 3 parameters to 1 - Update thnConfigAxisGapType description to reference TrueGap enum - Change from hardcoded values to enum reference - Improves documentation clarity 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/PWGHF/D2H/Tasks/taskD0.cxx b/PWGHF/D2H/Tasks/taskD0.cxx
@@ -96,13 +96,8 @@ struct HfTaskD0 {
   Configurable<std::string> ccdbUrl{"ccdbUrl", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
   Configurable<std::string> irSource{"irSource", "ZNC hadronic", "Estimator of the interaction rate (Recommended: pp --> T0VTX, Pb-Pb --> ZNC hadronic)"};
 
-  // UPC gap determination thresholds
-  Configurable<float> upcFV0AThreshold{"upcFV0AThreshold", 100.0f, "FV0-A amplitude threshold for UPC gap determination (a.u.)"};
-  Configurable<float> upcFT0AThreshold{"upcFT0AThreshold", 100.0f, "FT0-A amplitude threshold for UPC gap determination (a.u.)"};
-  Configurable<float> upcFT0CThreshold{"upcFT0CThreshold", 50.0f, "FT0-C amplitude threshold for UPC gap determination (a.u.)"};
-  Configurable<float> upcZDCThreshold{"upcZDCThreshold", 1.0f, "ZDC energy threshold for UPC gap determination (a.u.)"};
-
-  HfEventSelection hfEvSel; // event selection and monitoring
+  HfEventSelection hfEvSel;         // event selection and monitoring
+  HfUpcGapThresholds upcThresholds; // UPC gap determination thresholds
   ctpRateFetcher mRateFetcher;
 
   SliceCache cache;
@@ -158,7 +153,7 @@ struct HfTaskD0 {
   ConfigurableAxis thnConfigAxisMinItsNCls{"thnConfigAxisMinItsNCls", {5, 3, 8}, "axis for minimum ITS NCls of candidate prongs"};
   ConfigurableAxis thnConfigAxisMinTpcNCrossedRows{"thnConfigAxisMinTpcNCrossedRows", {10, 70, 180}, "axis for minimum TPC NCls crossed rows of candidate prongs"};
   ConfigurableAxis thnConfigAxisIR{"thnConfigAxisIR", {5000, 0, 500}, "Interaction rate (kHz)"};
-  ConfigurableAxis thnConfigAxisGapType{"thnConfigAxisGapType", {7, -1.5, 5.5}, "axis for UPC gap type (-1=NoGap, 0=SingleGapA, 1=SingleGapC, 2=DoubleGap, 3=NoUpc, 4=TrkOutOfRange, 5=BadDoubleGap)"};
+  ConfigurableAxis thnConfigAxisGapType{"thnConfigAxisGapType", {7, -1.5, 5.5}, "axis for UPC gap type (see TrueGap enum in o2::aod::sgselector)"};
   ConfigurableAxis thnConfigAxisFT0{"thnConfigAxisFT0", {1001, -1.5, 999.5}, "axis for FT0 amplitude (a.u.)"};
   ConfigurableAxis thnConfigAxisFV0A{"thnConfigAxisFV0A", {2001, -1.5, 1999.5}, "axis for FV0-A amplitude (a.u.)"};
   ConfigurableAxis thnConfigAxisFDD{"thnConfigAxisFDD", {200, 0., 4000.}, "axis for FDD amplitude (a.u.)"};
@@ -589,8 +584,7 @@ struct HfTaskD0 {
       auto bc = collision.template bc_as<BCsType>();
 
       // Determine gap type using SGSelector with BC range checking
-      const auto gapResult = hf_upc::determineGapType(collision, bcs,
-                                                      upcFV0AThreshold, upcFT0AThreshold, upcFT0CThreshold);
+      const auto gapResult = hf_upc::determineGapType(collision, bcs, upcThresholds);
       const int gap = gapResult.value;
 
       // Use the BC with FIT activity if available from SGSelector
diff --git a/PWGHF/D2H/Tasks/taskDplus.cxx b/PWGHF/D2H/Tasks/taskDplus.cxx
@@ -86,14 +86,9 @@ struct HfTaskDplus {
   Configurable<std::string> ccdbUrl{"ccdbUrl", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
   Configurable<std::string> irSource{"irSource", "ZNC hadronic", "Estimator of the interaction rate (Recommended: pp --> T0VTX, Pb-Pb --> ZNC hadronic)"};
 
-  // UPC gap determination thresholds
-  Configurable<float> upcFV0AThreshold{"upcFV0AThreshold", 100.0f, "FV0-A amplitude threshold for UPC gap determination (a.u.)"};
-  Configurable<float> upcFT0AThreshold{"upcFT0AThreshold", 100.0f, "FT0-A amplitude threshold for UPC gap determination (a.u.)"};
-  Configurable<float> upcFT0CThreshold{"upcFT0CThreshold", 50.0f, "FT0-C amplitude threshold for UPC gap determination (a.u.)"};
-  Configurable<float> upcZDCThreshold{"upcZDCThreshold", 1.0f, "ZDC energy threshold for UPC gap determination (a.u.)"};
-
-  HfEventSelection hfEvSel;    // event selection and monitoring
-  ctpRateFetcher mRateFetcher; // interaction rate fetcher
+  HfEventSelection hfEvSel;         // event selection and monitoring
+  HfUpcGapThresholds upcThresholds; // UPC gap determination thresholds
+  ctpRateFetcher mRateFetcher;      // interaction rate fetcher
 
   Service<o2::ccdb::BasicCCDBManager> ccdb;
 
@@ -134,7 +129,7 @@ struct HfTaskDplus {
   ConfigurableAxis thnConfigAxisMlScore0{"thnConfigAxisMlScore0", {100, 0., 1.}, "axis for ML output score 0"};
   ConfigurableAxis thnConfigAxisMlScore1{"thnConfigAxisMlScore1", {100, 0., 1.}, "axis for ML output score 1"};
   ConfigurableAxis thnConfigAxisMlScore2{"thnConfigAxisMlScore2", {100, 0., 1.}, "axis for ML output score 2"};
-  ConfigurableAxis thnConfigAxisGapType{"thnConfigAxisGapType", {7, -1.5, 5.5}, "axis for UPC gap type (-1=NoGap, 0=SingleGapA, 1=SingleGapC, 2=DoubleGap, 3=NoUpc, 4=TrkOutOfRange, 5=BadDoubleGap)"};
+  ConfigurableAxis thnConfigAxisGapType{"thnConfigAxisGapType", {7, -1.5, 5.5}, "axis for UPC gap type (see TrueGap enum in o2::aod::sgselector)"};
   ConfigurableAxis thnConfigAxisFT0{"thnConfigAxisFT0", {1001, -1.5, 999.5}, "axis for FT0 amplitude (a.u.)"};
   ConfigurableAxis thnConfigAxisFV0A{"thnConfigAxisFV0A", {2001, -1.5, 1999.5}, "axis for FV0-A amplitude (a.u.)"};
   ConfigurableAxis thnConfigAxisFDD{"thnConfigAxisFDD", {200, 0., 4000.}, "axis for FDD amplitude (a.u.)"};
@@ -726,8 +721,7 @@ struct HfTaskDplus {
       auto bc = collision.template bc_as<BCsType>();
 
       // Determine gap type using SGSelector with BC range checking
-      const auto gapResult = hf_upc::determineGapType(collision, bcs,
-                                                      upcFV0AThreshold, upcFT0AThreshold, upcFT0CThreshold);
+      const auto gapResult = hf_upc::determineGapType(collision, bcs, upcThresholds);
       const int gap = gapResult.value;
 
       // Use the BC with FIT activity if available from SGSelector
diff --git a/PWGHF/Utils/utilsUpcHf.h b/PWGHF/Utils/utilsUpcHf.h
@@ -21,12 +21,25 @@
 #include "PWGUD/Core/SGSelector.h"
 #include "PWGUD/Core/UDHelpers.h"
 
+#include <Framework/Configurable.h>
+
+#include <string>
+
 namespace o2::analysis::hf_upc
 {
 
 /// \brief Use TrueGap enum from SGSelector for gap type classification
 using o2::aod::sgselector::TrueGap;
 
+/// \brief Configurable group for UPC gap determination thresholds
+struct HfUpcGapThresholds : o2::framework::ConfigurableGroup {
+  std::string prefix = "upc"; // JSON group name
+  o2::framework::Configurable<float> fv0aThreshold{"fv0aThreshold", 100.0f, "FV0-A amplitude threshold for UPC gap determination (a.u.)"};
+  o2::framework::Configurable<float> ft0aThreshold{"ft0aThreshold", 100.0f, "FT0-A amplitude threshold for UPC gap determination (a.u.)"};
+  o2::framework::Configurable<float> ft0cThreshold{"ft0cThreshold", 50.0f, "FT0-C amplitude threshold for UPC gap determination (a.u.)"};
+  o2::framework::Configurable<float> zdcThreshold{"zdcThreshold", 1.0f, "ZDC energy threshold for UPC gap determination (a.u.)"};
+};
+
 /// \brief Default thresholds for gap determination
 namespace defaults
 {
@@ -81,6 +94,24 @@ inline auto determineGapType(TCollision const& collision,
   return sgResult;
 }
 
+/// \brief Determine gap type using SGSelector with BC range checking and HfUpcGapThresholds
+/// \tparam TCollision Collision type
+/// \tparam TBCs BC table type
+/// \param collision Collision object
+/// \param bcs BC table
+/// \param thresholds HfUpcGapThresholds object containing all UPC thresholds
+/// \return SelectionResult with gap type value and BC pointer
+template <typename TCollision, typename TBCs>
+inline auto determineGapType(TCollision const& collision,
+                             TBCs const& bcs,
+                             HfUpcGapThresholds const& thresholds)
+{
+  return determineGapType(collision, bcs,
+                          thresholds.fv0aThreshold.value,
+                          thresholds.ft0aThreshold.value,
+                          thresholds.ft0cThreshold.value);
+}
+
 /// \brief Check if the gap type is a single-sided gap (SingleGapA or SingleGapC)
 /// \param gap TrueGap enum value
 /// \return true if single-sided gap, false otherwise
