From b7a78fba8b57ae4a1c6640a8f7cd7f3c080c9977 Mon Sep 17 00:00:00 2001
From: Atlas-Software Librarian <Atlas-Software.Librarian@cern.ch>
Date: Fri, 8 Apr 2016 17:41:37 +0200
Subject: [PATCH] 'CMakeLists.txt' (FullChainTransforms-00-01-06)
* share/skeleton.EVGENtoRDO.py - back-compatible changes so that
the migrated LooperKiller is used when available. ATLASIM-2360
* Tag FullChainTransforms-00-01-06
* share/skeleton.EVGENtoRDO.py - add enabling of
---
Tools/FullChainTransforms/CMakeLists.txt | 21 +++++++++++++++++++
.../share/skeleton.EVGENtoRDO.py | 16 +++++++++-----
2 files changed, 32 insertions(+), 5 deletions(-)
create mode 100644 Tools/FullChainTransforms/CMakeLists.txt
diff --git a/Tools/FullChainTransforms/CMakeLists.txt b/Tools/FullChainTransforms/CMakeLists.txt
new file mode 100644
index 00000000000..162b7d68a63
--- /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 cde0666c019..d3e73219f42 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.")
--
GitLab