Add workaround to correctly set dd4hep GeometryVersion for upgrade_Sept2022 samples

Cherry picked one commit from !2531 (merged)

Hlt/Moore/tests/options/default_input_and_conds_hlt2.py

@@ -18,14 +18,16 @@ make_VeloClusterTrackingSIMD.global_bind(
 make_velo_full_clusters.global_bind(
     make_full_cluster=VPRetinaFullClusterDecoder)
 
-# To be removed once data is updated to use a tag including
-# https://gitlab.cern.ch/lhcb-conddb/DDDB/-/merge_requests/107
+options.set_input_and_conds_from_testfiledb(
+    'upgrade_Sept2022_minbias_0fb_md_xdigi')
+
+# Override settings used by TestFileDB to set geometry version correctly
+# To be removed once
+#    https://gitlab.cern.ch/lhcb-datapkg/PRConfig/-/merge_requests/334
+# is merged and in a released tag.
 from DDDB.CheckDD4Hep import UseDD4Hep
 if UseDD4Hep:
     from Configurables import DDDBConf
     DDDBConf().GeometryVersion = 'before-rich1-geom-update-26052022'
 
-options.set_input_and_conds_from_testfiledb(
-    'upgrade_Sept2022_minbias_0fb_md_xdigi')
-
 options.evt_max = 100