Skip to content
Snippets Groups Projects
Commit 866dd8d1 authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'master-ISF_ParSim-revived' into 'master'

necessary Db change and moved the output to AOD instead of HITS

See merge request atlas/athena!21027
parents 129397c3 d8df2f7a
No related branches found
No related tags found
9 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!28528Revert 63f845ae,!27054Atr20369 210,!26342Monopole: Handle fractionally charged particles,!21027necessary Db change and moved the output to AOD instead of HITS
......@@ -78,10 +78,6 @@ def getHITSStreamItemList():
if simFlags.RecordStepInfo.get_Value():
hitsItemList +=["ISF_FCS_Parametrization::FCS_StepInfoCollection#MergedEventSteps"]
## add xAOD::TrackParticles output collection Parametric Simulation
if simFlags.SimulationFlavour == "ParametricSimulation":
hitsItemList +=["xAOD::TrackParticleContainer#*",
"xAOD::TrackParticleAuxContainer#*"]
## Add cosmics and test beam configuration hit persistency if required cf. geom tag
layout = simFlags.SimLayout.get_Value()
if "tb" not in layout:
......@@ -111,6 +107,16 @@ def getEVNTStreamItemList():
evntItemList += ["TrackRecordCollection#CosmicRecord"]
return evntItemList
def getAODStreamItemList():
AODItemList=[]
## EventInfo always written by default
AODItemList += ["EventInfo#*"]
## add xAOD::TrackParticles output collection Parametric Simulation
AODItemList += ["xAOD::TrackParticleContainer#*",
"xAOD::TrackParticleAuxContainer#*"]
## return the item list
return AODItemList
class ISF_HITSStream:
"""
Place to handle the persistency.
......@@ -151,7 +157,19 @@ class ISF_HITSStream:
stream1.ItemList = getHITSStreamItemList()
## Make stream aware of aborted events
stream1.AcceptAlgs = [ISF_Flags.Simulator.KernelName()]
## xAOD Stream if ParametricSimulation
# TODO: name of the AOD file cannot be changed via Sim_tf because it
# does not have an --outputAODFile option
xAODStream = None
if simFlags.SimulationFlavour == "ParametricSimulation":
output_file = athenaCommonFlags.PoolAODOutput()
xAODStream = AthenaPoolOutputStream("StreamAOD", output_file, noTag=True)
xAODStream.ForceRead = True
xAODStream.ItemList = getAODStreamItemList()
## Make stream aware of aborted events
xAODStream.AcceptAlgs = [ISF_Flags.Simulator.KernelName()]
## StreamEVGEN: needed for cosmic simulations and cavern BG
## Separate stream of track record (TR) info -- it does not apply to the CTB simulations.
# TODO: Can this be merged into the cosmics sec above, or do the AthenaPool includes *need* to be in-between?
......
......@@ -48,3 +48,4 @@ addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getFullGeant4Sele
addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getPassBackGeant4Selector" , "ISF_PassBackGeant4Selector" )
addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getFatrasPileupSelector" , "ISF_FatrasPileupSelector" )
addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getFatrasPileupSelector_noHits" , "ISF_FatrasPileupSelector_noHits" )
addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getDefaultParametricSimulationSelector" , "ISF_DefaultParametricSimulationSelector" )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment