From bed334916e98e24b366a7e4fc37e5c744f5adc53 Mon Sep 17 00:00:00 2001 From: scattaru Date: Tue, 20 Feb 2024 13:20:29 +0100 Subject: [PATCH 1/3] Adding some input features to the MlResponse --- PWGHF/Core/HfMlResponseDsToKKPi.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/PWGHF/Core/HfMlResponseDsToKKPi.h b/PWGHF/Core/HfMlResponseDsToKKPi.h index 08ce699b37f..298636cfa16 100644 --- a/PWGHF/Core/HfMlResponseDsToKKPi.h +++ b/PWGHF/Core/HfMlResponseDsToKKPi.h @@ -82,9 +82,16 @@ enum class InputFeaturesDsToKKPi : uint8_t { ptProng0, ptProng1, ptProng2, + impactParameterXY, impactParameterXY0, impactParameterXY1, impactParameterXY2, + nSigTpcPi0, + nSigTpcPi1, + nSigTpcPi2, + nSigTpcKa0, + nSigTpcKa1, + nSigTpcKa2, nSigTpcTofPi0, nSigTpcTofPi1, nSigTpcTofPi2, @@ -132,9 +139,17 @@ class HfMlResponseDsToKKPi : public HfMlResponse CHECK_AND_FILL_VEC_DS(ptProng0); CHECK_AND_FILL_VEC_DS(ptProng1); CHECK_AND_FILL_VEC_DS(ptProng2); + CHECK_AND_FILL_VEC_DS(impactParameterXY); CHECK_AND_FILL_VEC_DS_FULL(candidate, impactParameterXY0, impactParameter0); CHECK_AND_FILL_VEC_DS_FULL(candidate, impactParameterXY1, impactParameter1); CHECK_AND_FILL_VEC_DS_FULL(candidate, impactParameterXY2, impactParameter2); + // TPC PID variables + CHECK_AND_FILL_VEC_DS_FULL(prong0, nSigTpcPi0, tpcNSigmaPi); + CHECK_AND_FILL_VEC_DS_FULL(prong1, nSigTpcPi1, tpcNSigmaPi); + CHECK_AND_FILL_VEC_DS_FULL(prong2, nSigTpcPi2, tpcNSigmaPi); + CHECK_AND_FILL_VEC_DS_FULL(prong0, nSigTpcKa0, tpcNSigmaKa); + CHECK_AND_FILL_VEC_DS_FULL(prong1, nSigTpcKa1, tpcNSigmaKa); + CHECK_AND_FILL_VEC_DS_FULL(prong2, nSigTpcKa2, tpcNSigmaKa); // Combined PID variables CHECK_AND_FILL_VEC_DS_FULL(prong0, nSigTpcTofPi0, tpcTofNSigmaPi); CHECK_AND_FILL_VEC_DS_FULL(prong1, nSigTpcTofPi1, tpcTofNSigmaPi); @@ -168,9 +183,17 @@ class HfMlResponseDsToKKPi : public HfMlResponse FILL_MAP_DS(ptProng0), FILL_MAP_DS(ptProng1), FILL_MAP_DS(ptProng2), + FILL_MAP_DS(impactParameterXY), FILL_MAP_DS(impactParameterXY0), FILL_MAP_DS(impactParameterXY1), FILL_MAP_DS(impactParameterXY2), + // TPC PID variables + FILL_MAP_DS(nSigTpcPi0), + FILL_MAP_DS(nSigTpcPi1), + FILL_MAP_DS(nSigTpcPi2), + FILL_MAP_DS(nSigTpcKa0), + FILL_MAP_DS(nSigTpcKa1), + FILL_MAP_DS(nSigTpcKa2), // Combined PID variables FILL_MAP_DS(nSigTpcTofPi0), FILL_MAP_DS(nSigTpcTofPi1), From c6904a418cae9cee32926b83581f55799ee247f9 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Tue, 20 Feb 2024 12:28:00 +0000 Subject: [PATCH 2/3] MegaLinter fixes --- PWGHF/Core/HfMlResponseDsToKKPi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGHF/Core/HfMlResponseDsToKKPi.h b/PWGHF/Core/HfMlResponseDsToKKPi.h index 298636cfa16..1b344e82b99 100644 --- a/PWGHF/Core/HfMlResponseDsToKKPi.h +++ b/PWGHF/Core/HfMlResponseDsToKKPi.h @@ -24,9 +24,9 @@ // Fill the map of available input features // the key is the feature's name (std::string) // the value is the corresponding value in EnumInputFeatures -#define FILL_MAP_DS(FEATURE) \ - { \ -#FEATURE, static_cast < uint8_t>(InputFeaturesDsToKKPi::FEATURE) \ +#define FILL_MAP_DS(FEATURE) \ + { \ + #FEATURE, static_cast(InputFeaturesDsToKKPi::FEATURE) \ } // Check if the index of mCachedIndices (index associated to a FEATURE) From f33f59e61cdf2ded498d153d93d632f4849bd86a Mon Sep 17 00:00:00 2001 From: scattaru Date: Tue, 20 Feb 2024 15:37:07 +0100 Subject: [PATCH 3/3] clang-format fixed --- PWGHF/Core/HfMlResponseDsToKKPi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGHF/Core/HfMlResponseDsToKKPi.h b/PWGHF/Core/HfMlResponseDsToKKPi.h index 1b344e82b99..298636cfa16 100644 --- a/PWGHF/Core/HfMlResponseDsToKKPi.h +++ b/PWGHF/Core/HfMlResponseDsToKKPi.h @@ -24,9 +24,9 @@ // Fill the map of available input features // the key is the feature's name (std::string) // the value is the corresponding value in EnumInputFeatures -#define FILL_MAP_DS(FEATURE) \ - { \ - #FEATURE, static_cast(InputFeaturesDsToKKPi::FEATURE) \ +#define FILL_MAP_DS(FEATURE) \ + { \ +#FEATURE, static_cast < uint8_t>(InputFeaturesDsToKKPi::FEATURE) \ } // Check if the index of mCachedIndices (index associated to a FEATURE)