Merge branch 'msaur_rawevent_location' into 'master'

Change of RawEvent location post Sprucing

See merge request !4158

GaudiConf/python/GaudiConf/reading.py

@@ -17,7 +17,7 @@ from PyConf.utils import load_file
 from PyConf.application import (default_raw_event, default_raw_banks,
                                 make_data_with_FetchDataFromFile,
                                 ComponentConfig)
-
+from PyConf.Algorithms import UnpackMCParticle, UnpackMCVertex
 from PyConf.dataflow import dataflow_config
 from PyConf.components import force_location, setup_component
 from PyConf.packing import unpackers_map
@@ -159,8 +159,6 @@ def mc_unpackers(input_process='Hlt2', filtered_mc=True, configurables=True):
     if input_process == "Spruce":
         mc_prefix = '/Event/Spruce/HLT2'
 
-    from PyConf.application import make_data_with_FetchDataFromFile
-    from PyConf.Algorithms import UnpackMCParticle, UnpackMCVertex
     unpack_mcp = UnpackMCParticle(
         InputName=make_data_with_FetchDataFromFile(
             os.path.join(mc_prefix, "pSim/MCParticles")),
@@ -272,7 +270,8 @@ def bank_location(input_process="Hlt2",
                   raw_event_format=0.5):
 
     if input_process == "Spruce" or input_process == "Turbo":
-        bank_location = make_data_with_FetchDataFromFile(stream)
+        bank_location = make_data_with_FetchDataFromFile(
+            f'/Event/{stream}/RawEvent')
     else:
         bank_location = default_raw_event([bank],
                                           raw_event_format=raw_event_format)

PyConf/python/PyConf/application.py

@@ -648,7 +648,7 @@ def default_raw_event(bank_types=[],
             'either raw_event_format or stream  is required (must be bound)')
 
     if stream:
-        location = [stream]
+        location = [f'/Event/{stream}/RawEvent']
     else:
         raw_bank_locations = Raw_location_db[raw_event_format]