Remove ForceRerun from configurations (since that is always true now).

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" )):

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")