diff --git a/PWGHF/Core/HfMlResponseB0ToDPi.h b/PWGHF/Core/HfMlResponseB0ToDPi.h
index 4f40c094c95..166500eaa5a 100644
--- a/PWGHF/Core/HfMlResponseB0ToDPi.h
+++ b/PWGHF/Core/HfMlResponseB0ToDPi.h
@@ -25,9 +25,10 @@
 // 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_B0(FEATURE) \
-  {                          \
-    #FEATURE, static_cast<uint8_t>(InputFeaturesB0ToDPi::FEATURE)}
+#define FILL_MAP_B0(FEATURE)                                      \
+  {                                                               \
+    #FEATURE, static_cast<uint8_t>(InputFeaturesB0ToDPi::FEATURE) \
+  }
 
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE
diff --git a/PWGHF/Core/HfMlResponseBplusToD0Pi.h b/PWGHF/Core/HfMlResponseBplusToD0Pi.h
index 7d189848e65..8fe1a8e4fb2 100644
--- a/PWGHF/Core/HfMlResponseBplusToD0Pi.h
+++ b/PWGHF/Core/HfMlResponseBplusToD0Pi.h
@@ -24,9 +24,10 @@
 // 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_BPLUS(FEATURE) \
-  {                             \
-    #FEATURE, static_cast<uint8_t>(InputFeaturesBplusToD0Pi::FEATURE)}
+#define FILL_MAP_BPLUS(FEATURE)                                       \
+  {                                                                   \
+    #FEATURE, static_cast<uint8_t>(InputFeaturesBplusToD0Pi::FEATURE) \
+  }
 
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE
diff --git a/PWGHF/Core/HfMlResponseBplusToD0PiReduced.h b/PWGHF/Core/HfMlResponseBplusToD0PiReduced.h
index f67f62f656d..f5f4b0fffff 100644
--- a/PWGHF/Core/HfMlResponseBplusToD0PiReduced.h
+++ b/PWGHF/Core/HfMlResponseBplusToD0PiReduced.h
@@ -24,9 +24,10 @@
 // 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_BPLUS(FEATURE) \
-  {                             \
-    #FEATURE, static_cast<uint8_t>(InputFeaturesBplusToD0PiReduced::FEATURE)}
+#define FILL_MAP_BPLUS(FEATURE)                                              \
+  {                                                                          \
+    #FEATURE, static_cast<uint8_t>(InputFeaturesBplusToD0PiReduced::FEATURE) \
+  }
 
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE
diff --git a/PWGHF/Core/HfMlResponseBsToDsPi.h b/PWGHF/Core/HfMlResponseBsToDsPi.h
index f42183d2065..f8ede976e15 100644
--- a/PWGHF/Core/HfMlResponseBsToDsPi.h
+++ b/PWGHF/Core/HfMlResponseBsToDsPi.h
@@ -24,9 +24,10 @@
 // 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_BS(FEATURE) \
-  {                          \
-    #FEATURE, static_cast<uint8_t>(InputFeaturesBsToDsPi::FEATURE)}
+#define FILL_MAP_BS(FEATURE)                                       \
+  {                                                                \
+    #FEATURE, static_cast<uint8_t>(InputFeaturesBsToDsPi::FEATURE) \
+  }
 
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE
diff --git a/PWGHF/Core/HfMlResponseD0ToKPi.h b/PWGHF/Core/HfMlResponseD0ToKPi.h
index 2fa6038fa3b..863d25936af 100644
--- a/PWGHF/Core/HfMlResponseD0ToKPi.h
+++ b/PWGHF/Core/HfMlResponseD0ToKPi.h
@@ -25,9 +25,10 @@
 // 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_D0(FEATURE) \
-  {                          \
-    #FEATURE, static_cast<uint8_t>(InputFeaturesD0ToKPi::FEATURE)}
+#define FILL_MAP_D0(FEATURE)                                      \
+  {                                                               \
+    #FEATURE, static_cast<uint8_t>(InputFeaturesD0ToKPi::FEATURE) \
+  }
 
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE
diff --git a/PWGHF/Core/HfMlResponseDplusToPiKPi.h b/PWGHF/Core/HfMlResponseDplusToPiKPi.h
index e2d3fc2abe2..4cb97fc2ed7 100644
--- a/PWGHF/Core/HfMlResponseDplusToPiKPi.h
+++ b/PWGHF/Core/HfMlResponseDplusToPiKPi.h
@@ -23,9 +23,10 @@
 // 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_DPLUS(FEATURE) \
-  {                             \
-    #FEATURE, static_cast<uint8_t>(InputFeaturesDplusToPiKPi::FEATURE)}
+#define FILL_MAP_DPLUS(FEATURE)                                        \
+  {                                                                    \
+    #FEATURE, static_cast<uint8_t>(InputFeaturesDplusToPiKPi::FEATURE) \
+  }
 
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE
diff --git a/PWGHF/Core/HfMlResponseDsToKKPi.h b/PWGHF/Core/HfMlResponseDsToKKPi.h
index a050a67d242..21fe3072462 100644
--- a/PWGHF/Core/HfMlResponseDsToKKPi.h
+++ b/PWGHF/Core/HfMlResponseDsToKKPi.h
@@ -24,9 +24,10 @@
 // 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<uint8_t>(InputFeaturesDsToKKPi::FEATURE) \
+  }
 
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE
diff --git a/PWGHF/Core/HfMlResponseDstarToD0Pi.h b/PWGHF/Core/HfMlResponseDstarToD0Pi.h
index 98999e99302..5ce7b229164 100644
--- a/PWGHF/Core/HfMlResponseDstarToD0Pi.h
+++ b/PWGHF/Core/HfMlResponseDstarToD0Pi.h
@@ -23,9 +23,10 @@
 // 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_DSTAR(FEATURE) \
-  {                             \
-    #FEATURE, static_cast<uint8_t>(InputFeaturesDstarToD0Pi::FEATURE)}
+#define FILL_MAP_DSTAR(FEATURE)                                       \
+  {                                                                   \
+    #FEATURE, static_cast<uint8_t>(InputFeaturesDstarToD0Pi::FEATURE) \
+  }
 
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE
diff --git a/PWGHF/Core/HfMlResponseLbToLcPi.h b/PWGHF/Core/HfMlResponseLbToLcPi.h
index 7a8141356ea..193053c1b00 100644
--- a/PWGHF/Core/HfMlResponseLbToLcPi.h
+++ b/PWGHF/Core/HfMlResponseLbToLcPi.h
@@ -24,9 +24,10 @@
 // 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_LB(FEATURE) \
-  {                          \
-    #FEATURE, static_cast<uint8_t>(InputFeaturesLbToLcPi::FEATURE)}
+#define FILL_MAP_LB(FEATURE)                                       \
+  {                                                                \
+    #FEATURE, static_cast<uint8_t>(InputFeaturesLbToLcPi::FEATURE) \
+  }
 
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE
diff --git a/PWGHF/Core/HfMlResponseLcToK0sP.h b/PWGHF/Core/HfMlResponseLcToK0sP.h
index 1dadd4ddde3..1825dcbaabf 100644
--- a/PWGHF/Core/HfMlResponseLcToK0sP.h
+++ b/PWGHF/Core/HfMlResponseLcToK0sP.h
@@ -25,9 +25,10 @@
 // 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_LC(FEATURE) \
-  {                          \
-    #FEATURE, static_cast<uint8_t>(InputFeaturesLcToK0sP::FEATURE)}
+#define FILL_MAP_LC(FEATURE)                                       \
+  {                                                                \
+    #FEATURE, static_cast<uint8_t>(InputFeaturesLcToK0sP::FEATURE) \
+  }
 
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE
diff --git a/PWGHF/Core/HfMlResponseLcToPKPi.h b/PWGHF/Core/HfMlResponseLcToPKPi.h
index 89b2e88b0e7..956fff55b28 100644
--- a/PWGHF/Core/HfMlResponseLcToPKPi.h
+++ b/PWGHF/Core/HfMlResponseLcToPKPi.h
@@ -26,9 +26,10 @@
 // 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<uint8_t>(InputFeaturesLcToPKPi::FEATURE) \
+  }
 
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE
diff --git a/PWGHF/Core/HfMlResponseOmegacToOmegaPi.h b/PWGHF/Core/HfMlResponseOmegacToOmegaPi.h
index 9516258edad..10fa1a94207 100644
--- a/PWGHF/Core/HfMlResponseOmegacToOmegaPi.h
+++ b/PWGHF/Core/HfMlResponseOmegacToOmegaPi.h
@@ -24,9 +24,10 @@
 // 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_OMEGAC0(FEATURE) \
-  {                               \
-    #FEATURE, static_cast<uint8_t>(InputFeaturesOmegacToOmegaPi::FEATURE)}
+#define FILL_MAP_OMEGAC0(FEATURE)                                         \
+  {                                                                       \
+    #FEATURE, static_cast<uint8_t>(InputFeaturesOmegacToOmegaPi::FEATURE) \
+  }
 
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE
diff --git a/PWGHF/Core/HfMlResponseXic0ToXiPiKf.h b/PWGHF/Core/HfMlResponseXic0ToXiPiKf.h
index 5c4a51092b6..3458b503783 100644
--- a/PWGHF/Core/HfMlResponseXic0ToXiPiKf.h
+++ b/PWGHF/Core/HfMlResponseXic0ToXiPiKf.h
@@ -23,9 +23,10 @@
 // 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_XIC0TOXIPIKF(FEATURE) \
-  {                                    \
-    #FEATURE, static_cast<uint8_t>(InputFeaturesXic0ToXiPiKf::FEATURE)}
+#define FILL_MAP_XIC0TOXIPIKF(FEATURE)                                 \
+  {                                                                    \
+    #FEATURE, static_cast<uint8_t>(InputFeaturesXic0ToXiPiKf::FEATURE) \
+  }
 
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE
diff --git a/PWGHF/Core/HfMlResponseXicToPKPi.h b/PWGHF/Core/HfMlResponseXicToPKPi.h
index 9f56a1a9db2..a60dc0e4eb2 100644
--- a/PWGHF/Core/HfMlResponseXicToPKPi.h
+++ b/PWGHF/Core/HfMlResponseXicToPKPi.h
@@ -23,9 +23,10 @@
 // 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_XIC(FEATURE) \
-  {                           \
-    #FEATURE, static_cast<uint8_t>(InputFeaturesXicToPKPi::FEATURE)}
+#define FILL_MAP_XIC(FEATURE)                                       \
+  {                                                                 \
+    #FEATURE, static_cast<uint8_t>(InputFeaturesXicToPKPi::FEATURE) \
+  }
 
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE
diff --git a/PWGHF/Core/HfMlResponseXicToXiPiPi.h b/PWGHF/Core/HfMlResponseXicToXiPiPi.h
index b50fc68d0cf..01429649f6f 100644
--- a/PWGHF/Core/HfMlResponseXicToXiPiPi.h
+++ b/PWGHF/Core/HfMlResponseXicToXiPiPi.h
@@ -23,9 +23,10 @@
 // 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_XICTOXIPIPI(FEATURE) \
-  {                                   \
-    #FEATURE, static_cast<uint8_t>(InputFeaturesXicToXiPiPi::FEATURE)}
+#define FILL_MAP_XICTOXIPIPI(FEATURE)                                 \
+  {                                                                   \
+    #FEATURE, static_cast<uint8_t>(InputFeaturesXicToXiPiPi::FEATURE) \
+  }
 
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE