From a2cb73a28433f4a42291831d25ed9bc9056182c5 Mon Sep 17 00:00:00 2001
From: Jovan Mitrevski <Jovan.Mitrevski@cern.ch>
Date: Wed, 13 Sep 2017 14:07:59 +0200
Subject: [PATCH] Remove ForceRerun from configurations (since that is always
true now).
Former-commit-id: 5a96780c36cb6e8ca1b042ec3d3b02d381c960fd
---
.../share/TruthParticleBuilder_jobOptions.py | 5 +++--
.../share/VrtSecInclusive_DV_ESD_postInclude.py | 8 +++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/share/TruthParticleBuilder_jobOptions.py b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/share/TruthParticleBuilder_jobOptions.py
index bb189f71295..dab49512a52 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/share/TruthParticleBuilder_jobOptions.py
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/share/TruthParticleBuilder_jobOptions.py
@@ -26,13 +26,14 @@ from McParticleAlgs.JobOptCfg import McAodBuilder,createMcAodBuilder,PileUpClass
# If we're reprocessing, we may have TruthEvents but not xAODTruthLinks.
# Remake the links here if needed.
+# JM: In the future, this would not work. If TrutheEvents exists, it should
+# be renamed out of the way. Force rerun is effectivly always true.
# This needs to come before the McAodBuilder below; otherwise,
# xAODTruthCnvAlg will also try to rebuild TruthEvents.
if (objKeyStore.isInInput( "xAOD::TruthEventContainer", "TruthEvents" ) and
not objKeyStore.isInInput( "xAODTrigParticleLinkVector", "xAODTruthLinks" ) ):
from xAODTruthCnv.xAODTruthCnvConf import xAODMaker__xAODTruthCnvAlg
- job += xAODMaker__xAODTruthCnvAlg("GEN_AOD2xAOD",
- ForceRerun = True)
+ job += xAODMaker__xAODTruthCnvAlg("GEN_AOD2xAOD")
if (objKeyStore.isInInput( "McEventCollection", "TruthEvent" ) and
not objKeyStore.isInInput( "McEventCollection", "GEN_AOD" )):
diff --git a/Reconstruction/VKalVrt/VrtSecInclusive/share/VrtSecInclusive_DV_ESD_postInclude.py b/Reconstruction/VKalVrt/VrtSecInclusive/share/VrtSecInclusive_DV_ESD_postInclude.py
index 746f1e4201c..8dae9d81436 100644
--- a/Reconstruction/VKalVrt/VrtSecInclusive/share/VrtSecInclusive_DV_ESD_postInclude.py
+++ b/Reconstruction/VKalVrt/VrtSecInclusive/share/VrtSecInclusive_DV_ESD_postInclude.py
@@ -10,9 +10,11 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
StoreGateSvc=svcMgr.StoreGateSvc
StoreGateSvc.AllowOverwrite=True
-# force the truth conversion to rerun, discussed in https://its.cern.ch/jira/browse/ATLASRECTS-2062
-if not globalflags.DataSource() == 'data':
- topSequence.GEN_AOD2xAOD.ForceRerun=True
+# (JM) In release 22 ForceRerun is effectively always true. The configuration
+# should add the alg if it needs to run, not if it doesn't
+# # force the truth conversion to rerun, discussed in https://its.cern.ch/jira/browse/ATLASRECTS-2062
+# if not globalflags.DataSource() == 'data':
+# topSequence.GEN_AOD2xAOD.ForceRerun=True
# include options
include("VrtSecInclusive/VrtSecInclusive_DV_postInclude.py")
--
GitLab