From 12d37b6e480dd3d7acb20370f992706befc2f278 Mon Sep 17 00:00:00 2001
From: Mark Hodgkinson <m.hodgkinson@sheffield.ac.uk>
Date: Fri, 26 Oct 2018 22:25:15 +0100
Subject: [PATCH] Remove renaming of containers, which is no longer needed when
running from ESD files.
---
Reconstruction/eflowRec/share/PFlowHiveExOpts.py | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/Reconstruction/eflowRec/share/PFlowHiveExOpts.py b/Reconstruction/eflowRec/share/PFlowHiveExOpts.py
index c93f55afc79..120c38477be 100644
--- a/Reconstruction/eflowRec/share/PFlowHiveExOpts.py
+++ b/Reconstruction/eflowRec/share/PFlowHiveExOpts.py
@@ -148,9 +148,6 @@ include( "CaloRec/CaloTopoCluster_jobOptions.py" )
#PFlow
include("eflowRec/PFlowMTConfig.py")
-#We are using an ESD file as input and so must change the names of the containers we create, because overwrite is not allowed in AthenaMT
-topSequence.PFOChargedCreatorAlgorithm.PFOOutputName="JetETMissChargedParticleFlowObjectsV2"
-topSequence.PFONeutralCreatorAlgorithm.PFOOutputName="JetETMissNeutralParticleFlowObjectsV2"
import AthenaPoolCnvSvc.WriteAthenaPool
logRecoOutputItemList_jobOptions = logging.getLogger( 'py:RecoOutputItemList_jobOptions' )
@@ -160,11 +157,11 @@ StreamESD=createOutputStream("StreamESD","myESD.pool.root",True)
include ("CaloRecEx/CaloRecOutputItemList_jobOptions.py")
StreamESD.ItemList+=CaloESDList
-StreamESD.ItemList += [ "xAOD::PFOContainer#JetETMissChargedParticleFlowObjectsV2"]
-StreamESD.ItemList += [ "xAOD::PFOAuxContainer#JetETMissChargedParticleFlowObjectsV2Aux."]
+StreamESD.ItemList += [ "xAOD::PFOContainer#JetETMissChargedParticleFlowObjects"]
+StreamESD.ItemList += [ "xAOD::PFOAuxContainer#JetETMissChargedParticleFlowObjectsAux."]
-StreamESD.ItemList += [ "xAOD::PFOContainer#JetETMissNeutralParticleFlowObjectsV2"]
-StreamESD.ItemList += [ "xAOD::PFOAuxContainer#JetETMissNeutralParticleFlowObjectsV2Aux."]
+StreamESD.ItemList += [ "xAOD::PFOContainer#JetETMissNeutralParticleFlowObjects"]
+StreamESD.ItemList += [ "xAOD::PFOAuxContainer#JetETMissNeutralParticleFlowObjectsAux."]
print StreamESD.ItemList
@@ -199,9 +196,5 @@ if (algCardinality > 1):
alg.Cardinality = 1
else:
alg.Cardinality = algCardinality
-
-#Change input and output container names
-topSequence.CaloTopoCluster.ClustersOutputName="CaloCalTopoClusterV2"
-topSequence.PFClusterSelector.calClustersName="CaloCalTopoClusterV2"
--
GitLab