From 9b048a6b53d2a9569dfcb8eb1ebf6afb1a20be01 Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Thu, 1 Feb 2024 17:42:10 +0100 Subject: [PATCH 01/11] Add chiPCA among possible ML input features for Lc. --- PWGHF/Core/HfMlResponseLcToPKPi.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PWGHF/Core/HfMlResponseLcToPKPi.h b/PWGHF/Core/HfMlResponseLcToPKPi.h index 31686ed3479..75c3a1d9e7c 100644 --- a/PWGHF/Core/HfMlResponseLcToPKPi.h +++ b/PWGHF/Core/HfMlResponseLcToPKPi.h @@ -68,6 +68,7 @@ enum class InputFeaturesLcToPKPi : uint8_t { decayLengthXYNormalised, cpa, cpaXY, + chi2PCA, tpcNSigmaP0, // 0 tpcNSigmaKa0, // 0 tpcNSigmaPi0, // 0 @@ -131,6 +132,7 @@ class HfMlResponseLcToPKPi : public HfMlResponse CHECK_AND_FILL_VEC_LCTOPKPI(decayLengthXYNormalised); CHECK_AND_FILL_VEC_LCTOPKPI(cpa); CHECK_AND_FILL_VEC_LCTOPKPI(cpaXY); + CHECK_AND_FILL_VEC_LCTOPKPI(chi2PCA); // TPC PID variables CHECK_AND_FILL_VEC_LCTOPKPI_FULL(prong0, tpcNSigmaP0, tpcNSigmaPr); CHECK_AND_FILL_VEC_LCTOPKPI_FULL(prong0, tpcNSigmaKa0, tpcNSigmaKa); @@ -183,6 +185,7 @@ class HfMlResponseLcToPKPi : public HfMlResponse FILL_MAP_LCTOPKPI(decayLengthXYNormalised), FILL_MAP_LCTOPKPI(cpa), FILL_MAP_LCTOPKPI(cpaXY), + FILL_MAP_LCTOPKPI(chi2PCA), // TPC PID variables FILL_MAP_LCTOPKPI(tpcNSigmaP0), FILL_MAP_LCTOPKPI(tpcNSigmaKa0), From 11ab48a399cbb589cf8ae26ef6bf66eac9497a12 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Thu, 1 Feb 2024 16:53:11 +0000 Subject: [PATCH 02/11] MegaLinter fixes --- PWGHF/Core/HfMlResponseLcToPKPi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGHF/Core/HfMlResponseLcToPKPi.h b/PWGHF/Core/HfMlResponseLcToPKPi.h index 75c3a1d9e7c..bf0b07cfbbc 100644 --- a/PWGHF/Core/HfMlResponseLcToPKPi.h +++ b/PWGHF/Core/HfMlResponseLcToPKPi.h @@ -23,9 +23,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_LCTOPKPI(FEATURE) \ - { \ -#FEATURE, static_cast < uint8_t>(InputFeaturesLcToPKPi::FEATURE) \ +#define FILL_MAP_LCTOPKPI(FEATURE) \ + { \ + #FEATURE, static_cast(InputFeaturesLcToPKPi::FEATURE) \ } // Check if the index of mCachedIndices (index associated to a FEATURE) From 1336600ad80453ce43d96240955c8a23e514c87d Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Thu, 1 Feb 2024 16:54:44 +0000 Subject: [PATCH 03/11] Please consider the following formatting changes --- PWGHF/Core/HfMlResponseLcToPKPi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGHF/Core/HfMlResponseLcToPKPi.h b/PWGHF/Core/HfMlResponseLcToPKPi.h index bf0b07cfbbc..75c3a1d9e7c 100644 --- a/PWGHF/Core/HfMlResponseLcToPKPi.h +++ b/PWGHF/Core/HfMlResponseLcToPKPi.h @@ -23,9 +23,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_LCTOPKPI(FEATURE) \ - { \ - #FEATURE, static_cast(InputFeaturesLcToPKPi::FEATURE) \ +#define FILL_MAP_LCTOPKPI(FEATURE) \ + { \ +#FEATURE, static_cast < uint8_t>(InputFeaturesLcToPKPi::FEATURE) \ } // Check if the index of mCachedIndices (index associated to a FEATURE) From bad9714049327254fcd065b2f65265cc6944ab67 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Thu, 1 Feb 2024 17:02:43 +0000 Subject: [PATCH 04/11] MegaLinter fixes --- PWGHF/Core/HfMlResponseLcToPKPi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGHF/Core/HfMlResponseLcToPKPi.h b/PWGHF/Core/HfMlResponseLcToPKPi.h index 75c3a1d9e7c..bf0b07cfbbc 100644 --- a/PWGHF/Core/HfMlResponseLcToPKPi.h +++ b/PWGHF/Core/HfMlResponseLcToPKPi.h @@ -23,9 +23,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_LCTOPKPI(FEATURE) \ - { \ -#FEATURE, static_cast < uint8_t>(InputFeaturesLcToPKPi::FEATURE) \ +#define FILL_MAP_LCTOPKPI(FEATURE) \ + { \ + #FEATURE, static_cast(InputFeaturesLcToPKPi::FEATURE) \ } // Check if the index of mCachedIndices (index associated to a FEATURE) From 86950dee51aee3fc89a19b20167c7b366d623b3c Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Thu, 1 Feb 2024 18:05:28 +0100 Subject: [PATCH 05/11] Fix Clang format. --- PWGHF/Core/HfMlResponseLcToPKPi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGHF/Core/HfMlResponseLcToPKPi.h b/PWGHF/Core/HfMlResponseLcToPKPi.h index bf0b07cfbbc..75c3a1d9e7c 100644 --- a/PWGHF/Core/HfMlResponseLcToPKPi.h +++ b/PWGHF/Core/HfMlResponseLcToPKPi.h @@ -23,9 +23,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_LCTOPKPI(FEATURE) \ - { \ - #FEATURE, static_cast(InputFeaturesLcToPKPi::FEATURE) \ +#define FILL_MAP_LCTOPKPI(FEATURE) \ + { \ +#FEATURE, static_cast < uint8_t>(InputFeaturesLcToPKPi::FEATURE) \ } // Check if the index of mCachedIndices (index associated to a FEATURE) From 713aa7e42efc0de7f3209f91d99e0478b08d4742 Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Thu, 1 Feb 2024 18:11:33 +0100 Subject: [PATCH 06/11] Fix MegaLinter manually. --- PWGHF/Core/HfMlResponseLcToPKPi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGHF/Core/HfMlResponseLcToPKPi.h b/PWGHF/Core/HfMlResponseLcToPKPi.h index 75c3a1d9e7c..bf0b07cfbbc 100644 --- a/PWGHF/Core/HfMlResponseLcToPKPi.h +++ b/PWGHF/Core/HfMlResponseLcToPKPi.h @@ -23,9 +23,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_LCTOPKPI(FEATURE) \ - { \ -#FEATURE, static_cast < uint8_t>(InputFeaturesLcToPKPi::FEATURE) \ +#define FILL_MAP_LCTOPKPI(FEATURE) \ + { \ + #FEATURE, static_cast(InputFeaturesLcToPKPi::FEATURE) \ } // Check if the index of mCachedIndices (index associated to a FEATURE) From 417a9758c866e868d435379c1c4d923f9c31a691 Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Thu, 1 Feb 2024 18:14:49 +0100 Subject: [PATCH 07/11] Fix Clang format. --- PWGHF/Core/HfMlResponseLcToPKPi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGHF/Core/HfMlResponseLcToPKPi.h b/PWGHF/Core/HfMlResponseLcToPKPi.h index bf0b07cfbbc..75c3a1d9e7c 100644 --- a/PWGHF/Core/HfMlResponseLcToPKPi.h +++ b/PWGHF/Core/HfMlResponseLcToPKPi.h @@ -23,9 +23,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_LCTOPKPI(FEATURE) \ - { \ - #FEATURE, static_cast(InputFeaturesLcToPKPi::FEATURE) \ +#define FILL_MAP_LCTOPKPI(FEATURE) \ + { \ +#FEATURE, static_cast < uint8_t>(InputFeaturesLcToPKPi::FEATURE) \ } // Check if the index of mCachedIndices (index associated to a FEATURE) From ea5b6cf46aa140f5829f778a943d946dd8060688 Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Thu, 1 Feb 2024 18:37:56 +0100 Subject: [PATCH 08/11] Hopefully fixing MegaLinter. --- PWGHF/Core/HfMlResponseLcToPKPi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/Core/HfMlResponseLcToPKPi.h b/PWGHF/Core/HfMlResponseLcToPKPi.h index 75c3a1d9e7c..035ad5488a8 100644 --- a/PWGHF/Core/HfMlResponseLcToPKPi.h +++ b/PWGHF/Core/HfMlResponseLcToPKPi.h @@ -25,7 +25,7 @@ // the value is the corresponding value in EnumInputFeatures #define FILL_MAP_LCTOPKPI(FEATURE) \ { \ -#FEATURE, static_cast < uint8_t>(InputFeaturesLcToPKPi::FEATURE) \ +#FEATURE, static_cast(InputFeaturesLcToPKPi::FEATURE) \ } // Check if the index of mCachedIndices (index associated to a FEATURE) From e3cc311d1fa9fb7235f38837bb2eb834871ca990 Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Thu, 1 Feb 2024 18:40:53 +0100 Subject: [PATCH 09/11] Fix again Clang format. --- PWGHF/Core/HfMlResponseLcToPKPi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGHF/Core/HfMlResponseLcToPKPi.h b/PWGHF/Core/HfMlResponseLcToPKPi.h index 035ad5488a8..75c3a1d9e7c 100644 --- a/PWGHF/Core/HfMlResponseLcToPKPi.h +++ b/PWGHF/Core/HfMlResponseLcToPKPi.h @@ -25,7 +25,7 @@ // the value is the corresponding value in EnumInputFeatures #define FILL_MAP_LCTOPKPI(FEATURE) \ { \ -#FEATURE, static_cast(InputFeaturesLcToPKPi::FEATURE) \ +#FEATURE, static_cast < uint8_t>(InputFeaturesLcToPKPi::FEATURE) \ } // Check if the index of mCachedIndices (index associated to a FEATURE) From d8103cfbd5717ec118b5f2cea9051e6c92d017bd Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Thu, 1 Feb 2024 18:41:34 +0100 Subject: [PATCH 10/11] Another spacing issue. --- PWGHF/Core/HfMlResponseLcToPKPi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGHF/Core/HfMlResponseLcToPKPi.h b/PWGHF/Core/HfMlResponseLcToPKPi.h index 75c3a1d9e7c..bbd4f3823c0 100644 --- a/PWGHF/Core/HfMlResponseLcToPKPi.h +++ b/PWGHF/Core/HfMlResponseLcToPKPi.h @@ -23,8 +23,8 @@ // 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_LCTOPKPI(FEATURE) \ - { \ +#define FILL_MAP_LCTOPKPI(FEATURE) \ + { \ #FEATURE, static_cast < uint8_t>(InputFeaturesLcToPKPi::FEATURE) \ } From ffc43fd515f11b19abceb82f3b2c5b8cf0897913 Mon Sep 17 00:00:00 2001 From: Mattia Faggin Date: Thu, 1 Feb 2024 18:42:36 +0100 Subject: [PATCH 11/11] Fix again Clang format. --- PWGHF/Core/HfMlResponseLcToPKPi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGHF/Core/HfMlResponseLcToPKPi.h b/PWGHF/Core/HfMlResponseLcToPKPi.h index bbd4f3823c0..75c3a1d9e7c 100644 --- a/PWGHF/Core/HfMlResponseLcToPKPi.h +++ b/PWGHF/Core/HfMlResponseLcToPKPi.h @@ -23,8 +23,8 @@ // 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_LCTOPKPI(FEATURE) \ - { \ +#define FILL_MAP_LCTOPKPI(FEATURE) \ + { \ #FEATURE, static_cast < uint8_t>(InputFeaturesLcToPKPi::FEATURE) \ }