diff --git a/Pr/PrConverters/tests/refs/convert_tracks.ref b/Pr/PrConverters/tests/refs/convert_tracks.ref
index c7aeb54f45f0459f2e6387ea8a5d49c748f2e5ab..44e78b1b77420631f0d4ee7ad5a635803a1fb18a 100644
--- a/Pr/PrConverters/tests/refs/convert_tracks.ref
+++ b/Pr/PrConverters/tests/refs/convert_tracks.ref
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'run3/trunk'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00004602_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00004625_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00005065_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00005143_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00005582_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00005592_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00006124_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00006137_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00006187_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00006191_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00006211_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00006220_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00006746_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007187_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007259_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007332_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007348_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007357_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007389_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007409_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007441_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007457_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007519_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007578_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007641_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007658_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007932_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007952_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00008351_1.ldst']
 |                                         (default: [])
diff --git a/Pr/PrConverters/tests/refs/convert_tracks.ref.detdesc b/Pr/PrConverters/tests/refs/convert_tracks.ref.detdesc
index a050532a93199ebeb0f47006a48124cdf08bc356..978940e8ec505e3dd2cc94669986e6f3371117db 100644
--- a/Pr/PrConverters/tests/refs/convert_tracks.ref.detdesc
+++ b/Pr/PrConverters/tests/refs/convert_tracks.ref.detdesc
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DetDesc'  (default: 'DetDesc')
 |-geometry_version                        = 'run3/trunk'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00004602_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00004625_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00005065_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00005143_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00005582_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00005592_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00006124_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00006137_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00006187_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00006191_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00006211_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00006220_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00006746_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007187_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007259_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007332_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007348_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007357_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007389_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007409_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007441_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007457_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007519_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007578_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007641_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007658_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007932_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00007952_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/MC/Upgrade/LDST/00075219/0000/00075219_00008351_1.ldst']
 |                                         (default: [])
diff --git a/Tr/TrackExtrapolators/tests/refs/test_extrapolators.ref b/Tr/TrackExtrapolators/tests/refs/test_extrapolators.ref
index 6ae76ce5b073edf97be44822fa0ff8588ea8cd85..b4ed46e376d98b01b99448682e94b7244e822dd7 100644
--- a/Tr/TrackExtrapolators/tests/refs/test_extrapolators.ref
+++ b/Tr/TrackExtrapolators/tests/refs/test_extrapolators.ref
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'run3/trunk'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_1.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_2.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_3.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_4.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_5.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_6.digi.digi']
 |                                         (default: [])
diff --git a/Tr/TrackExtrapolators/tests/refs/test_extrapolators.ref.detdesc b/Tr/TrackExtrapolators/tests/refs/test_extrapolators.ref.detdesc
index 2338a5c96001a589d343b901098441c5b3c00a56..ab90a5eccd29301ac25b96c3557fea00b36d5fa7 100644
--- a/Tr/TrackExtrapolators/tests/refs/test_extrapolators.ref.detdesc
+++ b/Tr/TrackExtrapolators/tests/refs/test_extrapolators.ref.detdesc
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DetDesc'  (default: 'DetDesc')
 |-geometry_version                        = 'run3/trunk'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_1.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_2.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_3.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_4.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_5.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_6.digi.digi']
 |                                         (default: [])
diff --git a/Tr/TrackExtrapolators/tests/refs/test_extrapolators.ref.x86_64_v3-detdesc-opt b/Tr/TrackExtrapolators/tests/refs/test_extrapolators.ref.x86_64_v3-detdesc-opt
index 2cdd3e01e0edae1543f1765d50f8c555a70ece73..e9db79031642b64713a4075abe8bd5f11f4f8e87 100644
--- a/Tr/TrackExtrapolators/tests/refs/test_extrapolators.ref.x86_64_v3-detdesc-opt
+++ b/Tr/TrackExtrapolators/tests/refs/test_extrapolators.ref.x86_64_v3-detdesc-opt
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DetDesc'  (default: 'DetDesc')
 |-geometry_version                        = 'run3/trunk'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_1.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_2.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_3.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_4.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_5.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_6.digi.digi']
 |                                         (default: [])
diff --git a/Tr/TrackExtrapolators/tests/refs/test_extrapolators.ref.x86_64_v3-opt b/Tr/TrackExtrapolators/tests/refs/test_extrapolators.ref.x86_64_v3-opt
index ac0f9dd8b38242dd20105eaa0090943d7d0e027a..0c51d6ea13e955e199d91adf5c7226c3c476f1a5 100644
--- a/Tr/TrackExtrapolators/tests/refs/test_extrapolators.ref.x86_64_v3-opt
+++ b/Tr/TrackExtrapolators/tests/refs/test_extrapolators.ref.x86_64_v3-opt
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'run3/trunk'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_1.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_2.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_3.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_4.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_5.digi.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Simulation/MinBiasRawBankv5/00067189_6.digi.digi']
 |                                         (default: [])