Skip to content

[PWGHF] Make default sgSelector parameters configurable #14923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rrantu wants to merge 14 commits into
base: master
Choose a base branch
from
+35 −20
Open

[PWGHF] Make default sgSelector parameters configurable #14923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
99cd23c
add UPC infos in taskLc.cxx
Rrantu Nov 27, 2025
c567ada
difine new THnSphere axes for UPC and delete useless histos
Rrantu Nov 28, 2025
f5fc795
Removed the unnecessary axes in the UPC THnSparse
Rrantu Feb 4, 2026
5d7212c
Removed the unnecessary axes
Rrantu Feb 4, 2026
70622f6
Fix sgSelector parameters and make them configurable
Rrantu Feb 11, 2026
4ef1765
Merge branch 'master' into master
Rrantu Feb 11, 2026
285c47f
fixed configurable name
Rrantu Feb 11, 2026
8294fb2
fix names and remove zdcThreshold
Rrantu Feb 11, 2026
28e145b
fix configrable name
Rrantu Feb 11, 2026
6fcc7c2
align the default values
Rrantu Feb 12, 2026
53cb024
fix formatting issues
Rrantu Feb 12, 2026
fb7908f
Fix variable type
Rrantu Feb 12, 2026
b083b13
fix variable type
Rrantu Feb 12, 2026
8cc0c64
use constants in defaults to itialise configurables
Rrantu Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions PWGHF/D2H/Tasks/taskLc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@ struct HfTaskLc {
addHistogramsRec("hDecLenErrVsPt", "decay length error (cm)", "#it{p}_{T} (GeV/#it{c})", {HistType::kTH2F, {{100, 0., 1.}, {vbins}}});

if (isUpc) {
qaRegistry.add("Data/fitInfo/ampFT0A_vs_ampFT0C", "FT0-A vs FT0-C amplitude;FT0-A amplitude (a.u.);FT0-C amplitude (a.u.)", {HistType::kTH2F, {{1500, 0., 1500}, {1500, 0., 1500}}});
qaRegistry.add("Data/zdc/energyZNA_vs_energyZNC", "ZNA vs ZNC common energy;E_{ZNA}^{common} (a.u.);E_{ZNC}^{common} (a.u.)", {HistType::kTH2F, {{200, 0., 20}, {200, 0., 20}}});
qaRegistry.add("Data/fitInfo/ampFT0A_vs_ampFT0C", "FT0-A vs FT0-C amplitude;FT0-A amplitude (a.u.);FT0-C amplitude (a.u.)", {HistType::kTH2F, {{500, 0., 500}, {500, 0., 500}}});
qaRegistry.add("Data/zdc/energyZNA_vs_energyZNC", "ZNA vs ZNC common energy;E_{ZNA}^{common} (a.u.);E_{ZNC}^{common} (a.u.)", {HistType::kTH2F, {{100, 0., 10}, {100, 0., 10}}});
qaRegistry.add("Data/zdc/timeZNA_vs_timeZNC", "ZNA vs ZNC time;ZNA Time;ZNC time", {HistType::kTH2F, {{200, -10., 10}, {200, -10., 10}}});
qaRegistry.add("Data/hUpcGapAfterSelection", "UPC gap type after selection;Gap side;Counts", {HistType::kTH1F, {{7, -1.5, 5.5}}});
}
Expand Down
51 changes: 33 additions & 18 deletions PWGHF/Utils/utilsUpcHf.h
View file
Open in desktop
Copy link
Collaborator

@vkucera vkucera Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove zdcThreshold. It is unused.

Copy link
Contributor Author

@Rrantu Rrantu Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your suggestions, I've updated the code.

Copy link
Collaborator

@vkucera vkucera Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Please implement the remaining changes I had requested.

Copy link
Contributor Author

@Rrantu Rrantu Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I missed one of the changes earlier. It has now been fixed.

Copy link
Collaborator

@vkucera vkucera Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also the default values.

Copy link
Contributor Author

@Rrantu Rrantu Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @vkucera, As far as I understand, o2::hf_evsel::HfEventSelection::setSgPreselection is used during the skimming step.
The o2::analysis::hf_upc::HfUpcGapThresholds and
o2::analysis::hf_upc::defaults were already defined in this task and can be adjusted depending on the specific analysis needs.

Copy link
Collaborator

@vkucera vkucera Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All three cases can be used simultaneously in the same task.
My question is: Why should the default values be different in these three cases?

Copy link
Contributor Author

@Rrantu Rrantu Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default values in o2::analysis::hf_upc::defaults already existed in the code, and I am not sure of their original source.

When using these values in the analysis, I encountered some issues. After debugging, it turned out that the defaults in o2::analysis::hf_upc::defaults were not appropriate. For this reason, I made the parameters configurable through o2::analysis::hf_upc::HfUpcGapThresholds. And the default values in o2::analysis::hf_upc::HfUpcGapThresholds are consistent with those in o2::hf_evsel::HfEventSelection::setSgPreselection.

Now I have aligned o2::analysis::hf_upc::defaults to ensure full consistency across all three cases.

Copy link
Collaborator

@vkucera vkucera Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The values are same but still independent. My request was to use the constants in defaults to initialise the configurables in HfUpcGapThresholds.

Copy link
Contributor Author

@Rrantu Rrantu Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I‘ve update the code to use these constants to initialise the configurables.

Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
/// \brief Utility functions for Ultra-Peripheral Collision (UPC) analysis in Heavy Flavor physics
///
/// \author Minjung Kim <minjung.kim@cern.ch>, CERN
/// \author Ran Tu <ran.tu@cern.ch>, Fudan University, GSI Darmstadt

#ifndef PWGHF_UTILS_UTILSUPCHF_H_
#define PWGHF_UTILS_UTILSUPCHF_H_
Expand All @@ -32,28 +33,32 @@ 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
{
constexpr float AmplitudeThresholdFV0A = 100.0f; ///< Amplitude threshold for FV0-A (a.u.)
constexpr float AmplitudeThresholdFT0A = 100.0f; ///< Amplitude threshold for FT0-A (a.u.)
constexpr float AmplitudeThresholdFT0C = 50.0f; ///< Amplitude threshold for FT0-C (a.u.)
constexpr float MaxFITTime = 4.0f; ///< Maximum FIT time (ns)
constexpr int NDtColl = 1000; ///< Time window for BC range (ns)
constexpr int MinNBCs = 7; ///< Minimum number of BCs to check
constexpr int MinNTracks = 0; ///< Minimum number of tracks
constexpr int MaxNTracks = 100; ///< Maximum number of tracks
constexpr float MaxFITTime = 34.0f; ///< Maximum FIT time (ns)
constexpr int NDtColl = 1; ///< Time window for BC range (ns)
constexpr int MinNBCs = 2; ///< Minimum number of BCs to check
constexpr int MinNTracks = 2; ///< Minimum number of tracks
constexpr int MaxNTracks = 1000; ///< Maximum number of tracks
} // namespace defaults

/// \brief Configurable group for UPC gap determination thresholds
struct HfUpcGapThresholds : o2::framework::ConfigurableGroup {
std::string prefix = "upc"; // JSON group name
o2::framework::Configurable<int> nDtColl{"nDtColl", static_cast<int>(defaults::NDtColl), "Number of standard deviations to consider in BC range"};
o2::framework::Configurable<int> nBcsMin{"nBcsMin", static_cast<int>(defaults::MinNBCs), "Minimum number of BCs to consider in BC range"};
o2::framework::Configurable<int> nContributorsPvMin{"nContributorsPvMin", static_cast<int>(defaults::MinNTracks), "Minimum number of PV contributors"};
o2::framework::Configurable<int> nContributorsPvMax{"nContributorsPvMax", static_cast<int>(defaults::MaxNTracks), "Maximum number of PV contributors"};
o2::framework::Configurable<float> timeFitMax{"timeFitMax", static_cast<float>(defaults::MaxFITTime), "Maximum time in FIT"};
o2::framework::Configurable<float> fv0aThreshold{"fv0aThreshold", static_cast<float>(defaults::AmplitudeThresholdFV0A), "FV0-A amplitude threshold for UPC gap determination (a.u.)"};
o2::framework::Configurable<float> ft0aThreshold{"ft0aThreshold", static_cast<float>(defaults::AmplitudeThresholdFT0A), "FT0-A amplitude threshold for UPC gap determination (a.u.)"};
o2::framework::Configurable<float> ft0cThreshold{"ft0cThreshold", static_cast<float>(defaults::AmplitudeThresholdFT0C), "FT0-C amplitude threshold for UPC gap determination (a.u.)"};
};

/// \brief Determine gap type using SGSelector with BC range checking
/// \tparam TCollision Collision type
/// \tparam TBCs BC table type
Expand All @@ -66,6 +71,11 @@ constexpr int MaxNTracks = 100; ///< Maximum number of tracks
template <typename TCollision, typename TBCs>
inline auto determineGapType(TCollision const& collision,
TBCs const& bcs,
int nDtColl = defaults::NDtColl,
int nBcsMin = defaults::MinNBCs,
int nContributorsPvMin = defaults::MinNTracks,
int nContributorsPvMax = defaults::MaxNTracks,
float timeFitMax = defaults::MaxFITTime,
float amplitudeThresholdFV0A = defaults::AmplitudeThresholdFV0A,
float amplitudeThresholdFT0A = defaults::AmplitudeThresholdFT0A,
float amplitudeThresholdFT0C = defaults::AmplitudeThresholdFT0C)
Expand All @@ -74,10 +84,10 @@ inline auto determineGapType(TCollision const& collision,

// Configure SGSelector thresholds
SGCutParHolder sgCuts;
sgCuts.SetNDtcoll(defaults::NDtColl);
sgCuts.SetMinNBCs(defaults::MinNBCs);
sgCuts.SetNTracks(defaults::MinNTracks, defaults::MaxNTracks);
sgCuts.SetMaxFITtime(defaults::MaxFITTime);
sgCuts.SetNDtcoll(nDtColl);
sgCuts.SetMinNBCs(nBcsMin);
sgCuts.SetNTracks(nContributorsPvMin, nContributorsPvMax);
sgCuts.SetMaxFITtime(timeFitMax);
sgCuts.SetFITAmpLimits({amplitudeThresholdFV0A, amplitudeThresholdFT0A, amplitudeThresholdFT0C});

// Get BC and BC range
Expand Down Expand Up @@ -108,6 +118,11 @@ inline auto determineGapType(TCollision const& collision,
HfUpcGapThresholds const& thresholds)
{
return determineGapType(collision, bcs,
thresholds.nDtColl.value,
thresholds.nBcsMin.value,
thresholds.nContributorsPvMin.value,
thresholds.nContributorsPvMax.value,
thresholds.timeFitMax.value,
thresholds.fv0aThreshold.value,
thresholds.ft0aThreshold.value,
thresholds.ft0cThreshold.value);
Expand Down
Loading