Merge branch 'sponce_calohisto' into 'master'

Make sure there is no collision of name between histo and ntuple root files

See merge request !809

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

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>

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')

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')