From 0cdcd9827df9c102c8b1493cac6d8ff33a89b420 Mon Sep 17 00:00:00 2001
From: RefBot <lhcbsoft@cern.ch>
Date: Tue, 7 Jan 2025 17:05:00 +0100
Subject: [PATCH] Update References for: Detector!288, LHCb!3757, Rec!3107,
 Moore!1758 based on lhcb-master-mr/12160

[skip ci]
---
 DAQ/DAQSys/tests/refs/mdfdump.ref             |  1 +
 DAQ/DAQSys/tests/refs/mdfdump.ref.detdesc     |  1 +
 DAQ/DAQSys/tests/refs/mdfwriter.ref           |  1 +
 DAQ/DAQSys/tests/refs/mdfwriter.ref.detdesc   |  1 +
 DAQ/DAQUtils/tests/refs/dumpmultievents.ref   |  1 +
 .../tests/refs/dumpmultievents.ref.detdesc    |  1 +
 .../tests/refs/dd4hep_check_db_access.ref     |  1 +
 .../refs/dd4hep_check_db_access_bare.ref      |  1 +
 .../refs/interaction_region_condition.ref     |  1 +
 .../interaction_region_condition.ref.detdesc  |  1 +
 .../refs/interaction_region_fallback.ref      |  1 +
 .../interaction_region_fallback.ref.detdesc   |  1 +
 Det/Magnet/tests/refs/test_magfieldsvc.ref    |  1 +
 .../velo_motion_from_yaml_pyconf.ref.detdesc  |  1 +
 .../tests/refs/LargebankReadingExample.ref    | 58 +++++--------------
 Ex/IOExample/tests/refs/MDFReadFailing.ref    |  1 +
 Ex/IOExample/tests/refs/MDFReadFailing2.ref   |  1 +
 Ex/IOExample/tests/refs/MDFReadFailing3.ref   |  1 +
 Ex/IOExample/tests/refs/readmc.ref            |  3 +-
 .../tests/refs/reco14stripping20mdst.ref      |  3 +-
 .../refs/reco14stripping20mdsttoroot.ref      |  3 +-
 .../tests/refs/reco14stripping21mdst.ref      |  3 +-
 .../refs/reco14stripping21mdsttoroot.ref      |  3 +-
 FT/FTDAQ/tests/refs/error_monitoring.ref      |  1 +
 .../tests/refs/error_monitoring.ref.detdesc   |  1 +
 Kernel/LHCbAlgs/tests/refs/eventcount.ref     |  1 +
 .../tests/refs/eventnumbercollect.ref         |  1 +
 Kernel/PartProp/tests/refs/dumpPartProp.ref   |  6 +-
 .../tests/refs/dumpPartProp.ref.detdesc       |  3 +-
 Kernel/PartProp/tests/refs/partprop_pids.ref  |  1 +
 .../tests/refs/partprop_pids.ref.detdesc      |  1 +
 .../refs/decode-and-spacepoints-2022-data.ref |  1 +
 .../refs/decode-and-spacepoints-2023-data.ref |  1 +
 .../refs/decode-and-spacepoints-2024-data.ref |  1 +
 .../decode-and-spacepoints-detdesc-mc.ref     |  1 +
 ...ode-and-spacepoints-detdesc-mc.ref.detdesc |  1 +
 .../refs/instanciate-compat-old-rich1.ref     |  1 +
 .../instanciate-compat-old-rich1.ref.detdesc  |  1 +
 .../tests/refs/instanciate-compat-trunk.ref   |  1 +
 .../refs/instanciate-compat-trunk.ref.detdesc |  1 +
 .../refs/radiator-volume-intersections.ref    |  1 +
 .../radiator-volume-intersections.ref.detdesc |  1 +
 .../tests/refs/test-run-change-2022-data.ref  |  1 +
 .../tests/refs/histograms.ref                 | 12 ++--
 44 files changed, 66 insertions(+), 63 deletions(-)

diff --git a/DAQ/DAQSys/tests/refs/mdfdump.ref b/DAQ/DAQSys/tests/refs/mdfdump.ref
index 75278a3e177..15d0f7ab913 100644
--- a/DAQ/DAQSys/tests/refs/mdfdump.ref
+++ b/DAQ/DAQSys/tests/refs/mdfdump.ref
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = True  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'run3/trunk'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf']
 |                                         (default: [])
diff --git a/DAQ/DAQSys/tests/refs/mdfdump.ref.detdesc b/DAQ/DAQSys/tests/refs/mdfdump.ref.detdesc
index c95971d1f5b..7e54ea06632 100644
--- a/DAQ/DAQSys/tests/refs/mdfdump.ref.detdesc
+++ b/DAQ/DAQSys/tests/refs/mdfdump.ref.detdesc
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = True  (default: False)
 |-geometry_backend                        = 'DetDesc'  (default: 'DetDesc')
 |-geometry_version                        = 'run3/trunk'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MiniBrunel/00067189.mdf']
 |                                         (default: [])
diff --git a/DAQ/DAQSys/tests/refs/mdfwriter.ref b/DAQ/DAQSys/tests/refs/mdfwriter.ref
index b7f349f2819..d0006d6751e 100644
--- a/DAQ/DAQSys/tests/refs/mdfwriter.ref
+++ b/DAQ/DAQSys/tests/refs/mdfwriter.ref
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'dddb-20170301'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/SciFi-v61/Boole-13104012-100ev-20170301.digi']
 |                                         (default: [])
diff --git a/DAQ/DAQSys/tests/refs/mdfwriter.ref.detdesc b/DAQ/DAQSys/tests/refs/mdfwriter.ref.detdesc
index abddc48f63f..32dc14de718 100644
--- a/DAQ/DAQSys/tests/refs/mdfwriter.ref.detdesc
+++ b/DAQ/DAQSys/tests/refs/mdfwriter.ref.detdesc
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DetDesc'  (default: 'DetDesc')
 |-geometry_version                        = ''  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/SciFi-v61/Boole-13104012-100ev-20170301.digi']
 |                                         (default: [])
diff --git a/DAQ/DAQUtils/tests/refs/dumpmultievents.ref b/DAQ/DAQUtils/tests/refs/dumpmultievents.ref
index 7f225434c05..607ee0c849e 100644
--- a/DAQ/DAQUtils/tests/refs/dumpmultievents.ref
+++ b/DAQ/DAQUtils/tests/refs/dumpmultievents.ref
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'dddb-20120831'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/B2CC.S20r0p2.Dimuon.dst']
 |                                         (default: [])
diff --git a/DAQ/DAQUtils/tests/refs/dumpmultievents.ref.detdesc b/DAQ/DAQUtils/tests/refs/dumpmultievents.ref.detdesc
index 9fc62e8e3c9..41587e20b09 100644
--- a/DAQ/DAQUtils/tests/refs/dumpmultievents.ref.detdesc
+++ b/DAQ/DAQUtils/tests/refs/dumpmultievents.ref.detdesc
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DetDesc'  (default: 'DetDesc')
 |-geometry_version                        = ''  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/B2CC.S20r0p2.Dimuon.dst']
 |                                         (default: [])
diff --git a/Det/DetCond/tests/refs/dd4hep_check_db_access.ref b/Det/DetCond/tests/refs/dd4hep_check_db_access.ref
index 43795e84367..781e12aeaf9 100644
--- a/Det/DetCond/tests/refs/dd4hep_check_db_access.ref
+++ b/Det/DetCond/tests/refs/dd4hep_check_db_access.ref
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'DD4TESTCOND'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = []  (default: [])
 |-input_manifest_file                     = ''  (default: '')
diff --git a/Det/DetCond/tests/refs/dd4hep_check_db_access_bare.ref b/Det/DetCond/tests/refs/dd4hep_check_db_access_bare.ref
index 43795e84367..781e12aeaf9 100644
--- a/Det/DetCond/tests/refs/dd4hep_check_db_access_bare.ref
+++ b/Det/DetCond/tests/refs/dd4hep_check_db_access_bare.ref
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'DD4TESTCOND'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = []  (default: [])
 |-input_manifest_file                     = ''  (default: '')
diff --git a/Det/LHCbDet/tests/refs/interaction_region_condition.ref b/Det/LHCbDet/tests/refs/interaction_region_condition.ref
index 56e69b316c3..0df82dcc6cb 100644
--- a/Det/LHCbDet/tests/refs/interaction_region_condition.ref
+++ b/Det/LHCbDet/tests/refs/interaction_region_condition.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                             = []  (default: [])
 |-input_manifest_file                     = ''  (default: '')
diff --git a/Det/LHCbDet/tests/refs/interaction_region_condition.ref.detdesc b/Det/LHCbDet/tests/refs/interaction_region_condition.ref.detdesc
index 378657e320e..c83720efb16 100644
--- a/Det/LHCbDet/tests/refs/interaction_region_condition.ref.detdesc
+++ b/Det/LHCbDet/tests/refs/interaction_region_condition.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                             = []  (default: [])
 |-input_manifest_file                     = ''  (default: '')
diff --git a/Det/LHCbDet/tests/refs/interaction_region_fallback.ref b/Det/LHCbDet/tests/refs/interaction_region_fallback.ref
index 847803abb22..0bf3ae87550 100644
--- a/Det/LHCbDet/tests/refs/interaction_region_fallback.ref
+++ b/Det/LHCbDet/tests/refs/interaction_region_fallback.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                             = []  (default: [])
 |-input_manifest_file                     = ''  (default: '')
diff --git a/Det/LHCbDet/tests/refs/interaction_region_fallback.ref.detdesc b/Det/LHCbDet/tests/refs/interaction_region_fallback.ref.detdesc
index 8ec92813865..5652215981f 100644
--- a/Det/LHCbDet/tests/refs/interaction_region_fallback.ref.detdesc
+++ b/Det/LHCbDet/tests/refs/interaction_region_fallback.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                             = []  (default: [])
 |-input_manifest_file                     = ''  (default: '')
diff --git a/Det/Magnet/tests/refs/test_magfieldsvc.ref b/Det/Magnet/tests/refs/test_magfieldsvc.ref
index 456485f3b81..7466d0c8a19 100644
--- a/Det/Magnet/tests/refs/test_magfieldsvc.ref
+++ b/Det/Magnet/tests/refs/test_magfieldsvc.ref
@@ -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/Det/VPDet/tests/data/velo_motion_from_yaml_pyconf.ref.detdesc b/Det/VPDet/tests/data/velo_motion_from_yaml_pyconf.ref.detdesc
index d0a3c2a4f3a..d2096855e8d 100644
--- a/Det/VPDet/tests/data/velo_motion_from_yaml_pyconf.ref.detdesc
+++ b/Det/VPDet/tests/data/velo_motion_from_yaml_pyconf.ref.detdesc
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DetDesc'  (default: 'DetDesc')
 |-geometry_version                        = ''  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = []  (default: [])
 |-input_manifest_file                     = ''  (default: '')
diff --git a/Ex/IOExample/tests/refs/LargebankReadingExample.ref b/Ex/IOExample/tests/refs/LargebankReadingExample.ref
index 7502b32743f..8d7ebb583f7 100644
--- a/Ex/IOExample/tests/refs/LargebankReadingExample.ref
+++ b/Ex/IOExample/tests/refs/LargebankReadingExample.ref
@@ -2,7 +2,6 @@
 |-append_decoding_keys_to_output_manifest = True  (default: True)
 |-auditors                                = []  (default: [])
 |-conddb_tag                              = 'sim-20210617-vc-mu100'  (default: '')
-|-conditions_version                      = 'AlignmentV14_2024_04_05'  (default: '')
 |-control_flow_file                       = ''  (default: '')
 |-data_flow_file                          = ''  (default: '')
 |-data_type                               = 'Upgrade'  (default: 'Upgrade')
@@ -13,7 +12,7 @@
 |-force_odin                              = False  (default: False)
 |-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                             = ['mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/MDFLargeBank/z0_with_ut.qee.mdf']
 |                                         (default: [])
@@ -64,45 +63,16 @@ HLTControlFlowMgr                      INFO Concurrency level information:
 HLTControlFlowMgr                      INFO  o Number of events slots: 1
 HLTControlFlowMgr                      INFO  o TBB thread pool size:  'ThreadPoolSize':1
 ApplicationMgr                         INFO Application Manager Initialized successfully
-ApplicationMgr                         INFO Application Manager Started successfully
-HLTControlFlowMgr                      INFO Will measure time between events 2 and 18 (stop might be some events later)
-HLTControlFlowMgr                      INFO Starting loop on events
-PrintHeader                            INFO # 1 Run 303682, Event 16370672535
-PrintHeader                            INFO # 2 Run 303682, Event 73647046137
-PrintHeader                            INFO # 3 Run 303682, Event 41481917913
-PrintHeader                            INFO # 4 Run 303682, Event 71402655280
-PrintHeader                            INFO # 5 Run 303682, Event 51194414331
-PrintHeader                            INFO # 6 Run 303682, Event 6751241109
-MDFIOAlg                               INFO Increasing IOHandlerFileRead's buffer's size to 4000000 bytes
-PrintHeader                            INFO # 7 Run 303682, Event 51371356968
-PrintHeader                            INFO # 8 Run 303682, Event 79445470125
-PrintHeader                            INFO # 9 Run 303682, Event 15755822160
-PrintHeader                            INFO # 10 Run 303682, Event 82872822028
-PrintHeader                            INFO # 11 Run 303682, Event 69490791450
-PrintHeader                            INFO # 12 Run 303682, Event 43919997735
-PrintHeader                            INFO # 13 Run 303682, Event 36545757671
-PrintHeader                            INFO # 14 Run 303682, Event 63942829458
-PrintHeader                            INFO # 15 Run 303682, Event 43062498712
-PrintHeader                            INFO # 16 Run 303682, Event 30579318698
-PrintHeader                            INFO # 17 Run 303682, Event 24529217083
-PrintHeader                            INFO # 18 Run 303682, Event 34404731612
-PrintHeader                            INFO # 19 Run 303682, Event 13215944121
-PrintHeader                            INFO # 20 Run 303682, Event 74425499674
-ApplicationMgr                         INFO Application Manager Stopped successfully
-HLTControlFlowMgr                      INFO
-HLTControlFlowMgr                      INFO StateTree: CFNode   #executed  #passed
-LAZY_AND: Top             #=20      Sum=20          Eff=|( 100.0000 +- 0.00000 )%|
- PrintHeader/PrintHeader  #=20      Sum=20          Eff=|( 100.0000 +- 0.00000 )%|
-HLTControlFlowMgr                      INFO Histograms converted successfully according to request.
-ApplicationMgr                         INFO Application Manager Finalized successfully
-ApplicationMgr                         INFO Application Manager Terminated successfully
-HLTControlFlowMgr                      INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "Processed events"                              |        20 |
-MDFIOAlg                               INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "#banks in raw event"                           |        20 |      17057 |     852.85 |     10.011 |      848.00 |      896.00 |
- | "event size statistics (KBytes)"                |        35 |      12468 |     356.23 |     510.53 |      77.000 |      3270.0 |
-PrintHeader                            INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "EventCount"                                    |        20 |
+UpdateManagerSvc::Item                ERROR Cannot retrieve Conditions/Alignment/VP/VPSystem from data provider!
+XmlGenericCnv                         FATAL An exception went out of the conversion process : 	*GeometryInfoException* 	Failed to initialize!	 StatusCode=FAILURE0
+XmlGenericCnv                         FATAL
+XmlGenericCnv                         FATAL address = git:/UVP/structure.xml#/VP
+UpdateManagerSvc::Item                ERROR Cannot retrieve Conditions/Alignment/UT/UTSystem from data provider!
+XmlGenericCnv                         FATAL An exception went out of the conversion process : 	*GeometryInfoException* 	Failed to initialize!	 StatusCode=FAILURE0
+XmlGenericCnv                         FATAL
+XmlGenericCnv                         FATAL address = git:/UUT/structure.xml#/UT
+UpdateManagerSvc::Item                ERROR Cannot retrieve Conditions/Alignment/FT/FTSystem from data provider!
+XmlGenericCnv                         FATAL An exception went out of the conversion process : 	*GeometryInfoException* 	Failed to initialize!	 StatusCode=FAILURE0
+XmlGenericCnv                         FATAL
+XmlGenericCnv                         FATAL address = git:/T/UFT_61/structure.xml#/FT
+TUnixSystem::DispatchSignals          FATAL segmentation violation
diff --git a/Ex/IOExample/tests/refs/MDFReadFailing.ref b/Ex/IOExample/tests/refs/MDFReadFailing.ref
index 702e13f2281..d4b5992ec14 100644
--- a/Ex/IOExample/tests/refs/MDFReadFailing.ref
+++ b/Ex/IOExample/tests/refs/MDFReadFailing.ref
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'run3/2024.Q1.2-v00.00'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/corruptedMDF/289233_00120016_0000.evt-404335.raw']
 |                                         (default: [])
diff --git a/Ex/IOExample/tests/refs/MDFReadFailing2.ref b/Ex/IOExample/tests/refs/MDFReadFailing2.ref
index b4477c11db6..360fb510d2e 100644
--- a/Ex/IOExample/tests/refs/MDFReadFailing2.ref
+++ b/Ex/IOExample/tests/refs/MDFReadFailing2.ref
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'run3/2024.Q1.2-v00.00'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/corruptedMDF2/EmptyMDF.mdf']
 |                                         (default: [])
diff --git a/Ex/IOExample/tests/refs/MDFReadFailing3.ref b/Ex/IOExample/tests/refs/MDFReadFailing3.ref
index 289a1eef21f..803b3bd4e49 100644
--- a/Ex/IOExample/tests/refs/MDFReadFailing3.ref
+++ b/Ex/IOExample/tests/refs/MDFReadFailing3.ref
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'run3/2024.Q1.2-v00.00'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/corruptedMDF3/corruptedMDF.zstd.mdf']
 |                                         (default: [])
diff --git a/Ex/IOExample/tests/refs/readmc.ref b/Ex/IOExample/tests/refs/readmc.ref
index e7900e23f58..541eb115427 100644
--- a/Ex/IOExample/tests/refs/readmc.ref
+++ b/Ex/IOExample/tests/refs/readmc.ref
@@ -2,7 +2,6 @@
 |-append_decoding_keys_to_output_manifest = True  (default: True)
 |-auditors                                = []  (default: [])
 |-conddb_tag                              = 'sim-20220705-vc-md100'  (default: '')
-|-conditions_version                      = 'jonrob/all-pmts-active'  (default: '')
 |-control_flow_file                       = ''  (default: '')
 |-data_flow_file                          = ''  (default: '')
 |-data_type                               = 'Upgrade'  (default: 'Upgrade')
@@ -13,7 +12,7 @@
 |-force_odin                              = False  (default: False)
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
-|-geometry_version                        = 'run3/before-rich1-geom-update-26052022'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb/wg/rta/samples/mc/Jira_LHCBGAUSS-2635/Minbias_MagDown_Boole_lhcbhead3379_dddb-20220705_sim-20220705-vc-md100_lumi0.xdigi']
 |                                         (default: [])
diff --git a/Ex/IOExample/tests/refs/reco14stripping20mdst.ref b/Ex/IOExample/tests/refs/reco14stripping20mdst.ref
index f1bb464c3ec..4571e7aa0f7 100644
--- a/Ex/IOExample/tests/refs/reco14stripping20mdst.ref
+++ b/Ex/IOExample/tests/refs/reco14stripping20mdst.ref
@@ -2,7 +2,6 @@
 |-append_decoding_keys_to_output_manifest = True  (default: True)
 |-auditors                                = []  (default: [])
 |-conddb_tag                              = 'cond-20120831'  (default: '')
-|-conditions_version                      = 'cond-20120831'  (default: '')
 |-control_flow_file                       = ''  (default: '')
 |-data_flow_file                          = ''  (default: '')
 |-data_type                               = '2012'  (default: 'Upgrade')
@@ -13,7 +12,7 @@
 |-force_odin                              = False  (default: False)
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
-|-geometry_version                        = 'dddb-20120831'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_manifest_file                     = ''  (default: '')
 |-input_process                           = ''  (default: '')
diff --git a/Ex/IOExample/tests/refs/reco14stripping20mdsttoroot.ref b/Ex/IOExample/tests/refs/reco14stripping20mdsttoroot.ref
index 5c71884ffde..e06aa627e93 100644
--- a/Ex/IOExample/tests/refs/reco14stripping20mdsttoroot.ref
+++ b/Ex/IOExample/tests/refs/reco14stripping20mdsttoroot.ref
@@ -2,7 +2,6 @@
 |-append_decoding_keys_to_output_manifest = True  (default: True)
 |-auditors                                = []  (default: [])
 |-conddb_tag                              = 'cond-20120831'  (default: '')
-|-conditions_version                      = 'cond-20120831'  (default: '')
 |-control_flow_file                       = ''  (default: '')
 |-data_flow_file                          = ''  (default: '')
 |-data_type                               = '2012'  (default: 'Upgrade')
@@ -13,7 +12,7 @@
 |-force_odin                              = False  (default: False)
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
-|-geometry_version                        = 'dddb-20120831'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb//lhcb/LHCb/Collision12/BHADRON.MDST/00020198/0000/00020198_00000758_1.bhadron.mdst']
 |                                         (default: [])
diff --git a/Ex/IOExample/tests/refs/reco14stripping21mdst.ref b/Ex/IOExample/tests/refs/reco14stripping21mdst.ref
index 92bc4c6a37f..21a09b65938 100644
--- a/Ex/IOExample/tests/refs/reco14stripping21mdst.ref
+++ b/Ex/IOExample/tests/refs/reco14stripping21mdst.ref
@@ -2,7 +2,6 @@
 |-append_decoding_keys_to_output_manifest = True  (default: True)
 |-auditors                                = []  (default: [])
 |-conddb_tag                              = 'cond-20141107'  (default: '')
-|-conditions_version                      = 'cond-20141107'  (default: '')
 |-control_flow_file                       = ''  (default: '')
 |-data_flow_file                          = ''  (default: '')
 |-data_type                               = '2012'  (default: 'Upgrade')
@@ -13,7 +12,7 @@
 |-force_odin                              = False  (default: False)
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
-|-geometry_version                        = 'dddb-20130929-1'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_manifest_file                     = ''  (default: '')
 |-input_process                           = ''  (default: '')
diff --git a/Ex/IOExample/tests/refs/reco14stripping21mdsttoroot.ref b/Ex/IOExample/tests/refs/reco14stripping21mdsttoroot.ref
index 4a53ad54193..80a2d115f69 100644
--- a/Ex/IOExample/tests/refs/reco14stripping21mdsttoroot.ref
+++ b/Ex/IOExample/tests/refs/reco14stripping21mdsttoroot.ref
@@ -2,7 +2,6 @@
 |-append_decoding_keys_to_output_manifest = True  (default: True)
 |-auditors                                = []  (default: [])
 |-conddb_tag                              = 'cond-20141107'  (default: '')
-|-conditions_version                      = 'cond-20141107'  (default: '')
 |-control_flow_file                       = ''  (default: '')
 |-data_flow_file                          = ''  (default: '')
 |-data_type                               = '2012'  (default: 'Upgrade')
@@ -13,7 +12,7 @@
 |-force_odin                              = False  (default: False)
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
-|-geometry_version                        = 'dddb-20130929-1'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb//lhcb/LHCb/Collision12/BHADRON.MDST/00041836/0000/00041836_00000001_1.bhadron.mdst']
 |                                         (default: [])
diff --git a/FT/FTDAQ/tests/refs/error_monitoring.ref b/FT/FTDAQ/tests/refs/error_monitoring.ref
index 5760e0a6c05..dd9df9aeb0c 100644
--- a/FT/FTDAQ/tests/refs/error_monitoring.ref
+++ b/FT/FTDAQ/tests/refs/error_monitoring.ref
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'upgrade/master'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Monitoring/test_files/errordecoding/Run_0000266442_20230610-020315-669_SAEB22_0955.mdf']
 |                                         (default: [])
diff --git a/FT/FTDAQ/tests/refs/error_monitoring.ref.detdesc b/FT/FTDAQ/tests/refs/error_monitoring.ref.detdesc
index 2d9cafbb16c..5a0a0358bc8 100644
--- a/FT/FTDAQ/tests/refs/error_monitoring.ref.detdesc
+++ b/FT/FTDAQ/tests/refs/error_monitoring.ref.detdesc
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DetDesc'  (default: 'DetDesc')
 |-geometry_version                        = 'upgrade/master'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/SciFi/Monitoring/test_files/errordecoding/Run_0000266442_20230610-020315-669_SAEB22_0955.mdf']
 |                                         (default: [])
diff --git a/Kernel/LHCbAlgs/tests/refs/eventcount.ref b/Kernel/LHCbAlgs/tests/refs/eventcount.ref
index 6bc74461c84..476443bc680 100644
--- a/Kernel/LHCbAlgs/tests/refs/eventcount.ref
+++ b/Kernel/LHCbAlgs/tests/refs/eventcount.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/swtest/rootreadingexample/hlt2_example.dst']
 |                                         (default: [])
diff --git a/Kernel/LHCbAlgs/tests/refs/eventnumbercollect.ref b/Kernel/LHCbAlgs/tests/refs/eventnumbercollect.ref
index 433e6dd885a..e7101901344 100644
--- a/Kernel/LHCbAlgs/tests/refs/eventnumbercollect.ref
+++ b/Kernel/LHCbAlgs/tests/refs/eventnumbercollect.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/swtest/rootreadingexample/hlt2_example.dst']
 |                                         (default: [])
diff --git a/Kernel/PartProp/tests/refs/dumpPartProp.ref b/Kernel/PartProp/tests/refs/dumpPartProp.ref
index 81abf8d78b0..3eee94c87dc 100644
--- a/Kernel/PartProp/tests/refs/dumpPartProp.ref
+++ b/Kernel/PartProp/tests/refs/dumpPartProp.ref
@@ -1,3 +1,4 @@
+# setting LC_ALL to "C"
 # WARNING: Required option geometry_version not set, using the value from dddb_tag
 # WARNING: Required option conditions_version not set, using the value from conddb_tag
 /***** User ApplicationOptions/ApplicationOptions **************************************************
@@ -16,6 +17,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'master'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = []  (default: [])
 |-input_manifest_file                     = ''  (default: '')
@@ -56,8 +58,8 @@
 \----- (End of User ApplicationOptions/ApplicationOptions) -----------------------------------------
 ApplicationMgr    SUCCESS
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v38r3)
-                                          running on lbbuild202.cern.ch on Tue Oct 22 18:08:00 2024
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v39r1)
+                                          running on lbbuild70.cern.ch on Tue Jan  7 12:32:14 2025
 ====================================================================================================================================
  ----------------------------------------------------------------------------------------------------------------------------------------------------------
 |        Name       |     PdgID    |   Q  |        Mass       |    (c*)Tau/Gamma  |  MaxWidth  |        EvtGen        |  PythiaID  |     Antiparticle     |
diff --git a/Kernel/PartProp/tests/refs/dumpPartProp.ref.detdesc b/Kernel/PartProp/tests/refs/dumpPartProp.ref.detdesc
index 6195d4f5977..228feefabde 100644
--- a/Kernel/PartProp/tests/refs/dumpPartProp.ref.detdesc
+++ b/Kernel/PartProp/tests/refs/dumpPartProp.ref.detdesc
@@ -15,6 +15,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DetDesc'  (default: 'DetDesc')
 |-geometry_version                        = ''  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = []  (default: [])
 |-input_manifest_file                     = ''  (default: '')
@@ -57,7 +58,7 @@
 ApplicationMgr    SUCCESS
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v39r1)
-                                          running on lbbuild306.cern.ch on Thu Dec 19 05:58:00 2024
+                                          running on lbbuildinter01.cern.ch on Tue Jan  7 12:42:18 2025
 ====================================================================================================================================
 ToolSvc.GitDDDB      INFO opening Git repository '/cvmfs/lhcb.cern.ch/lib/lhcb/git-conddb/DDDB.git'
 ToolSvc.GitDDDB      INFO using commit 'upgrade/master' corresponding to a504a877331089a276a31c6c75a9d9a7f212328d
diff --git a/Kernel/PartProp/tests/refs/partprop_pids.ref b/Kernel/PartProp/tests/refs/partprop_pids.ref
index eda17844f58..cfc2c691473 100644
--- a/Kernel/PartProp/tests/refs/partprop_pids.ref
+++ b/Kernel/PartProp/tests/refs/partprop_pids.ref
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'master'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = []  (default: [])
 |-input_manifest_file                     = ''  (default: '')
diff --git a/Kernel/PartProp/tests/refs/partprop_pids.ref.detdesc b/Kernel/PartProp/tests/refs/partprop_pids.ref.detdesc
index 7f7051b760d..36e651a5ad7 100644
--- a/Kernel/PartProp/tests/refs/partprop_pids.ref.detdesc
+++ b/Kernel/PartProp/tests/refs/partprop_pids.ref.detdesc
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DetDesc'  (default: 'DetDesc')
 |-geometry_version                        = ''  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = []  (default: [])
 |-input_manifest_file                     = ''  (default: '')
diff --git a/Rich/RichDetectors/tests/refs/decode-and-spacepoints-2022-data.ref b/Rich/RichDetectors/tests/refs/decode-and-spacepoints-2022-data.ref
index 02083365961..c179a58f702 100644
--- a/Rich/RichDetectors/tests/refs/decode-and-spacepoints-2022-data.ref
+++ b/Rich/RichDetectors/tests/refs/decode-and-spacepoints-2022-data.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                             = ['mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-2022/data-0015.mdf']
 |                                         (default: [])
diff --git a/Rich/RichDetectors/tests/refs/decode-and-spacepoints-2023-data.ref b/Rich/RichDetectors/tests/refs/decode-and-spacepoints-2023-data.ref
index 8d93db8382b..d115d065543 100644
--- a/Rich/RichDetectors/tests/refs/decode-and-spacepoints-2023-data.ref
+++ b/Rich/RichDetectors/tests/refs/decode-and-spacepoints-2023-data.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                             = ['mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-2023/data-0010.mdf']
 |                                         (default: [])
diff --git a/Rich/RichDetectors/tests/refs/decode-and-spacepoints-2024-data.ref b/Rich/RichDetectors/tests/refs/decode-and-spacepoints-2024-data.ref
index 1a84bc9d577..e6d8571f7a7 100644
--- a/Rich/RichDetectors/tests/refs/decode-and-spacepoints-2024-data.ref
+++ b/Rich/RichDetectors/tests/refs/decode-and-spacepoints-2024-data.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                             = ['mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-2024/data-0002.mdf']
 |                                         (default: [])
diff --git a/Rich/RichDetectors/tests/refs/decode-and-spacepoints-detdesc-mc.ref b/Rich/RichDetectors/tests/refs/decode-and-spacepoints-detdesc-mc.ref
index 68062d5c2e2..136ab740bb3 100644
--- a/Rich/RichDetectors/tests/refs/decode-and-spacepoints-detdesc-mc.ref
+++ b/Rich/RichDetectors/tests/refs/decode-and-spacepoints-detdesc-mc.ref
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'run3/before-rich1-geom-update-26052022'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_100.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_101.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_102.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_103.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_104.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_105.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_106.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_107.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_108.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_109.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_110.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_111.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_112.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_113.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_114.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_115.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_116.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_117.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_118.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_119.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_120.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_121.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_122.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_123.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_124.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_125.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_126.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_127.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_128.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_129.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_130.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_131.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_132.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_133.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_134.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_135.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_136.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_137.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_138.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_139.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_140.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_141.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_142.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_143.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_144.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_145.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_146.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_147.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_148.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_149.xdst']
 |                                         (default: [])
diff --git a/Rich/RichDetectors/tests/refs/decode-and-spacepoints-detdesc-mc.ref.detdesc b/Rich/RichDetectors/tests/refs/decode-and-spacepoints-detdesc-mc.ref.detdesc
index 45a8c9fc4b8..4d957931ec9 100644
--- a/Rich/RichDetectors/tests/refs/decode-and-spacepoints-detdesc-mc.ref.detdesc
+++ b/Rich/RichDetectors/tests/refs/decode-and-spacepoints-detdesc-mc.ref.detdesc
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DetDesc'  (default: 'DetDesc')
 |-geometry_version                        = 'run3/before-rich1-geom-update-26052022'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_100.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_101.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_102.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_103.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_104.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_105.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_106.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_107.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_108.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_109.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_110.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_111.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_112.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_113.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_114.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_115.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_116.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_117.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_118.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_119.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_120.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_121.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_122.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_123.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_124.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_125.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_126.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_127.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_128.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_129.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_130.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_131.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_132.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_133.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_134.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_135.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_136.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_137.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_138.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_139.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_140.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_141.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_142.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_143.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_144.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_145.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_146.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_147.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_148.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_149.xdst']
 |                                         (default: [])
diff --git a/Rich/RichDetectors/tests/refs/instanciate-compat-old-rich1.ref b/Rich/RichDetectors/tests/refs/instanciate-compat-old-rich1.ref
index 352641a9f95..2982b05d6c5 100644
--- a/Rich/RichDetectors/tests/refs/instanciate-compat-old-rich1.ref
+++ b/Rich/RichDetectors/tests/refs/instanciate-compat-old-rich1.ref
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'run3/before-rich1-geom-update-26052022'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_100.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_101.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_102.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_103.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_104.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_105.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_106.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_107.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_108.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_109.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_110.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_111.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_112.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_113.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_114.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_115.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_116.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_117.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_118.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_119.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_120.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_121.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_122.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_123.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_124.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_125.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_126.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_127.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_128.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_129.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_130.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_131.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_132.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_133.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_134.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_135.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_136.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_137.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_138.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_139.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_140.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_141.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_142.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_143.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_144.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_145.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_146.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_147.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_148.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_149.xdst']
 |                                         (default: [])
diff --git a/Rich/RichDetectors/tests/refs/instanciate-compat-old-rich1.ref.detdesc b/Rich/RichDetectors/tests/refs/instanciate-compat-old-rich1.ref.detdesc
index 56b01b1944e..9877fba9b15 100644
--- a/Rich/RichDetectors/tests/refs/instanciate-compat-old-rich1.ref.detdesc
+++ b/Rich/RichDetectors/tests/refs/instanciate-compat-old-rich1.ref.detdesc
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DetDesc'  (default: 'DetDesc')
 |-geometry_version                        = 'run3/before-rich1-geom-update-26052022'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_100.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_101.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_102.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_103.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_104.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_105.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_106.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_107.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_108.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_109.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_110.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_111.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_112.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_113.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_114.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_115.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_116.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_117.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_118.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_119.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_120.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_121.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_122.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_123.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_124.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_125.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_126.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_127.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_128.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_129.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_130.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_131.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_132.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_133.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_134.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_135.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_136.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_137.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_138.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_139.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_140.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_141.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_142.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_143.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_144.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_145.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_146.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_147.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_148.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_149.xdst']
 |                                         (default: [])
diff --git a/Rich/RichDetectors/tests/refs/instanciate-compat-trunk.ref b/Rich/RichDetectors/tests/refs/instanciate-compat-trunk.ref
index 1867697ae74..514cfbe8498 100644
--- a/Rich/RichDetectors/tests/refs/instanciate-compat-trunk.ref
+++ b/Rich/RichDetectors/tests/refs/instanciate-compat-trunk.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/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_100.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_101.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_102.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_103.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_104.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_105.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_106.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_107.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_108.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_109.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_110.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_111.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_112.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_113.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_114.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_115.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_116.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_117.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_118.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_119.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_120.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_121.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_122.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_123.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_124.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_125.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_126.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_127.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_128.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_129.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_130.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_131.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_132.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_133.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_134.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_135.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_136.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_137.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_138.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_139.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_140.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_141.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_142.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_143.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_144.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_145.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_146.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_147.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_148.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_149.xdst']
 |                                         (default: [])
diff --git a/Rich/RichDetectors/tests/refs/instanciate-compat-trunk.ref.detdesc b/Rich/RichDetectors/tests/refs/instanciate-compat-trunk.ref.detdesc
index dd15bc33b89..996894da1ac 100644
--- a/Rich/RichDetectors/tests/refs/instanciate-compat-trunk.ref.detdesc
+++ b/Rich/RichDetectors/tests/refs/instanciate-compat-trunk.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/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_100.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_101.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_102.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_103.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_104.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_105.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_106.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_107.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_108.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_109.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_110.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_111.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_112.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_113.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_114.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_115.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_116.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_117.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_118.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_119.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_120.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_121.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_122.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_123.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_124.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_125.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_126.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_127.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_128.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_129.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_130.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_131.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_132.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_133.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_134.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_135.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_136.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_137.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_138.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_139.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_140.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_141.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_142.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_143.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_144.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_145.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_146.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_147.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_148.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_149.xdst']
 |                                         (default: [])
diff --git a/Rich/RichDetectors/tests/refs/radiator-volume-intersections.ref b/Rich/RichDetectors/tests/refs/radiator-volume-intersections.ref
index e6a00602dce..84b6ad101f7 100644
--- a/Rich/RichDetectors/tests/refs/radiator-volume-intersections.ref
+++ b/Rich/RichDetectors/tests/refs/radiator-volume-intersections.ref
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DD4Hep'  (default: 'DD4Hep')
 |-geometry_version                        = 'run3/before-rich1-geom-update-26052022'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_100.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_101.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_102.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_103.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_104.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_105.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_106.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_107.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_108.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_109.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_110.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_111.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_112.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_113.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_114.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_115.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_116.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_117.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_118.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_119.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_120.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_121.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_122.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_123.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_124.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_125.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_126.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_127.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_128.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_129.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_130.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_131.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_132.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_133.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_134.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_135.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_136.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_137.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_138.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_139.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_140.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_141.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_142.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_143.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_144.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_145.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_146.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_147.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_148.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_149.xdst']
 |                                         (default: [])
diff --git a/Rich/RichDetectors/tests/refs/radiator-volume-intersections.ref.detdesc b/Rich/RichDetectors/tests/refs/radiator-volume-intersections.ref.detdesc
index c658daf051c..6fe752535a4 100644
--- a/Rich/RichDetectors/tests/refs/radiator-volume-intersections.ref.detdesc
+++ b/Rich/RichDetectors/tests/refs/radiator-volume-intersections.ref.detdesc
@@ -14,6 +14,7 @@
 |-gaudipython_mode                        = False  (default: False)
 |-geometry_backend                        = 'DetDesc'  (default: 'DetDesc')
 |-geometry_version                        = 'run3/before-rich1-geom-update-26052022'  (default: '')
+|-histo_calo                              = False  (default: False)
 |-histo_file                              = ''  (default: '')
 |-input_files                             = ['root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_100.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_101.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_102.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_103.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_104.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_105.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_106.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_107.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_108.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_109.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_110.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_111.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_112.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_113.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_114.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_115.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_116.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_117.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_118.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_119.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_120.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_121.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_122.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_123.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_124.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_125.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_126.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_127.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_128.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_129.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_130.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_131.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_132.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_133.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_134.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_135.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_136.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_137.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_138.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_139.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_140.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_141.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_142.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_143.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_144.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_145.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_146.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_147.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_148.xdst', 'root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-decode-detdesc-compat-old-rich1/Brunel_149.xdst']
 |                                         (default: [])
diff --git a/Rich/RichDetectors/tests/refs/test-run-change-2022-data.ref b/Rich/RichDetectors/tests/refs/test-run-change-2022-data.ref
index 8bc47475523..02df7fe9587 100644
--- a/Rich/RichDetectors/tests/refs/test-run-change-2022-data.ref
+++ b/Rich/RichDetectors/tests/refs/test-run-change-2022-data.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                             = ['mdf:root://eoslhcb.cern.ch//eos/lhcb//lhcb/swtest/rich-multiple-runs/2022-data.mdf']
 |                                         (default: [])
diff --git a/Rich/RichFutureKernel/tests/refs/histograms.ref b/Rich/RichFutureKernel/tests/refs/histograms.ref
index 35d1da81f63..7c9bbf88315 100644
--- a/Rich/RichFutureKernel/tests/refs/histograms.ref
+++ b/Rich/RichFutureKernel/tests/refs/histograms.ref
@@ -236,8 +236,8 @@ Exponential_P1DD     INFO 1D profile histograms in directory "Exponential_P1DD"
  | /RICH/Exponential_P1DD/testH1D1               | "Exponential;X;Entries"                       |    1000000 |     9.8089 | 5.7737     | -0.0023699 |     -1.201 |
 Exponential_P1DF     INFO 1D profile histograms in directory "Exponential_P1DF" : 2
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | /RICH/Exponential_P1DF/testH1D0               | "Exponential;X;Entries"                       |    1000000 |     9.8013 | 5.7755     |-0.00046066 |    -1.2014 |
- | /RICH/Exponential_P1DF/testH1D1               | "Exponential;X;Entries"                       |    1000000 |     9.8013 | 5.7755     |-0.00046066 |    -1.2014 |
+ | /RICH/Exponential_P1DF/testH1D0               | "Exponential;X;Entries"                       |    1000000 |     9.8013 | 5.7755     | -0.0004606 |    -1.2014 |
+ | /RICH/Exponential_P1DF/testH1D1               | "Exponential;X;Entries"                       |    1000000 |     9.8013 | 5.7755     | -0.0004606 |    -1.2014 |
 Exponential_WP1DD    INFO 1D profile histograms in directory "Exponential_WP1DD" : 2
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
  | /RICH/Exponential_WP1DD/testH1D0              | "Exponential;X;Entries"                       |    1000000 |     9.9978 | 5.7731     |-0.00058546 |    -1.2003 |
@@ -252,8 +252,8 @@ FlatTop_P1DD         INFO 1D profile histograms in directory "FlatTop_P1DD" : 2
  | /RICH/FlatTop_P1DD/testH1D1                   | "FlatTop;X;Entries"                           |    1000000 |      4.899 | 2.8876     | 0.00015722 |    -1.2014 |
 FlatTop_P1DF         INFO 1D profile histograms in directory "FlatTop_P1DF" : 2
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | /RICH/FlatTop_P1DF/testH1D0                   | "FlatTop;X;Entries"                           |    1000000 |     4.8929 | 2.8878     |  0.0021778 |    -1.2021 |
- | /RICH/FlatTop_P1DF/testH1D1                   | "FlatTop;X;Entries"                           |    1000000 |     4.8929 | 2.8878     |  0.0021778 |    -1.2021 |
+ | /RICH/FlatTop_P1DF/testH1D0                   | "FlatTop;X;Entries"                           |    1000000 |     4.8929 | 2.8878     |  0.0021777 |    -1.2021 |
+ | /RICH/FlatTop_P1DF/testH1D1                   | "FlatTop;X;Entries"                           |    1000000 |     4.8929 | 2.8878     |  0.0021777 |    -1.2021 |
 FlatTop_WP1DD        INFO 1D profile histograms in directory "FlatTop_WP1DD" : 2
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
  | /RICH/FlatTop_WP1DD/testH1D0                  | "FlatTop;X;Entries"                           |    1000000 |     4.9971 | 2.8875     |  0.0015052 |     -1.202 |
@@ -268,8 +268,8 @@ Normal_P1DD          INFO 1D profile histograms in directory "Normal_P1DD" : 2
  | /RICH/Normal_P1DD/testH1D1                    | "Normal;X;Entries"                            |    1000000 |     2.3533 | 4.3296     | -0.0010429 |    -1.1993 |
 Normal_P1DF          INFO 1D profile histograms in directory "Normal_P1DF" : 2
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
- | /RICH/Normal_P1DF/testH1D0                    | "Normal;X;Entries"                            |    1000000 |     2.3508 | 4.3284     |-0.00020209 |    -1.1997 |
- | /RICH/Normal_P1DF/testH1D1                    | "Normal;X;Entries"                            |    1000000 |     2.3508 | 4.3284     |-0.00020209 |    -1.1997 |
+ | /RICH/Normal_P1DF/testH1D0                    | "Normal;X;Entries"                            |    1000000 |     2.3508 | 4.3284     |-0.00020215 |    -1.1997 |
+ | /RICH/Normal_P1DF/testH1D1                    | "Normal;X;Entries"                            |    1000000 |     2.3508 | 4.3284     |-0.00020215 |    -1.1997 |
 Normal_WP1DD         INFO 1D profile histograms in directory "Normal_WP1DD" : 2
  | ID                                            | Title                                         |      #     |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
  | /RICH/Normal_WP1DD/testH1D0                   | "Normal;X;Entries"                            |    1000000 |     2.4978 | 4.3308     |  0.0010538 |    -1.2007 |
-- 
GitLab