diff --git a/DaVinciExamples/example_data/Run255620-Hlt2.yaml b/DaVinciExamples/example_data/Run255620-Hlt2.yaml deleted file mode 100644 index d2fd2235f4b667a6abfeaece6b6291e2234bc63c..0000000000000000000000000000000000000000 --- a/DaVinciExamples/example_data/Run255620-Hlt2.yaml +++ /dev/null @@ -1,19 +0,0 @@ -input_files: - - mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/Commissioning2022/Run255620/255620_00150000_0000.raw - - mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/Commissioning2022/Run255620/255620_00150000_0001.raw - - mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/Commissioning2022/Run255620/255620_00150000_0002.raw - - mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/Commissioning2022/Run255620/255620_00150000_0003.raw - - mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/Commissioning2022/Run255620/255620_00150011_0001.raw -data_type: 'Upgrade' -input_type: 'RAW' -simulation: False -evt_max : 10000 -ntuple_file: "Raw_DV_Ks_example-Hlt2.root" - -input_raw_format: 0.5 -input_process: Hlt2 -conditions_version: AlignmentV12_2023_06_22 -geometry_version: trunk -python_logging_level: 3 -output_level: 3 -print_freq: 1000 diff --git a/DaVinciExamples/example_data/Run255620.yaml b/DaVinciExamples/example_data/Run255620.yaml index be325b600411e9866f2b0276edd2b6de02bb9d38..9d6971902e37c7970e31d68299f5ffcba6e65c6c 100644 --- a/DaVinciExamples/example_data/Run255620.yaml +++ b/DaVinciExamples/example_data/Run255620.yaml @@ -7,13 +7,8 @@ input_files: data_type: 'Upgrade' input_type: 'RAW' simulation: False -evt_max : 10000 -ntuple_file: "Raw_DV_Ks_example.root" - input_raw_format: 0.5 input_process: Hlt2 conditions_version: AlignmentV12_2023_06_22 geometry_version: trunk python_logging_level: 3 -output_level: 3 -print_freq: 1000 diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_hlt2_with_matching.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_hlt2_with_matching.qmt index 42fa25e21f78038554393c06c81b2a6b55b0a5b9..8310eebd855f160986f7feb398742aae563dd753 100644 --- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_hlt2_with_matching.qmt +++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_hlt2_with_matching.qmt @@ -18,7 +18,13 @@ <text>DaVinciExamples.tupling.option_davinci_tupling_from_hlt2_with_matching:main</text> </set> </argument> - <argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/Run255620-Hlt2.yaml</text></argument> + <argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/Run255620.yaml</text></argument> + <argument name="extra_options_yaml"><text> + evt_max: 10000 + ntuple_file: Raw_DV_Ks_example-Hlt2.root + output_level: 3 + print_freq: 1000 + </text></argument> <argument name="reference"><text>../refs/test_davinci_tupling_from_hlt2_with_matching.ref</text></argument> <argument name="error_reference"><text>../refs/empty.ref</text></argument> <argument name="use_temp_dir"><enumeral>true</enumeral></argument> diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_raw_data.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_raw_data.qmt index 03717687cded17034aa2475f4216bef6ae48fa12..e21c41f10a8b1d8f69a13f585601b3db33dd766e 100644 --- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_raw_data.qmt +++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_raw_data.qmt @@ -18,6 +18,13 @@ <text>DaVinciExamples.tupling.option_davinci_tupling_from_raw_data:main</text> </set></argument> <argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/Run255620.yaml</text></argument> + <argument name="extra_options_yaml"><text> + evt_max: 10000 + ntuple_file: Raw_DV_Ks_example.root + output_level: 3 + print_freq: 1000 + histo_file : monitoring_histos.root + </text></argument> <argument name="reference"><text>../refs/test_davinci_tupling_from_raw_data.ref</text></argument> <argument name="error_reference"><text>../refs/empty.ref</text></argument> <argument name="use_temp_dir"><enumeral>true</enumeral></argument>