Add UPC detector amplitudes and optimize taskD0/taskDplus

minjungkim12 · claude · minjungkim12 · commit 15c799b5bb68 · 2025-11-13T21:04:41.000+01:00
- Add FV0A, FDDA, FDDC, ZNA, ZNC axes to THnSparse histograms - Optimize detector binning: unified FT0/FDD/ZN for A/C sides - Optimize utilsUpcHf.h: add constexpr/noexcept to utility functions - Optimize ZDC access: eliminate duplicate calls to bcForUPC.zdc() - Remove EventFilteringUtils dependency from CMakeLists.txt - Add const qualifiers for improved code clarity Binning configuration: - FT0: {1001, -1.5, 999.5} - FV0A: {2001, -1.5, 1999.5} - FDD: {200, 0., 4000.} - ZN: {510, -1.5, 49.5} 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/PWGHF/D2H/Tasks/CMakeLists.txt b/PWGHF/D2H/Tasks/CMakeLists.txt
@@ -71,7 +71,7 @@ o2physics_add_dpl_workflow(task-charm-reso-to-d-trk-reduced
 
 o2physics_add_dpl_workflow(task-d0
                     SOURCES taskD0.cxx
-                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2Physics::SGCutParHolder O2Physics::EventFilteringUtils
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2Physics::SGCutParHolder
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(task-directed-flow-charm-hadrons
@@ -81,7 +81,7 @@ o2physics_add_dpl_workflow(task-directed-flow-charm-hadrons
 
 o2physics_add_dpl_workflow(task-dplus
                     SOURCES taskDplus.cxx
-                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2Physics::SGCutParHolder O2Physics::EventFilteringUtils
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::AnalysisCCDB O2Physics::SGCutParHolder
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(task-ds
diff --git a/PWGHF/D2H/Tasks/taskD0.cxx b/PWGHF/D2H/Tasks/taskD0.cxx
@@ -103,8 +103,6 @@ struct HfTaskD0 {
   Configurable<float> upcZDCThreshold{"upcZDCThreshold", 1.0f, "ZDC energy threshold for UPC gap determination (a.u.)"};
 
   HfEventSelection hfEvSel; // event selection and monitoring
-  SGSelector sgSelector;    // UPC gap selector
-
   ctpRateFetcher mRateFetcher;
 
   SliceCache cache;
@@ -161,8 +159,10 @@ struct HfTaskD0 {
   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 thnConfigAxisFT0A{"thnConfigAxisFT0A", {1001, -1.5, 999.5}, "axis for FT0-A amplitude (a.u.)"};
-  ConfigurableAxis thnConfigAxisFT0C{"thnConfigAxisFT0C", {1001, -1.5, 999.5}, "axis for FT0-C amplitude (a.u.)"};
+  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.)"};
+  ConfigurableAxis thnConfigAxisZN{"thnConfigAxisZN", {510, -1.5, 49.5}, "axis for ZN energy (a.u.)"};
 
   HistogramRegistry registry{
     "registry",
@@ -306,8 +306,13 @@ struct HfTaskD0 {
     const AxisSpec thnAxisMinTpcNCrossedRows{thnConfigAxisMinTpcNCrossedRows, "Minimum TPC crossed rows"};
     const AxisSpec thnAxisIR{thnConfigAxisIR, "Interaction rate"};
     const AxisSpec thnAxisGapType{thnConfigAxisGapType, "Gap type"};
-    const AxisSpec thnAxisFT0A{thnConfigAxisFT0A, "FT0-A amplitude"};
-    const AxisSpec thnAxisFT0C{thnConfigAxisFT0C, "FT0-C amplitude"};
+    const AxisSpec thnAxisFT0A{thnConfigAxisFT0, "FT0-A amplitude"};
+    const AxisSpec thnAxisFT0C{thnConfigAxisFT0, "FT0-C amplitude"};
+    const AxisSpec thnAxisFV0A{thnConfigAxisFV0A, "FV0-A amplitude"};
+    const AxisSpec thnAxisFDDA{thnConfigAxisFDD, "FDD-A amplitude"};
+    const AxisSpec thnAxisFDDC{thnConfigAxisFDD, "FDD-C amplitude"};
+    const AxisSpec thnAxisZNA{thnConfigAxisZN, "ZNA energy"};
+    const AxisSpec thnAxisZNC{thnConfigAxisZN, "ZNC energy"};
 
     if (doprocessMcWithDCAFitterN || doprocessMcWithDCAFitterNCent || doprocessMcWithKFParticle || doprocessMcWithDCAFitterNMl || doprocessMcWithDCAFitterNMlCent || doprocessMcWithKFParticleMl) {
       std::vector<AxisSpec> axesAcc = {thnAxisGenPtD, thnAxisGenPtB, thnAxisY, thnAxisOrigin, thnAxisNumPvContr};
@@ -361,6 +366,11 @@ struct HfTaskD0 {
       axes.push_back(thnAxisGapType);
       axes.push_back(thnAxisFT0A);
       axes.push_back(thnAxisFT0C);
+      axes.push_back(thnAxisFV0A);
+      axes.push_back(thnAxisFDDA);
+      axes.push_back(thnAxisFDDC);
+      axes.push_back(thnAxisZNA);
+      axes.push_back(thnAxisZNC);
     }
 
     if (applyMl) {
@@ -576,23 +586,42 @@ struct HfTaskD0 {
       if (rejectionMask != 0) {
         continue;
       }
-      const auto& bc = collision.template bc_as<BCsType>();
-      upchelpers::FITInfo fitInfo{};
-      udhelpers::getFITinfo(fitInfo, bc, bcs, ft0s, fv0as, fdds);
+      auto bc = collision.template bc_as<BCsType>();
 
       // Determine gap type using SGSelector with BC range checking
-      int gap = hf_upc::determineGapType(collision, bcs, sgSelector,
-                                         upcFV0AThreshold, upcFT0AThreshold, upcFT0CThreshold);
+      const auto gapResult = hf_upc::determineGapType(collision, bcs,
+                                                      upcFV0AThreshold, upcFT0AThreshold, upcFT0CThreshold);
+      const int gap = gapResult.value;
+
+      // Use the BC with FIT activity if available from SGSelector
+      auto bcForUPC = bc;
+      if (gapResult.bc) {
+        bcForUPC = *(gapResult.bc);
+      }
+
+      // Get FIT information from the UPC BC
+      upchelpers::FITInfo fitInfo{};
+      udhelpers::getFITinfo(fitInfo, bcForUPC, bcs, ft0s, fv0as, fdds);
+
+      // Get ZDC energies if available (extract once and reuse)
+      const bool hasZdc = bcForUPC.has_zdc();
+      float zdcEnergyZNA = -1.f;
+      float zdcEnergyZNC = -1.f;
+      if (hasZdc) {
+        const auto& zdc = bcForUPC.zdc();
+        zdcEnergyZNA = zdc.energyCommonZNA();
+        zdcEnergyZNC = zdc.energyCommonZNC();
+      }
 
-      if (bc.has_zdc()) {
-        const auto& zdc = bc.zdc();
+      // Fill QA histograms using the UPC BC for both FIT and ZDC
+      if (hasZdc) {
         registry.fill(HIST("Data/fitInfo/ampFT0A_vs_ampFT0C"), fitInfo.ampFT0A, fitInfo.ampFT0C);
-        registry.fill(HIST("Data/zdc/energyZNA_vs_energyZNC"), zdc.energyCommonZNA(), zdc.energyCommonZNC());
+        registry.fill(HIST("Data/zdc/energyZNA_vs_energyZNC"), zdcEnergyZNA, zdcEnergyZNC);
         registry.fill(HIST("Data/hUpcGapAfterSelection"), hf_upc::gapTypeToInt(gap));
       }
 
       if (hf_upc::isSingleSidedGap(gap)) {
-        int const gapTypeInt = hf_upc::gapTypeToInt(gap);
+        const int gapTypeInt = hf_upc::gapTypeToInt(gap);
         const auto thisCollId = collision.globalIndex();
         const auto& groupedD0Candidates = candidates.sliceBy(candD0PerCollision, thisCollId);
 
@@ -624,10 +653,10 @@ struct HfTaskD0 {
             registry.fill(HIST("hMassVsPhi"), massD0bar, ptCandidate, candidate.phi());
           }
 
-          // Fill THnSparse with structure matching histogram axes: [mass, pt, (mlScores if FillMl), rapidity, d0Type, (cent if storeCentrality), (occ, ir if storeOccupancyAndIR), gapType, FT0A, FT0C]
+          // Fill THnSparse with structure matching histogram axes: [mass, pt, (mlScores if FillMl), rapidity, d0Type, (cent if storeCentrality), (occ, ir if storeOccupancyAndIR), gapType, FT0A, FT0C, FV0A, FDDA, FDDC, ZNA, ZNC]
           auto fillTHnData = [&](float mass, int d0Type) {
             // Pre-calculate vector size to avoid reallocations
-            constexpr int NAxesBase = 7;                        // mass, pt, rapidity, d0Type, gapType, FT0A, FT0C
+            constexpr int NAxesBase = 12;                       // mass, pt, rapidity, d0Type, gapType, FT0A, FT0C, FV0A, FDDA, FDDC, ZNA, ZNC
             constexpr int NAxesMl = FillMl ? 3 : 0;             // 3 ML scores if FillMl
             int const nAxesCent = storeCentrality ? 1 : 0;      // centrality if storeCentrality
             int const nAxesOccIR = storeOccupancyAndIR ? 2 : 0; // occupancy and IR if storeOccupancyAndIR
@@ -656,6 +685,11 @@ struct HfTaskD0 {
             valuesToFill.push_back(static_cast<double>(gapTypeInt));
             valuesToFill.push_back(static_cast<double>(fitInfo.ampFT0A));
             valuesToFill.push_back(static_cast<double>(fitInfo.ampFT0C));
+            valuesToFill.push_back(static_cast<double>(fitInfo.ampFV0A));
+            valuesToFill.push_back(static_cast<double>(fitInfo.ampFDDA));
+            valuesToFill.push_back(static_cast<double>(fitInfo.ampFDDC));
+            valuesToFill.push_back(static_cast<double>(zdcEnergyZNA));
+            valuesToFill.push_back(static_cast<double>(zdcEnergyZNC));
 
             if constexpr (FillMl) {
               registry.get<THnSparse>(HIST("hBdtScoreVsMassVsPtVsPtBVsYVsOriginVsD0Type"))->Fill(valuesToFill.data());
diff --git a/PWGHF/D2H/Tasks/taskDplus.cxx b/PWGHF/D2H/Tasks/taskDplus.cxx
@@ -93,7 +93,6 @@ struct HfTaskDplus {
   Configurable<float> upcZDCThreshold{"upcZDCThreshold", 1.0f, "ZDC energy threshold for UPC gap determination (a.u.)"};
 
   HfEventSelection hfEvSel;    // event selection and monitoring
-  SGSelector sgSelector;       // UPC gap selector
   ctpRateFetcher mRateFetcher; // interaction rate fetcher
 
   Service<o2::ccdb::BasicCCDBManager> ccdb;
@@ -136,8 +135,10 @@ struct HfTaskDplus {
   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 thnConfigAxisFT0A{"thnConfigAxisFT0A", {1001, -1.5, 999.5}, "axis for FT0-A amplitude (a.u.)"};
-  ConfigurableAxis thnConfigAxisFT0C{"thnConfigAxisFT0C", {1001, -1.5, 999.5}, "axis for FT0-C amplitude (a.u.)"};
+  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.)"};
+  ConfigurableAxis thnConfigAxisZN{"thnConfigAxisZN", {510, -1.5, 49.5}, "axis for ZN energy (a.u.)"};
 
   HistogramRegistry registry{
     "registry",
@@ -171,8 +172,13 @@ struct HfTaskDplus {
     AxisSpec const thnAxisIR{thnConfigAxisIR, "Interaction rate (kHz)"};
     AxisSpec const thnAxisPvContributors{thnConfigAxisPvContributors, "PV contributors"};
     AxisSpec const thnAxisGapType{thnConfigAxisGapType, "Gap type"};
-    AxisSpec const thnAxisFT0A{thnConfigAxisFT0A, "FT0-A amplitude"};
-    AxisSpec const thnAxisFT0C{thnConfigAxisFT0C, "FT0-C amplitude"};
+    AxisSpec const thnAxisFT0A{thnConfigAxisFT0, "FT0-A amplitude"};
+    AxisSpec const thnAxisFT0C{thnConfigAxisFT0, "FT0-C amplitude"};
+    AxisSpec const thnAxisFV0A{thnConfigAxisFV0A, "FV0-A amplitude"};
+    AxisSpec const thnAxisFDDA{thnConfigAxisFDD, "FDD-A amplitude"};
+    AxisSpec const thnAxisFDDC{thnConfigAxisFDD, "FDD-C amplitude"};
+    AxisSpec const thnAxisZNA{thnConfigAxisZN, "ZNA energy"};
+    AxisSpec const thnAxisZNC{thnConfigAxisZN, "ZNC energy"};
 
     registry.add("hMass", "3-prong candidates;inv. mass (#pi K #pi) (GeV/#it{c}^{2});entries", {HistType::kTH2F, {{350, 1.7, 2.05}, {vbins, "#it{p}_{T} (GeV/#it{c})"}}});
     registry.add("hEta", "3-prong candidates;candidate #it{#eta};entries", {HistType::kTH2F, {{100, -2., 2.}, {vbins, "#it{p}_{T} (GeV/#it{c})"}}});
@@ -233,6 +239,11 @@ struct HfTaskDplus {
         axes.push_back(thnAxisGapType);
         axes.push_back(thnAxisFT0A);
         axes.push_back(thnAxisFT0C);
+        axes.push_back(thnAxisFV0A);
+        axes.push_back(thnAxisFDDA);
+        axes.push_back(thnAxisFDDC);
+        axes.push_back(thnAxisZNA);
+        axes.push_back(thnAxisZNC);
       }
 
       registry.add("hSparseMass", "THn for Dplus", HistType::kTHnSparseF, axes);
@@ -712,24 +723,45 @@ struct HfTaskDplus {
         /// at least one event selection not satisfied --> reject the candidate
         continue;
       }
-      const auto& bc = collision.template bc_as<BCsType>();
-      upchelpers::FITInfo fitInfo{};
-      udhelpers::getFITinfo(fitInfo, bc, bcs, ft0s, fv0as, fdds);
+      auto bc = collision.template bc_as<BCsType>();
 
       // Determine gap type using SGSelector with BC range checking
-      int gap = hf_upc::determineGapType(collision, bcs, sgSelector,
-                                         upcFV0AThreshold, upcFT0AThreshold, upcFT0CThreshold);
+      const auto gapResult = hf_upc::determineGapType(collision, bcs,
+                                                      upcFV0AThreshold, upcFT0AThreshold, upcFT0CThreshold);
+      const int gap = gapResult.value;
+
+      // Use the BC with FIT activity if available from SGSelector
+      auto bcForUPC = bc;
+      if (gapResult.bc) {
+        bcForUPC = *(gapResult.bc);
+      }
 
-      if (bc.has_zdc()) {
-        const auto& zdc = bc.zdc();
+      // Get FIT information from the UPC BC
+      upchelpers::FITInfo fitInfo{};
+      udhelpers::getFITinfo(fitInfo, bcForUPC, bcs, ft0s, fv0as, fdds);
+
+      // Get ZDC energies if available (extract once and reuse)
+      const bool hasZdc = bcForUPC.has_zdc();
+      float zdcEnergyZNA = -1.f;
+      float zdcEnergyZNC = -1.f;
+      if (hasZdc) {
+        const auto& zdc = bcForUPC.zdc();
+        zdcEnergyZNA = zdc.energyCommonZNA();
+        zdcEnergyZNC = zdc.energyCommonZNC();
+      }
+
+      // Fill QA histograms using the UPC BC for both FIT and ZDC
+      if (hasZdc) {
         registry.fill(HIST("Data/fitInfo/ampFT0A_vs_ampFT0C"), fitInfo.ampFT0A, fitInfo.ampFT0C);
-        registry.fill(HIST("Data/zdc/energyZNA_vs_energyZNC"), zdc.energyCommonZNA(), zdc.energyCommonZNC());
+        registry.fill(HIST("Data/zdc/energyZNA_vs_energyZNC"), zdcEnergyZNA, zdcEnergyZNC);
         registry.fill(HIST("Data/hUpcGapAfterSelection"), hf_upc::gapTypeToInt(gap));
       }
+
       if (hf_upc::isSingleSidedGap(gap)) {
-        // Use the candidates from this collision
+        const int gapTypeInt = hf_upc::gapTypeToInt(gap);
         const auto thisCollId = collision.globalIndex();
         const auto& groupedDplusCandidates = candidates.sliceBy(candDplusPerCollision, thisCollId);
+
         float cent{-1.f};
         float occ{-1.f};
         float ir{-1.f};
@@ -739,13 +771,11 @@ struct HfTaskDplus {
         if (storeIR) {
           ir = mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource, true) * 1.e-3; // kHz
         }
-        float numPvContr{-1.f};
-        int const gapTypeInt = hf_upc::gapTypeToInt(gap);
 
         // Lambda function to fill THn - handles both ML and non-ML cases
         auto fillTHnData = [&](const auto& candidate) {
           // Pre-calculate vector size to avoid reallocations
-          constexpr int NAxesBase = 5;                   // mass, pt, gapType, FT0A, FT0C
+          constexpr int NAxesBase = 10;                  // mass, pt, gapType, FT0A, FT0C, FV0A, FDDA, FDDC, ZNA, ZNC
           constexpr int NAxesMl = FillMl ? 3 : 0;        // 3 ML scores if FillMl
           int const nAxesCent = storeCentrality ? 1 : 0; // centrality if storeCentrality
           int const nAxesOcc = storeOccupancy ? 1 : 0;   // occupancy if storeOccupancy
@@ -779,6 +809,11 @@ struct HfTaskDplus {
           valuesToFill.push_back(static_cast<double>(gapTypeInt));
           valuesToFill.push_back(static_cast<double>(fitInfo.ampFT0A));
           valuesToFill.push_back(static_cast<double>(fitInfo.ampFT0C));
+          valuesToFill.push_back(static_cast<double>(fitInfo.ampFV0A));
+          valuesToFill.push_back(static_cast<double>(fitInfo.ampFDDA));
+          valuesToFill.push_back(static_cast<double>(fitInfo.ampFDDC));
+          valuesToFill.push_back(static_cast<double>(zdcEnergyZNA));
+          valuesToFill.push_back(static_cast<double>(zdcEnergyZNC));
           registry.get<THnSparse>(HIST("hSparseMass"))->Fill(valuesToFill.data());
         };
 
diff --git a/PWGHF/Utils/utilsUpcHf.h b/PWGHF/Utils/utilsUpcHf.h
@@ -45,19 +45,19 @@ constexpr int MaxNTracks = 100;                  ///< Maximum number of tracks
 /// \tparam TBCs BC table type
 /// \param collision Collision object
 /// \param bcs BC table
-/// \param sgSelector SGSelector instance
 /// \param amplitudeThresholdFV0A Threshold for FV0-A (default: 100.0)
 /// \param amplitudeThresholdFT0A Threshold for FT0-A (default: 100.0)
 /// \param amplitudeThresholdFT0C Threshold for FT0-C (default: 50.0)
-/// \return TrueGap enum value (-1=NoGap, 0=SingleGapA, 1=SingleGapC, 2=DoubleGap, 3=NoUpc, 4=TrkOutOfRange, 5=BadDoubleGap)
+/// \return SelectionResult with gap type value and BC pointer
 template <typename TCollision, typename TBCs>
-inline int determineGapType(TCollision const& collision,
-                            TBCs const& bcs,
-                            SGSelector& sgSelector,
-                            float amplitudeThresholdFV0A = defaults::AmplitudeThresholdFV0A,
-                            float amplitudeThresholdFT0A = defaults::AmplitudeThresholdFT0A,
-                            float amplitudeThresholdFT0C = defaults::AmplitudeThresholdFT0C)
+inline auto determineGapType(TCollision const& collision,
+                             TBCs const& bcs,
+                             float amplitudeThresholdFV0A = defaults::AmplitudeThresholdFV0A,
+                             float amplitudeThresholdFT0A = defaults::AmplitudeThresholdFT0A,
+                             float amplitudeThresholdFT0C = defaults::AmplitudeThresholdFT0C)
 {
+  using BCType = std::decay_t<decltype(collision.template foundBC_as<TBCs>())>;
+
   // Configure SGSelector thresholds
   SGCutParHolder sgCuts;
   sgCuts.SetNDtcoll(defaults::NDtColl);
@@ -68,30 +68,31 @@ inline int determineGapType(TCollision const& collision,
 
   // Get BC and BC range
   if (!collision.has_foundBC()) {
-    return TrueGap::NoGap;
+    return SelectionResult<BCType>{TrueGap::NoGap, nullptr};
   }
 
   const auto bc = collision.template foundBC_as<TBCs>();
   const auto bcRange = udhelpers::compatibleBCs(collision, sgCuts.NDtcoll(), bcs, sgCuts.minNBCs());
 
-  // Use SGSelector to determine gap type with BC range checking
+  // Create SGSelector instance and determine gap type with BC range checking
+  SGSelector sgSelector;
   const auto sgResult = sgSelector.IsSelected(sgCuts, collision, bcRange, bc);
 
-  return sgResult.value;
+  return sgResult;
 }
 
 /// \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
-inline bool isSingleSidedGap(int gap)
+constexpr bool isSingleSidedGap(int gap) noexcept
 {
   return (gap == TrueGap::SingleGapA || gap == TrueGap::SingleGapC);
 }
 
 /// \brief Get gap type name as string
 /// \param gap TrueGap enum value
 /// \return String representation of gap type
-inline const char* getGapTypeName(int gap)
+constexpr const char* getGapTypeName(int gap) noexcept
 {
   switch (gap) {
     case TrueGap::NoGap:
@@ -116,7 +117,8 @@ inline const char* getGapTypeName(int gap)
 /// \brief Convert gap type to integer for histogram filling
 /// \param gap TrueGap enum value
 /// \return Integer representation (-1, 0, 1, 2, 3, 4, 5)
-inline int gapTypeToInt(int gap)
+/// \note This is a pass-through function for consistency with other utility functions
+constexpr int gapTypeToInt(int gap) noexcept
 {
   return gap;
 }
