Set correct "TES_ROOT" for "Turbo" process and make process an explicit parameter

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_hlt2.py

@@ -15,7 +15,7 @@ import Functors as F
 from FunTuple import FunctorCollection
 from FunTuple import FunTuple_Particles as Funtuple
 from PyConf.components import force_location
-from DaVinci.reco_objects import make_pvs_v2, reconstruction
+from DaVinci.reco_objects import make_pvs_v2
 from DaVinci.algorithms import add_filter
 from DaVinci import options
 from DaVinci.truth_matching import configured_MCTruthAndBkgCatAlg
@@ -30,8 +30,7 @@ fields = {
 }
 
 # Creating v2 reconstructed vertices to be used in the following functor
-with reconstruction.bind(process=options.process):
-    v2_pvs = make_pvs_v2()
+v2_pvs = make_pvs_v2(process=options.process)
 
 d0_variables = FunctorCollection({
     "ID": F.PARTICLE_ID,

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_hlt2_gaudirun.py

@@ -17,7 +17,7 @@ from FunTuple import FunTuple_Particles as Funtuple
 #from PyConf.application import make_data_with_FetchDataFromFile
 from PyConf.components import force_location
 from DaVinci.Configuration import run_davinci_app
-from DaVinci.reco_objects import make_pvs_v2, reconstruction
+from DaVinci.reco_objects import make_pvs_v2
 from DaVinci.algorithms import add_filter
 from DaVinci import options
 options.process = 'Hlt2'
@@ -29,8 +29,7 @@ fields = {
 }
 
 # Creating v2 reconstructed vertices to be used in the following functor
-with reconstruction.bind(process=options.process):
-    v2_pvs = make_pvs_v2()
+v2_pvs = make_pvs_v2(process=options.process)
 
 d0_variables = FunctorCollection({
     "PT": F.PT,

Phys/DaVinci/python/DaVinci/reco_objects.py

@@ -39,7 +39,7 @@ def upfront_reconstruction(process='Spruce'):
     """
     TES_ROOT = '/Event/Spruce'
     RECO = 'HLT2'
-    if process == 'Hlt2':
+    if process in ['Hlt2', 'Turbo']:
         TES_ROOT = '/Event/HLT2'
         RECO = ''
 
@@ -58,7 +58,7 @@ def reconstruction(process='Spruce'):
     map = {}
 
     TES_ROOT = '/Event/Spruce/HLT2'
-    if process == 'Hlt2':
+    if process in ['Hlt2', 'Turbo']:
         TES_ROOT = '/Event/HLT2'
 
     packed_loc = enums_as_dict(LocationsUnpackedReco, strip="/Event/")
@@ -70,33 +70,33 @@ def reconstruction(process='Spruce'):
     return map
 
 
-def make_rich_pids():
-    return reconstruction()['RichPIDs']
+def make_rich_pids(process='Spruce'):
+    return reconstruction(process=process)['RichPIDs']
 
 
-def make_muon_pids():
-    return reconstruction()['MuonPIDs']
+def make_muon_pids(process='Spruce'):
+    return reconstruction(process=process)['MuonPIDs']
 
 
-def make_charged_protoparticles():
-    return reconstruction()['ChargedProtos']
+def make_charged_protoparticles(process='Spruce'):
+    return reconstruction(process=process)['ChargedProtos']
 
 
-def make_neutral_protoparticles():
-    return reconstruction()['NeutralProtos']
+def make_neutral_protoparticles(process='Spruce'):
+    return reconstruction(process=process)['NeutralProtos']
 
 
-def make_pvs():
-    return reconstruction()['PVs']
+def make_pvs(process='Spruce'):
+    return reconstruction(process=process)['PVs']
 
 
-def make_tracks():
-    return reconstruction()['Tracks']
+def make_tracks(process='Spruce'):
+    return reconstruction(process=process)['Tracks']
 
 
-def make_pvs_v2():
+def make_pvs_v2(process='Spruce'):
 
-    pvs = make_pvs()
+    pvs = make_pvs(process=process)
 
     # FIXME: this is a temporary solution until we have persistency
     # for the new PV container.  Note that this converter does not