diff --git a/Tools/FullChainTransforms/CMakeLists.txt b/Tools/FullChainTransforms/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..162b7d68a638d8e55fcd0389f0fe75d87020dac5 --- /dev/null +++ b/Tools/FullChainTransforms/CMakeLists.txt @@ -0,0 +1,21 @@ +################################################################################ +# Package: FullChainTransforms +################################################################################ + +# Declare the package name: +atlas_subdir( FullChainTransforms ) + +# Declare the package's dependencies: +atlas_depends_on_subdirs( PUBLIC + PhysicsAnalysis/PATJobTransforms + Reconstruction/RecJobTransforms + Simulation/SimuJobTransforms + Tools/PyJobTransforms ) + +# External dependencies: +find_package( PythonLibs ) + +# Install files from the package: +atlas_install_joboptions( share/*.py ) +atlas_install_runtime( scripts/*.py ) + diff --git a/Tools/FullChainTransforms/share/skeleton.EVGENtoRDO.py b/Tools/FullChainTransforms/share/skeleton.EVGENtoRDO.py index cde0666c0194cc9bfcb0cb133b54ac14c3da0e24..d3e73219f4290a82e65c1b6890216bc7dec941b5 100644 --- a/Tools/FullChainTransforms/share/skeleton.EVGENtoRDO.py +++ b/Tools/FullChainTransforms/share/skeleton.EVGENtoRDO.py @@ -229,11 +229,17 @@ if hasattr(runArgs, "postSimExec"): ## Always enable the looper killer, unless it's been disabled if not hasattr(runArgs, "enableLooperKiller") or runArgs.enableLooperKiller: - def use_looperkiller(): - from G4AtlasApps import PyG4Atlas, AtlasG4Eng - lkAction = PyG4Atlas.UserAction('G4UserActions', 'LooperKiller', ['BeginOfRun', 'EndOfRun', 'BeginOfEvent', 'EndOfEvent', 'Step']) - AtlasG4Eng.G4Eng.menu_UserActions.add_UserAction(lkAction) - simFlags.InitFunctions.add_function("postInit", use_looperkiller) + try: + # Post UserAction Migration (ATLASSIM-1752) + from G4AtlasServices.G4AtlasUserActionConfig import UAStore + UAStore.addAction('LooperKiller',['Step']) # add default configurable + except: + # Pre UserAction Migration + def use_looperkiller(): + from G4AtlasApps import PyG4Atlas, AtlasG4Eng + lkAction = PyG4Atlas.UserAction('G4UserActions', 'LooperKiller', ['BeginOfRun', 'EndOfRun', 'BeginOfEvent', 'EndOfEvent', 'Step']) + AtlasG4Eng.G4Eng.menu_UserActions.add_UserAction(lkAction) + simFlags.InitFunctions.add_function("postInit", use_looperkiller) else: fast_chain_log.warning("The looper killer will NOT be run in this job.")