Merge branch 'fix-dd4hep-geom-cond-versions' into 'master'

Set correctly geometry and conditions versions in tests

See merge request !829

DaVinciExamples/CMakeLists.txt

@@ -16,3 +16,13 @@ DaVinciExamples
 gaudi_install(PYTHON)
 
 gaudi_add_tests(QMTest)
+
+if(BUILD_TESTING AND NOT USE_DD4HEP)
+    # Disable some tests that are dd4hep only
+    set_property(
+        TEST
+            DaVinciExamples.tupling.test_davinci_tupling_from_raw_data
+        PROPERTY
+            DISABLED TRUE
+    )
+endif()

DaVinciExamples/example_data/FEST_November_2021_dst_newPacking.yaml

@@ -6,6 +6,8 @@ input_type: ROOT
 simulation: true
 conddb_tag: sim-20201218-vc-md100
 dddb_tag: dddb-20201211
+conditions_version: master
+geometry_version: trunk
 histo_file: v2_example_histos.root
 ntuple_file: v2_example_ntuples.root
 input_process: Hlt2

DaVinciExamples/example_data/Gauss_12143001_xgen.yaml

@@ -5,6 +5,8 @@ input_type: ROOT
 simulation: true
 conddb_tag: sim-20171127-vc-md100
 dddb_tag: dddb-20171126
+conditions_version: master
+geometry_version: trunk
 histo_file: DV_histo_xgen.root
 ntuple_file: DV_tuple_xgen.root
 input_raw_format: 0.5

DaVinciExamples/example_data/Run255620.yaml

@@ -13,8 +13,8 @@ ntuple_file: "Raw_DV_Ks_example.root"
 
 input_raw_format: 0.5
 input_process: 'Hlt2'
-dddb_tag : 'master'
-conddb_tag : '2022_12_HLT2Processing'
+conditions_version: 2022_12_HLT2Processing
+geometry_version: trunk
 python_logging_level: 3
 output_level: 3
 print_freq: 1000

DaVinciExamples/example_data/Spruce_Run251342.yaml

@@ -11,6 +11,8 @@ input_raw_format: 0.5
 input_process: Spruce
 dddb_tag : 'upgrade/master'
 conddb_tag : 'md_VP_SciFi_macromicrosurvey_from20220923'
+conditions_version: master
+geometry_version: trunk
 python_logging_level: 3
 output_level: 3
 print_freq: 100

DaVinciExamples/example_data/Spruce_all_lines_dst.yaml

@@ -6,6 +6,8 @@ input_type: ROOT
 simulation: true
 conddb_tag: sim-20171127-vc-md100
 dddb_tag: dddb-20171126
+conditions_version: master
+geometry_version: trunk
 histo_file: sprucing_histos.root
 ntuple_file: sprucing_tuple.root
 input_raw_format: 0.5

DaVinciExamples/example_data/Upgrade_Bd2KstarMuMu_ldst.yaml

@@ -5,4 +5,6 @@ input_type: ROOT
 simulation: true
 conddb_tag: sim-20171127-vc-md100
 dddb_tag: dddb-20171126
+conditions_version: master
+geometry_version: trunk
 input_process: Hlt2

DaVinciExamples/example_data/Upgrade_LbToLcmunu.yaml

@@ -6,10 +6,12 @@ input_type: ROOT
 simulation: True
 conddb_tag: sim-20210617-vc-mu100
 dddb_tag: dddb-20210617
+conditions_version: master
+geometry_version: trunk
 input_raw_format: 0.5
 lumi: false
 ntuple_file: 'mytuple.root'
 print_freq: 1
 input_process: 'Hlt2'
 stream: 'default'
-evt_max: -1
\ No newline at end of file
+evt_max: -1

DaVinciExamples/example_data/spruce_b2jpsik_opt.yaml

@@ -20,5 +20,7 @@ data_type: Upgrade
 simulation: true
 conddb_tag: sim-20201218-vc-md100
 dddb_tag: dddb-20201211
+conditions_version: master
+geometry_version: trunk
 input_process: Turbo
 

DaVinciExamples/example_data/test_hlt1_trigger_decisions.yaml

@@ -5,6 +5,8 @@ input_type: ROOT
 simulation: true
 conddb_tag: sim-20201218-vc-md100
 dddb_tag: dddb-20201211
+conditions_version: master
+geometry_version: trunk
 annsvc_config: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/hlt2_integration_B0_100.tck.json
 evt_max: -1
 histo_file: hlt2_B0_test_histo.root

DaVinciExamples/example_data/test_passthrough_thor_lines.yaml

@@ -6,6 +6,8 @@ input_type: ROOT
 simulation: true
 conddb_tag: sim-20180530-vc-md100
 dddb_tag: dddb-20180815
+conditions_version: master
+geometry_version: trunk
 histo_file: passthrough_histos.root
 ntuple_file: passthrough_tuple.root
 input_process: Turbo

DaVinciExamples/example_data/test_spruce_MCtools.yaml

@@ -6,6 +6,8 @@ input_type: ROOT
 simulation: true
 conddb_tag: sim-20171127-vc-md100
 dddb_tag: dddb-20171126
+conditions_version: master
+geometry_version: trunk
 histo_file: sprucing_mc_histos.root
 ntuple_file: sprucing_mc_tuple.root
 input_raw_format: 0.5

DaVinciExamples/example_data/test_tistos.yaml

@@ -5,6 +5,8 @@ simulation: True
 input_type: ROOT
 dddb_tag: 'dddb-20210617'
 conddb_tag: 'sim-20210617-vc-mu100'
+conditions_version: jonrob/all-pmts-active
+geometry_version: trunk
 input_manifest_file: 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/hlt2overhlt1_tck-phiphi.json'
 ntuple_file: tuple_tistos.root
 evt_max: -1

DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All.qmt

@@ -33,6 +33,8 @@
     simulation: true
     conddb_tag: sim-20171127-vc-md100
     dddb_tag: dddb-20171126
+    conditions_version: master
+    geometry_version: trunk
     input_raw_format: 0.3
     lumi: false
     ntuple_file: 'DV_example_allFunctors_ntp.root'

DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All_olddst.qmt

@@ -33,6 +33,8 @@
     simulation: true
     conddb_tag: sim-20171127-vc-md100
     dddb_tag: dddb-20171126
+    conditions_version: master
+    geometry_version: trunk
     input_raw_format: 0.3
     lumi: false
     ntuple_file: 'DV_example_allFunctors_ntp_old.root'

DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_raw_data.qmt

@@ -45,5 +45,4 @@ print('Test successfully completed!')
 os.system(f"rm {ntuple}")
 countErrorLines({"FATAL":0, "ERROR":0})
   </text></argument>
-  <argument name="unsupported_platforms"><set><text>^((?!dd4hep).)*$</text></set></argument>
 </extension>

DaVinciTutorials/options.yaml

@@ -10,3 +10,5 @@ data_type: Upgrade
 simulation: true
 conddb_tag: sim-20180530-vc-md100
 dddb_tag: dddb-20180815
+conditions_version: master
+geometry_version: trunk