From 50e9574635e63019edd66f42bddd32525aa8bdf5 Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Fri, 3 Feb 2023 15:31:32 +0100
Subject: [PATCH] Set correctly geometry and conditions versions in tests
---
.../example_data/FEST_November_2021_dst_newPacking.yaml | 2 ++
DaVinciExamples/example_data/Gauss_12143001_xgen.yaml | 2 ++
DaVinciExamples/example_data/Run255620.yaml | 4 ++--
DaVinciExamples/example_data/Spruce_Run251342.yaml | 2 ++
DaVinciExamples/example_data/Spruce_all_lines_dst.yaml | 2 ++
DaVinciExamples/example_data/Upgrade_Bd2KstarMuMu_ldst.yaml | 2 ++
DaVinciExamples/example_data/Upgrade_LbToLcmunu.yaml | 4 +++-
DaVinciExamples/example_data/spruce_b2jpsik_opt.yaml | 2 ++
DaVinciExamples/example_data/test_hlt1_trigger_decisions.yaml | 2 ++
DaVinciExamples/example_data/test_passthrough_thor_lines.yaml | 2 ++
DaVinciExamples/example_data/test_spruce_MCtools.yaml | 2 ++
DaVinciExamples/example_data/test_tistos.yaml | 2 ++
.../tests/qmtest/tupling.qms/test_davinci_tupling_All.qmt | 2 ++
.../qmtest/tupling.qms/test_davinci_tupling_All_olddst.qmt | 2 ++
DaVinciTutorials/options.yaml | 2 ++
15 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/DaVinciExamples/example_data/FEST_November_2021_dst_newPacking.yaml b/DaVinciExamples/example_data/FEST_November_2021_dst_newPacking.yaml
index 05cb9188c..9ea172486 100644
--- a/DaVinciExamples/example_data/FEST_November_2021_dst_newPacking.yaml
+++ b/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
diff --git a/DaVinciExamples/example_data/Gauss_12143001_xgen.yaml b/DaVinciExamples/example_data/Gauss_12143001_xgen.yaml
index 79cb79183..629b52d68 100644
--- a/DaVinciExamples/example_data/Gauss_12143001_xgen.yaml
+++ b/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
diff --git a/DaVinciExamples/example_data/Run255620.yaml b/DaVinciExamples/example_data/Run255620.yaml
index f59548a9a..f49c50d90 100644
--- a/DaVinciExamples/example_data/Run255620.yaml
+++ b/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
diff --git a/DaVinciExamples/example_data/Spruce_Run251342.yaml b/DaVinciExamples/example_data/Spruce_Run251342.yaml
index e8efefcd4..48071f435 100644
--- a/DaVinciExamples/example_data/Spruce_Run251342.yaml
+++ b/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
diff --git a/DaVinciExamples/example_data/Spruce_all_lines_dst.yaml b/DaVinciExamples/example_data/Spruce_all_lines_dst.yaml
index 6ed72c72f..62c714144 100644
--- a/DaVinciExamples/example_data/Spruce_all_lines_dst.yaml
+++ b/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
diff --git a/DaVinciExamples/example_data/Upgrade_Bd2KstarMuMu_ldst.yaml b/DaVinciExamples/example_data/Upgrade_Bd2KstarMuMu_ldst.yaml
index 8cdbbeb44..bea19fa54 100644
--- a/DaVinciExamples/example_data/Upgrade_Bd2KstarMuMu_ldst.yaml
+++ b/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
diff --git a/DaVinciExamples/example_data/Upgrade_LbToLcmunu.yaml b/DaVinciExamples/example_data/Upgrade_LbToLcmunu.yaml
index 788469c43..47c49be94 100644
--- a/DaVinciExamples/example_data/Upgrade_LbToLcmunu.yaml
+++ b/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
diff --git a/DaVinciExamples/example_data/spruce_b2jpsik_opt.yaml b/DaVinciExamples/example_data/spruce_b2jpsik_opt.yaml
index 44cf565ab..a7ea4d8f4 100644
--- a/DaVinciExamples/example_data/spruce_b2jpsik_opt.yaml
+++ b/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
diff --git a/DaVinciExamples/example_data/test_hlt1_trigger_decisions.yaml b/DaVinciExamples/example_data/test_hlt1_trigger_decisions.yaml
index 22ce5f4ae..f0e73da42 100644
--- a/DaVinciExamples/example_data/test_hlt1_trigger_decisions.yaml
+++ b/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
diff --git a/DaVinciExamples/example_data/test_passthrough_thor_lines.yaml b/DaVinciExamples/example_data/test_passthrough_thor_lines.yaml
index c5775acbf..c1a4a5a75 100644
--- a/DaVinciExamples/example_data/test_passthrough_thor_lines.yaml
+++ b/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
diff --git a/DaVinciExamples/example_data/test_spruce_MCtools.yaml b/DaVinciExamples/example_data/test_spruce_MCtools.yaml
index 1b7b64476..fdaac9c8d 100644
--- a/DaVinciExamples/example_data/test_spruce_MCtools.yaml
+++ b/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
diff --git a/DaVinciExamples/example_data/test_tistos.yaml b/DaVinciExamples/example_data/test_tistos.yaml
index c81b54db7..23fcd9381 100644
--- a/DaVinciExamples/example_data/test_tistos.yaml
+++ b/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
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All.qmt
index 857403d5e..a86bcabdc 100755
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All.qmt
+++ b/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'
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All_olddst.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All_olddst.qmt
index 2bb6f8f9d..9f6fabc0f 100755
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All_olddst.qmt
+++ b/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'
diff --git a/DaVinciTutorials/options.yaml b/DaVinciTutorials/options.yaml
index c3ae827ce..c7aea6413 100644
--- a/DaVinciTutorials/options.yaml
+++ b/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
--
GitLab