diff --git a/DaVinciExamples/example_data/FEST_November_2021_dst_newPacking.yaml b/DaVinciExamples/example_data/FEST_November_2021_dst_newPacking.yaml index 560d1a614fa8480959918eb86354c8ff61381007..05cb9188c1786bfdc083ccb4b5cfe4662aba2353 100644 --- a/DaVinciExamples/example_data/FEST_November_2021_dst_newPacking.yaml +++ b/DaVinciExamples/example_data/FEST_November_2021_dst_newPacking.yaml @@ -6,8 +6,8 @@ input_type: ROOT simulation: true conddb_tag: sim-20201218-vc-md100 dddb_tag: dddb-20201211 -histo_file: v2_example.root -ntuple_file: v2_example.root +histo_file: v2_example_histos.root +ntuple_file: v2_example_ntuples.root input_process: Hlt2 stream: default print_freq: 1000 diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_collections.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_collections.qmt index 279af4d47d969e67bb182ec6a88b721e06e44f06..032695e0b6553bd24c1cd5343591bcd574dced9b 100644 --- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_collections.qmt +++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_collections.qmt @@ -19,7 +19,7 @@ </set></argument> <argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/FEST_November_2021_dst_newPacking.yaml</text></argument> <argument name="extra_options_yaml"><text> - histo_file: tuple_D0_Kpi_10evts_collections.root + histo_file: histo_D0_Kpi_10evts_collections.root ntuple_file: tuple_D0_Kpi_10evts_collections.root print_freq: 1 </text></argument> diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_hlt2.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_hlt2.qmt index 3dc9f136d86356d8ee00c6e6500d95decb903c64..864f4414c521e92b705c81047bf3271caac54e9d 100644 --- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_hlt2.qmt +++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_hlt2.qmt @@ -19,8 +19,8 @@ </set></argument> <argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/FEST_November_2021_dst_newPacking.yaml</text></argument> <argument name="extra_options_yaml"><text> - histo_file: tuple_D0_Kpi_10evts_fromHlt2.root - ntuple_file: tuple_D0_Kpi_10evts_fromHlt2.root + histo_file: tuple_D0_Kpi_10evts_fromHlt2_histos.root + ntuple_file: tuple_D0_Kpi_10evts_fromHlt2_ntuples.root print_freq: 1 </text></argument> <argument name="reference"><text>../refs/test_davinci_tupling_from_hlt2.ref</text></argument> @@ -115,7 +115,7 @@ B_vars_stored =['D0_BKGCAT', B_vars_stored = sorted(B_vars_stored) #open the TFile and TTree -ntuple = './tuple_D0_Kpi_10evts_fromHlt2.root' +ntuple = './tuple_D0_Kpi_10evts_fromHlt2_ntuples.root' if not os.path.isfile(ntuple): raise Exception(f"File: {ntuple} does not exist!") f = TFile.Open(ntuple) t_B = f.Get('Tuple/DecayTree') diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt index c3ee1d6b6baee49d942260d2f0f3cd1a59c3b067..fddfde5295ccb853172e4f731b57c819ce6b0fe9 100755 --- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt +++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt @@ -36,7 +36,7 @@ K_vars_stored =['K_PX', 'K_PY', 'K_PZ', 'RUNNUMBER', 'EVENTNUMBER'] B_vars_stored = sorted(B_vars_stored) #open the TFile and TTree -ntuple = './v2_example.root' +ntuple = './v2_example_ntuples.root' if not os.path.isfile(ntuple): raise Exception(f"File: {ntuple} does not exist!") f = TFile.Open(ntuple) t_B = f.Get('TupleB/DecayTree')