Merge branch 'dd4hep_future_upgrades_refactor' into 'master'

Fix errors caused by DD4Hep future upgrades refactor

See merge request !3574

Rich/RichFutureRecSys/examples/data/PMTs/MCFormat/MCXDstFiles.py

@@ -43,6 +43,6 @@ if UseDD4Hep:
     LHCbApp().CondDBtag = "jonrob/all-pmts-active"
     # Use a geometry from before changes to RICH1
     # https://gitlab.cern.ch/lhcb/Detector/-/merge_requests/205
-    DDDBConf().GeometryVersion = 'before-rich1-geom-update-26052022'
+    DDDBConf().GeometryVersion = 'run3/before-rich1-geom-update-26052022'
 else:
     LHCbApp().CondDBtag = "upgrade/sim-20210630-vc-md100"

Rich/RichFutureRecSys/examples/data/PMTs/MCFormat/MCXSimFiles.py

@@ -64,7 +64,7 @@ else:
         # To be seen if these are correct for data above...
         #LHCbApp().CondDBtag = "sim10/2023" # Seems different to master for RICH1 ??
         LHCbApp().CondDBtag = "master"
-        DDDBConf().GeometryVersion = 'trunk'
+        DDDBConf().GeometryVersion = 'run3/trunk'
     else:
         LHCbApp().CondDBtag = "upgrade/sim-20230310-vc-md100"
         LHCbApp().DDDBtag = "upgrade/dddb-20230310"

Rich/RichFutureRecSys/tests/options/pmt-v3-data.py

@@ -31,7 +31,7 @@ if UseDD4Hep:
     LHCbApp().CondDBtag = "jonrob/all-pmts-active"
     # Use a geometry from before changes to RICH1
     # https://gitlab.cern.ch/lhcb/Detector/-/merge_requests/205
-    DDDBConf().GeometryVersion = 'before-rich1-geom-update-26052022'
+    DDDBConf().GeometryVersion = 'run3/before-rich1-geom-update-26052022'
 else:
     LHCbApp().CondDBtag = "upgrade/sim-20210630-vc-md100"