diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/calibmon.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/calibmon.py
index b56273f5d8d3d8a27675c1e78afeb4d0dd1eaee4..8fca47b6669236d1dd786132fb9a0b7fd2d5b45f 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/calibmon.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/monitoring/calibmon.py
@@ -593,12 +593,12 @@ def calibmon_dst_to_d0_pi(name="Hlt2CalibMon_DstToD0Pi"):
                 dst_mass_part_dict,
                 variable_x=_CHILDMASS()
                 * (
-                    in_range(p_bins[p_idx] * GeV, _GCHILDETA(), p_bins[p_idx + 1] * GeV)
+                    in_range(eta_bins[eta_idx], _GCHILDETA(), eta_bins[eta_idx + 1])
                     & (_GCHILDPID_K() > pid_cut)
                 ),
                 variable_y=_DELTAMASS()
                 * (
-                    in_range(p_bins[p_idx] * GeV, _GCHILDETA(), p_bins[p_idx + 1] * GeV)
+                    in_range(eta_bins[eta_idx], _GCHILDETA(), eta_bins[eta_idx + 1])
                     & (_GCHILDPID_K() > pid_cut)
                 ),
             )
@@ -608,13 +608,13 @@ def calibmon_dst_to_d0_pi(name="Hlt2CalibMon_DstToD0Pi"):
                 dst_mass_part_dict,
                 variable_x=_CHILDMASS()
                 * (
-                    in_range(p_bins[p_idx] * GeV, _GCHILDETA(), p_bins[p_idx + 1] * GeV)
+                    in_range(eta_bins[eta_idx], _GCHILDETA(), eta_bins[eta_idx + 1])
                     & (_GCHILDPID_P() > pid_cut)
                     & (_GCHILDP() > 10 * GeV)
                 ),
                 variable_y=_DELTAMASS()
                 * (
-                    in_range(p_bins[p_idx] * GeV, _GCHILDETA(), p_bins[p_idx + 1] * GeV)
+                    in_range(eta_bins[eta_idx], _GCHILDETA(), eta_bins[eta_idx + 1])
                     & (_GCHILDPID_P() > pid_cut)
                     & (_GCHILDP() > 10 * GeV)
                 ),
@@ -625,13 +625,13 @@ def calibmon_dst_to_d0_pi(name="Hlt2CalibMon_DstToD0Pi"):
                 dst_mass_part_dict,
                 variable_x=_CHILDMASS()
                 * (
-                    in_range(p_bins[p_idx] * GeV, _GCHILDETA(), p_bins[p_idx + 1] * GeV)
+                    in_range(eta_bins[eta_idx], _GCHILDETA(), eta_bins[eta_idx + 1])
                     & (_GCHILDPID_PK() > pid_cut)
                     & (_GCHILDP() > 10 * GeV)
                 ),
                 variable_y=_DELTAMASS()
                 * (
-                    in_range(p_bins[p_idx] * GeV, _GCHILDETA(), p_bins[p_idx + 1] * GeV)
+                    in_range(eta_bins[eta_idx], _GCHILDETA(), eta_bins[eta_idx + 1])
                     & (_GCHILDPID_PK() > pid_cut)
                     & (_GCHILDP() > 10 * GeV)
                 ),
@@ -642,16 +642,12 @@ def calibmon_dst_to_d0_pi(name="Hlt2CalibMon_DstToD0Pi"):
                 dst_mass_part_dict,
                 variable_x=_CHILDMASS()
                 * (
-                    in_range(
-                        p_bins[p_idx] * GeV, _GCHILDETA(j=2), p_bins[p_idx + 1] * GeV
-                    )
+                    in_range(eta_bins[eta_idx], _GCHILDETA(j=2), eta_bins[eta_idx + 1])
                     & (_GCHILDPID_K(j=2) > pid_cut)
                 ),
                 variable_y=_DELTAMASS()
                 * (
-                    in_range(
-                        p_bins[p_idx] * GeV, _GCHILDETA(j=2), p_bins[p_idx + 1] * GeV
-                    )
+                    in_range(eta_bins[eta_idx], _GCHILDETA(j=2), eta_bins[eta_idx + 1])
                     & (_GCHILDPID_K(j=2) > pid_cut)
                 ),
             )
@@ -661,16 +657,12 @@ def calibmon_dst_to_d0_pi(name="Hlt2CalibMon_DstToD0Pi"):
                 dst_mass_part_dict,
                 variable_x=_CHILDMASS()
                 * (
-                    in_range(
-                        p_bins[p_idx] * GeV, _GCHILDETA(j=2), p_bins[p_idx + 1] * GeV
-                    )
+                    in_range(eta_bins[eta_idx], _GCHILDETA(j=2), eta_bins[eta_idx + 1])
                     & (_GCHILDPID_P(j=2) > pid_cut)
                 ),
                 variable_y=_DELTAMASS()
                 * (
-                    in_range(
-                        p_bins[p_idx] * GeV, _GCHILDETA(j=2), p_bins[p_idx + 1] * GeV
-                    )
+                    in_range(eta_bins[eta_idx], _GCHILDETA(j=2), eta_bins[eta_idx + 1])
                     & (_GCHILDPID_P(j=2) > pid_cut)
                 ),
             )
@@ -680,16 +672,12 @@ def calibmon_dst_to_d0_pi(name="Hlt2CalibMon_DstToD0Pi"):
                 dst_mass_part_dict,
                 variable_x=_CHILDMASS()
                 * (
-                    in_range(
-                        p_bins[p_idx] * GeV, _GCHILDETA(j=2), p_bins[p_idx + 1] * GeV
-                    )
+                    in_range(eta_bins[eta_idx], _GCHILDETA(j=2), eta_bins[eta_idx + 1])
                     & (_GCHILDPID_PK(j=2) > pid_cut)
                 ),
                 variable_y=_DELTAMASS()
                 * (
-                    in_range(
-                        p_bins[p_idx] * GeV, _GCHILDETA(j=2), p_bins[p_idx + 1] * GeV
-                    )
+                    in_range(eta_bins[eta_idx], _GCHILDETA(j=2), eta_bins[eta_idx + 1])
                     & (_GCHILDPID_PK(j=2) > pid_cut)
                 ),
             )