diff --git a/Simulation/ISF/ISF_Example/CMakeLists.txt b/Simulation/ISF/ISF_Example/CMakeLists.txt deleted file mode 100644 index c3ddb3adfb9e6b3b79f7bb0fd79cb567abc7c621..0000000000000000000000000000000000000000 --- a/Simulation/ISF/ISF_Example/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# Package: ISF_Example -################################################################################ - -# Declare the package name: -atlas_subdir( ISF_Example ) - -# Declare the package's dependencies: -atlas_depends_on_subdirs( PRIVATE - TestPolicy ) - -# Install files from the package: -atlas_install_python_modules( python/*.py ) -atlas_install_joboptions( share/*.py ) -atlas_install_scripts( scripts/*.py ) - diff --git a/Simulation/ISF/ISF_Example/python/ISF_Output.py b/Simulation/ISF/ISF_Example/python/ISF_Output.py index ae40f364ebf643cdd876387e5876ff4ca87961f5..9cf0ddf0a1dcb47315145625a03befd89a7c37dc 100644 --- a/Simulation/ISF/ISF_Example/python/ISF_Output.py +++ b/Simulation/ISF/ISF_Example/python/ISF_Output.py @@ -41,6 +41,10 @@ class ISF_HITSStream: stream1.ItemList = ["EventInfo#*", "McEventCollection#TruthEvent", "JetCollection#*"] + + if simFlags.SimulationFlavour() is not None and 'ongLived' in simFlags.SimulationFlavour(): # to catch LongLived and longLived + stream1.ItemList += ["McEventCollection#GEN_EVENT"] + from PyJobTransforms.trfUtils import releaseIsOlderThan if releaseIsOlderThan(20,0): #Hack to maintain compatibility of G4AtlasApps trunk with @@ -66,7 +70,7 @@ class ISF_HITSStream: stream1.ItemList += ["CaloCalibrationHitContainer#*", "LArHitContainer#*", "TileHitVector#*", - "SimpleScintillatorHitCollection#*", + #"SimpleScintillatorHitCollection#*", "TrackRecordCollection#MuonEntryLayer"] ## Muon if DetFlags.Muon_on(): @@ -100,7 +104,7 @@ class ISF_HITSStream: stream1.ItemList += ["AFP_TDSimHitCollection#*","AFP_SIDSimHitCollection#*"] ## Ancillary scintillators - stream1.ItemList += ["ScintillatorHitCollection#*"] + #stream1.ItemList += ["ScintillatorHitCollection#*"] ## TimingAlg stream1.ItemList +=["RecoTimingObj#EVNTtoHITS_timings"] @@ -108,10 +112,10 @@ class ISF_HITSStream: ## Add cosmics and test beam configuration hit persistency if required cf. geom tag layout = simFlags.SimLayout.get_Value() - ## add xAOD::TrackParticles output collection Parametric Simulation + ## add xAOD::TrackParticles output collection Parametric Simulation if simFlags.SimulationFlavour == "ParametricSimulation": stream1.ItemList +=["xAOD::TrackParticleContainer#*", - "xAOD::TrackParticleAuxContainer#*"] + "xAOD::TrackParticleAuxContainer#*"] #from AthenaCommon.GlobalFlags import globalflags #layout = globalflags.DetDescrVersion.get_Value() if "tb" not in layout: