From 94e2e95fd239270422b82e353e13c92fb55b0ccd Mon Sep 17 00:00:00 2001
From: Emmanuel Le Guirriec <emmanuel.le.guirriec@cern.ch>
Date: Thu, 27 Sep 2018 19:52:15 +0000
Subject: [PATCH] Merge branch 'reco_tf_fixes' into '21.2'
Fixing the PATJobTransforms to allow the MCP code to be processed on tier0
See merge request atlas/athena!14558
(cherry picked from commit 37d93e8edd4da168b0f0e59b2768f532e448dc32 [formerly 8121f3fd2ef42a9a366a1e96df6f50e92f567a1f])
0d58b666 Fixing the PATJobTransforms to allow the MCP code to be processed on tier0
Former-commit-id: 41b54058654abe881c7d47bf1fbb2f2fe9fc950b
---
.../PATJobTransforms/share/skeleton.AODtoDPD_tf.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/PhysicsAnalysis/PATJobTransforms/share/skeleton.AODtoDPD_tf.py b/PhysicsAnalysis/PATJobTransforms/share/skeleton.AODtoDPD_tf.py
index 4a1efa299a6..7c7a75059e7 100644
--- a/PhysicsAnalysis/PATJobTransforms/share/skeleton.AODtoDPD_tf.py
+++ b/PhysicsAnalysis/PATJobTransforms/share/skeleton.AODtoDPD_tf.py
@@ -135,8 +135,7 @@ if hasattr(runArgs,"outputNTUP_MCPScaleFile"):
from MuonPtCalibNtupleMaker import MuonPtCalibNtupleMaker_Config
MuonPtCalibNtupleMaker_Config.MuonScaleConfig(runArgs.outputNTUP_MCPScaleFile)
-#Import D3PD flags before preExec, for convenience
-from D3PDMakerConfig.D3PDProdFlags import oldProdFlags
+
## Pre-exec
if hasattr(runArgs,"preExec"):
@@ -169,9 +168,14 @@ else:
if hasattr(runArgs,"topOptions"): include(runArgs.topOptions)
else: include( "RecExCommon/RecExCommon_topOptions.py" )
-## Make "old style" D3PDs.
-for c in SetupOutputDPDs(runArgs, [oldProdFlags]): c()
-
+try:
+ #Import D3PD flags before preExec, for convenience
+ from D3PDMakerConfig.D3PDProdFlags import oldProdFlags
+ ## Make "old style" D3PDs.
+ for c in SetupOutputDPDs(runArgs, [oldProdFlags]): c()
+except ImportError:
+ print "WARNING: Old prod flags could not be included this. Only OK if you're using job transforms without the AtlasAnalysis project."
+
## Offline prescales (has to be *after* the topOptions)
if hasattr(runArgs,"prescales"):
recoLog.info( '**** DPD offline prescale arguments:' )
--
GitLab