From 2bc234b68df042ceb28693097ccd72f96d16ae68 Mon Sep 17 00:00:00 2001
From: Marcelo Vogel <marcelo.vogel@cern.ch>
Date: Tue, 12 Jan 2016 13:22:13 +0100
Subject: [PATCH] Added settings for reconstruction flags when input is RDO_FTK
(RecJobTransforms-01-00-49)
* share/skeleton.RAWtoESD_tf.py
- turn on rec.doFTK
- enable FTK chains (TriggerFlags.doFTK=True)
* Tag as RecJobTransforms-01-00-49
2016-01-08 Marcelo Vogel <marcelo.vogel@cern.ch>
* python/recTransformUtils.py
- Add argument --inputRDO_FTKFile
- Add RDO_FTK as input to RAWtoESD
* share/skeleton.RAWtoESD_tf.py
- Add input RDO_FTK to skeleton
2015-11-24 Graeme Stewart <graeme.andrew.stewart@cern.ch>
* scripts/RDOMerge_tf.py
- Remove erroneous comment
* Tag as RecJobTransforms-01-00-47
2015-10-15 Lisa Errenst <lisa.errenst@cern.ch>
* share/skeleton.ESDtoAOD_tf.py
- Add StreamAOD.ExtendProvenanceRecord = False for temporary ESD files
---
.../RecJobTransforms/python/recTransformUtils.py | 5 ++++-
Reconstruction/RecJobTransforms/scripts/RDOMerge_tf.py | 3 +--
.../RecJobTransforms/share/skeleton.ESDtoAOD_tf.py | 9 ++++++++-
.../RecJobTransforms/share/skeleton.RAWtoESD_tf.py | 8 ++++++++
4 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/Reconstruction/RecJobTransforms/python/recTransformUtils.py b/Reconstruction/RecJobTransforms/python/recTransformUtils.py
index 8d9909c0fc4..bab6441b99e 100644
--- a/Reconstruction/RecJobTransforms/python/recTransformUtils.py
+++ b/Reconstruction/RecJobTransforms/python/recTransformUtils.py
@@ -56,6 +56,9 @@ def addStandardRecoFiles(parser):
parser.add_argument('--inputRDO_TRIGFile',
type=trfArgClasses.argFactory(trfArgClasses.argRDOFile, io='input'),
help='Input RDO_TRIG file', group='Reco Files')
+ parser.add_argument('--inputRDO_FTKFile',
+ type=trfArgClasses.argFactory(trfArgClasses.argRDOFile, io='input'),
+ help='Input RDO_FTK file', group='Reco Files')
parser.add_argument('--inputAODFile', nargs='+',
type=trfArgClasses.argFactory(trfArgClasses.argPOOLFile, io='input'),
help='Input AOD file', group='Reco Files')
@@ -94,7 +97,7 @@ def addRecoSubsteps(executorSet):
executorSet.add(athenaExecutor(name = 'RDOtoRDOTrigger', skeletonFile = 'RecJobTransforms/skeleton.RDOtoRDOtrigger.py',
substep = 'r2t', inData = ['RDO'], outData = ['RDO_TRIG']))
executorSet.add(athenaExecutor(name = 'RAWtoESD', skeletonFile = 'RecJobTransforms/skeleton.RAWtoESD_tf.py',
- substep = 'r2e', inData = ['BS', 'RDO', 'DRAW_ZMUMU', 'DRAW_ZEE', 'DRAW_EMU'],
+ substep = 'r2e', inData = ['BS', 'RDO', 'DRAW_ZMUMU', 'DRAW_ZEE', 'DRAW_EMU', 'RDO_FTK'],
outData = ['ESD', 'HIST_ESD_INT', 'TXT_JIVEXMLTGZ'],))
executorSet.add(athenaExecutor(name = 'ESDtoAOD', skeletonFile = 'RecJobTransforms/skeleton.ESDtoAOD_tf.py',
substep = 'e2a', inData = ['ESD'], outData = ['AOD', 'HIST_AOD_INT']))
diff --git a/Reconstruction/RecJobTransforms/scripts/RDOMerge_tf.py b/Reconstruction/RecJobTransforms/scripts/RDOMerge_tf.py
index 9641e0b3a66..465798c8423 100755
--- a/Reconstruction/RecJobTransforms/scripts/RDOMerge_tf.py
+++ b/Reconstruction/RecJobTransforms/scripts/RDOMerge_tf.py
@@ -2,8 +2,7 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-## ESDMerge_tf.py - ESD merger
-# @version $Id: RDOMerge_tf.py 670203 2015-05-27 13:19:01Z graemes $
+# @version $Id: RDOMerge_tf.py 710146 2015-11-24 10:37:59Z graemes $
import sys
import time
diff --git a/Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py b/Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py
index 9371ad03f90..554d5819bc4 100644
--- a/Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py
+++ b/Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py
@@ -5,7 +5,7 @@
#
# New version for revamped job transforms
#
-# $Id: skeleton.ESDtoAOD_tf.py 654717 2015-03-17 13:39:36Z graemes $
+# $Id: skeleton.ESDtoAOD_tf.py 700697 2015-10-15 09:48:11Z lerrenst $
#
#==============================================================
@@ -102,6 +102,13 @@ if hasattr(runArgs,"preInclude"):
if hasattr(runArgs,"topOptions"): include(runArgs.topOptions)
else: include( "RecExCommon/RecExCommon_topOptions.py" )
+# Remove unwanted back navigation to ESD when ESD is temporary
+if hasattr(runArgs,"outputAODFile"):
+ if hasattr(runArgs,"ESDFileIO") and runArgs.ESDFileIO == "temporary":
+ try:
+ StreamAOD.ExtendProvenanceRecord = False
+ except:
+ print "StreamAOD was not defined, cannot set ExtendProvenanceRecord = False. Check your flags."
#D3PDMaker outputs
if hasattr(runArgs,"outputNTUP_MINBIASFile"):
diff --git a/Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py b/Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py
index 2df0c45a206..3393d10110e 100644
--- a/Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py
+++ b/Reconstruction/RecJobTransforms/share/skeleton.RAWtoESD_tf.py
@@ -87,6 +87,14 @@ if hasattr(runArgs,"inputRDO_FILTFile"):
rec.readRDO.set_Value_and_Lock( True )
globalflags.InputFormat.set_Value_and_Lock('pool')
athenaCommonFlags.PoolRDOInput.set_Value_and_Lock( runArgs.inputRDO_FILTFile )
+
+if hasattr(runArgs,"inputRDO_FTKFile"):
+ rec.readRDO.set_Value_and_Lock( True )
+ rec.doFTK.set_Value_and_Lock(True);
+ globalflags.InputFormat.set_Value_and_Lock('pool')
+ athenaCommonFlags.PoolRDOInput.set_Value_and_Lock( runArgs.inputRDO_FTKFile )
+ from TriggerJobOpts.TriggerFlags import TriggerFlags
+ TriggerFlags.doFTK=True;
# EVNT (?)
if hasattr(runArgs,"inputEVNTFile"):
--
GitLab