From b915a166c5eaf981e41acadee74a76fdfc1d5781 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Tue, 7 Apr 2020 16:38:48 +0200
Subject: [PATCH] Remove RecFlags.abortOnUncheckedStatusCode
StatusCodeSvc is deprecated. Remove the corresponding RecFlag and all
its references.
---
.../LUCID_Monitoring/share/args.ESDtoAOD.lucid.py | 1 -
.../CscRawDataMonitoring/share/CSCMon_jobOptions.py | 2 --
.../HSG5/HSG5DPDUtils/share/D2PD_topOptions.py | 5 -----
.../RecExample/RecExCond/share/RecExCommon_flags.py | 3 +--
.../RecExample/RecExConfig/python/RecFlags.py | 11 ++---------
.../RecExOnline/share/RecExOnline_recoflags.py | 5 -----
.../RecExOnline/share/RecExOnline_recoflags_HItest.py | 5 -----
.../RecExOnline/share/RecExOnline_recoflags_RunHI.py | 5 -----
.../share/jobConfig.AtlfastIIF.py | 2 --
.../share/jobConfig.AtlfastIIF_oldParametrization.py | 2 --
.../TrigJetMonitoring/share/HLTJetMon_jobOptions.py | 2 --
.../TrigMETMonitoring/share/HLTMETMon_jobOptions.py | 2 --
.../share/L1CaloPprPhos4ShapeMaker_jobOptions.py | 2 +-
.../share/EventDisplay_jobOptions.py | 2 --
.../share/SplashEvent_jobOptions.py | 1 -
.../JiveXML/share/JiveXML_jobOptions_PhysicsESD.py | 3 ---
graphics/JiveXML/share/JiveXML_jobOptions_Reco.py | 6 ------
17 files changed, 4 insertions(+), 55 deletions(-)
diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/share/args.ESDtoAOD.lucid.py b/ForwardDetectors/LUCID/LUCID_Monitoring/share/args.ESDtoAOD.lucid.py
index 63f983ff096d..a92cb9ab1db3 100755
--- a/ForwardDetectors/LUCID/LUCID_Monitoring/share/args.ESDtoAOD.lucid.py
+++ b/ForwardDetectors/LUCID/LUCID_Monitoring/share/args.ESDtoAOD.lucid.py
@@ -32,7 +32,6 @@ runArgs.preExec = ['rec.doTrigger=False;rec.doMuon=False',
'rec.doTile=False',
'rec.doInDet=False',
'rec.doCalo=False',
- 'rec.abortOnUncheckedStatusCode=False',
'rec.doPerfMon=True',
'rec.doDetailedPerfMon=True',
'DQMonFlags.doPixelMon=False',
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CSCMon_jobOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CSCMon_jobOptions.py
index e73685c547c6..fa5864cfefeb 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CSCMon_jobOptions.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CSCMon_jobOptions.py
@@ -82,8 +82,6 @@ if 1:
rec.AutoConfiguration .set_Value_and_Lock(["everything"])
- rec.abortOnUncheckedStatusCode .set_Value_and_Lock(False)
-
rec.doCBNT .set_Value_and_Lock(False)
rec.doESD .set_Value_and_Lock(False)
rec.doHist .set_Value_and_Lock(False)
diff --git a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/D2PD_topOptions.py b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/D2PD_topOptions.py
index fefa3eb5bfcc..3ae13e3a9bdd 100644
--- a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/D2PD_topOptions.py
+++ b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/share/D2PD_topOptions.py
@@ -17,11 +17,6 @@
#==============================================================================
from D2PDMaker.D2PDFlags import D2PDFlags
-# A temporary fix for an unchecked StatusCode
-from RecExConfig.RecFlags import rec
-rec.abortOnUncheckedStatusCode=False
-
-
#==============================================================================
# If you have your own DPD Maker scripts
# (see:
diff --git a/Reconstruction/RecExample/RecExCond/share/RecExCommon_flags.py b/Reconstruction/RecExample/RecExCond/share/RecExCommon_flags.py
index ac4ce59d0180..fec5258dd5a0 100755
--- a/Reconstruction/RecExample/RecExCond/share/RecExCommon_flags.py
+++ b/Reconstruction/RecExample/RecExCond/share/RecExCommon_flags.py
@@ -136,8 +136,7 @@ RecExCommonFlags = {
'doDumpTES' : False, # if dump storegate transient event store
'doDumpTDS' : False, # if dump storegate transient detector store
'doFloatingPointException' : True, # if enable floating-point exception
- 'abortOnUncheckedStatusCode' : True, # if enable abort on unchecked status code
- 'doDumpPoolInputContent' : False, # if dump pool input object list
+ 'doDumpPoolInputContent' : False, # if dump pool input object list
'doDumpProperties' : False, # if dump all algs properties
'doDetailedAuditor' : False, # if monitor alg/tools and services memory and CPU time
'doSGAuditor' : False, # if monitor data flow, see https://twiki.cern.ch/twiki/bin/view/Atlas/DataFlowMonitoring
diff --git a/Reconstruction/RecExample/RecExConfig/python/RecFlags.py b/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
index c0dd72534482..dc97d482e5c5 100755
--- a/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
+++ b/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#=======================================================================
# File: RecExConfig/python/RecFlags.py
@@ -370,13 +370,6 @@ class doFloatingPointException(JobProperty):
allowedTypes=['bool']
StoredValue=False
-class abortOnUncheckedStatusCode(JobProperty):
- """ If True abort on first unchecked status code
- """
- statusOn=True
- allowedTypes=['bool']
- StoredValue=True
-
#
class doHist(JobProperty):
""" If True output some histograms . Not tested on 13.0.X.
@@ -1026,7 +1019,7 @@ _list_Rec=[TAGFromRDO, doTagRawSummary , doBeamBackgroundFiller, \
OutputLevel, RootHistoOutput, RootNtupleOutput, UserAlgs, UserExecs, UserFlags, doDPD, DPDMakerScripts, LoadGeometry, doAOD, doAODCaloCells, doESD,\
doAODall, doCBNT, doPyDump, doMonitoring, doCheckDictionary, doCheckJOT,CBNTAthenaAware,\
doDetailedAuditor, doSGAuditor, doFastMemoryAuditor, doMemoryAuditor, OutputSuffix, OutputFileNameForRecoStep, doPerfMon, doDetailedPerfMon, doSemiDetailedPerfMon, doRecoTiming, doDumpMC, doDumpPoolInputContent, doDumpProperties,\
-doDumpTDS, doDumpTES, doFloatingPointException, abortOnUncheckedStatusCode, oldFlagCompatibility, oldFlagTopSteering,oldFlagLandMine,\
+doDumpTDS, doDumpTES, doFloatingPointException, oldFlagCompatibility, oldFlagTopSteering,oldFlagLandMine,\
doEdmMonitor, doHist, doJiveXML, doPersint,doVP1, doNameAuditor, \
doRestrictedESD, doShowSizeStatistics, doTimeLimit, doTruth,\
doWriteAOD, doWritexAOD, doWriteESD, doWriteDPD, doWriteBS, doWriteRDO, doWriteTAG, doWriteTAGCOM, PoolTAGCOMOutput, readAOD, readTAG, readRDO, \
diff --git a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags.py b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags.py
index 7d837a0de0c0..030109d198ef 100644
--- a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags.py
+++ b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags.py
@@ -40,9 +40,6 @@ if (not 'doEgammaTau' in dir()):
if (not 'doCommissioning' in dir()):
doCommissioning = False
-if ( not 'abortonuncheckedstatuscode' in dir()):
- abortonuncheckedstatuscode = False
-
if (not 'doHIRec' in dir()):
doHIRec = False
@@ -82,5 +79,3 @@ rec.doEgamma.set_Value_and_Lock(doEgammaTau)
rec.doTau.set_Value_and_Lock(doEgammaTau)
rec.Commissioning.set_Value_and_Lock(True) # set to True by default
-
-rec.abortOnUncheckedStatusCode.set_Value_and_Lock(abortonuncheckedstatuscode)
diff --git a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags_HItest.py b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags_HItest.py
index cb8f5d2f2b2d..4dfe4ee2b560 100644
--- a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags_HItest.py
+++ b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags_HItest.py
@@ -40,9 +40,6 @@ if (not 'doEgammaTau' in dir()):
if (not 'doCommissioning' in dir()):
doCommissioning = False
-if ( not 'abortonuncheckedstatuscode' in dir()):
- abortonuncheckedstatuscode = False
-
if (not 'doHIRec' in dir()):
doHIRec = False
@@ -80,5 +77,3 @@ rec.doEgamma.set_Value_and_Lock(doEgammaTau)
rec.doTau.set_Value_and_Lock(doEgammaTau)
rec.Commissioning.set_Value_and_Lock(True) # set to True by default
-
-rec.abortOnUncheckedStatusCode.set_Value_and_Lock(abortonuncheckedstatuscode)
diff --git a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags_RunHI.py b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags_RunHI.py
index b03ae0e9f15f..65dc52f2e13b 100644
--- a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags_RunHI.py
+++ b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_recoflags_RunHI.py
@@ -40,9 +40,6 @@ if (not 'doEgammaTau' in dir()):
if (not 'doCommissioning' in dir()):
doCommissioning = False
-if ( not 'abortonuncheckedstatuscode' in dir()):
- abortonuncheckedstatuscode = False
-
if (not 'doHIRec' in dir()):
doHIRec = False
@@ -80,5 +77,3 @@ rec.doEgamma.set_Value_and_Lock(doEgammaTau)
rec.doTau.set_Value_and_Lock(doEgammaTau)
rec.Commissioning.set_Value_and_Lock(True) # set to True by default
-
-rec.abortOnUncheckedStatusCode.set_Value_and_Lock(abortonuncheckedstatuscode)
diff --git a/Simulation/FastSimulation/FastSimulationJobTransforms/share/jobConfig.AtlfastIIF.py b/Simulation/FastSimulation/FastSimulationJobTransforms/share/jobConfig.AtlfastIIF.py
index 914f8e98ebbc..23e64c46b129 100644
--- a/Simulation/FastSimulation/FastSimulationJobTransforms/share/jobConfig.AtlfastIIF.py
+++ b/Simulation/FastSimulation/FastSimulationJobTransforms/share/jobConfig.AtlfastIIF.py
@@ -31,5 +31,3 @@ from FastCaloSim.FastCaloSimConf import FastShowerCellBuilderTool
theFastShowerCellBuilderTool=FastShowerCellBuilderTool()
theFastShowerCellBuilderTool.McLocation=FatrasKeyFlags.McEventCollection()
#theFastShowerCellBuilderTool.OutputLevel = ERROR
-
-rec.abortOnUncheckedStatusCode=False
diff --git a/Simulation/FastSimulation/FastSimulationJobTransforms/share/jobConfig.AtlfastIIF_oldParametrization.py b/Simulation/FastSimulation/FastSimulationJobTransforms/share/jobConfig.AtlfastIIF_oldParametrization.py
index 33beac495b50..e1090ef15518 100644
--- a/Simulation/FastSimulation/FastSimulationJobTransforms/share/jobConfig.AtlfastIIF_oldParametrization.py
+++ b/Simulation/FastSimulation/FastSimulationJobTransforms/share/jobConfig.AtlfastIIF_oldParametrization.py
@@ -31,5 +31,3 @@ from FastCaloSim.FastCaloSimConf import FastShowerCellBuilderTool
theFastShowerCellBuilderTool=FastShowerCellBuilderTool()
theFastShowerCellBuilderTool.McLocation=FatrasKeyFlags.McEventCollection()
#theFastShowerCellBuilderTool.OutputLevel = ERROR
-
-rec.abortOnUncheckedStatusCode=False
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/share/HLTJetMon_jobOptions.py b/Trigger/TrigMonitoring/TrigJetMonitoring/share/HLTJetMon_jobOptions.py
index c6e1062e2f6e..cd93a4d9e2d5 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/share/HLTJetMon_jobOptions.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/share/HLTJetMon_jobOptions.py
@@ -76,8 +76,6 @@ if 1:
rec.AutoConfiguration .set_Value_and_Lock(["everything"])
- rec.abortOnUncheckedStatusCode .set_Value_and_Lock(False)
-
rec.doCBNT .set_Value_and_Lock(False)
rec.doESD .set_Value_and_Lock(False)
rec.doHist .set_Value_and_Lock(False)
diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/share/HLTMETMon_jobOptions.py b/Trigger/TrigMonitoring/TrigMETMonitoring/share/HLTMETMon_jobOptions.py
index 9a0ef6c48993..039d43f3f447 100644
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/share/HLTMETMon_jobOptions.py
+++ b/Trigger/TrigMonitoring/TrigMETMonitoring/share/HLTMETMon_jobOptions.py
@@ -38,8 +38,6 @@ from RecExConfig.RecFlags import rec
rec.AutoConfiguration .set_Value_and_Lock(["everything"])
-rec.abortOnUncheckedStatusCode .set_Value_and_Lock(False)
-
rec.doCBNT .set_Value_and_Lock(False)
rec.doESD .set_Value_and_Lock(False)
rec.doHist .set_Value_and_Lock(False)
diff --git a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloPprPhos4ShapeMaker_jobOptions.py b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloPprPhos4ShapeMaker_jobOptions.py
index 01173b21ad27..308da7bc4a2b 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloPprPhos4ShapeMaker_jobOptions.py
+++ b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloPprPhos4ShapeMaker_jobOptions.py
@@ -17,7 +17,7 @@ rec.doTile.set_Value_and_Lock(False)
#rec.oldFlagLandMine.set_Value_and_Lock(True)
rec.doTrigger.set_Value_and_Lock(True)
-disableRecJobOpts = ('abortOnUncheckedStatusCode','doWriteESD','doTruth', 'doAOD','doAODCaloCells',
+disableRecJobOpts = ('doWriteESD','doTruth', 'doAOD','doAODCaloCells',
'doAODall','doCBNT','CBNTAthenaAware','doPerfMon','oldFlagTopSteering','doHist',
'doDetailedPerfMon','doWriteAOD','doWriteTAG','doInDet','doMuon','doJetMissingETTag',
'doEgamma','doMuonCombined','doTau','doMonitoring','readESD','doWriteBS','doDPD','oldFlagCompatibility',
diff --git a/graphics/EventDisplaysOnline/share/EventDisplay_jobOptions.py b/graphics/EventDisplaysOnline/share/EventDisplay_jobOptions.py
index f91ad155fe28..1b27c2362680 100644
--- a/graphics/EventDisplaysOnline/share/EventDisplay_jobOptions.py
+++ b/graphics/EventDisplaysOnline/share/EventDisplay_jobOptions.py
@@ -148,8 +148,6 @@ include ("RecExOnline/RecExOnline_jobOptions.py")
ToolSvc.InDetPixelRodDecoder.OutputLevel = ERROR
-rec.abortOnUncheckedStatusCode = False
-
include ("EventDisplaysOnline/JiveXMLServer_jobOptions.py")
include ("EventDisplaysOnline/Atlantis_jobOptions.py")
#include ("EventDisplaysOnline/VP1_jobOptions.py")
diff --git a/graphics/EventDisplaysOnline/share/SplashEvent_jobOptions.py b/graphics/EventDisplaysOnline/share/SplashEvent_jobOptions.py
index 59a7d82e57c9..c4981a7930ec 100644
--- a/graphics/EventDisplaysOnline/share/SplashEvent_jobOptions.py
+++ b/graphics/EventDisplaysOnline/share/SplashEvent_jobOptions.py
@@ -94,7 +94,6 @@ rec.doDetStatus.set_Value_and_Lock(False) #
#---------------------------------------------- Comissioning settings
rec.Commissioning.set_Value_and_Lock(True)
-rec.abortOnUncheckedStatusCode.set_Value_and_Lock(False)
# ----------------------------- Main jobOpt
include("RecExCommon/RecExCommon_topOptions.py")
diff --git a/graphics/JiveXML/share/JiveXML_jobOptions_PhysicsESD.py b/graphics/JiveXML/share/JiveXML_jobOptions_PhysicsESD.py
index 31c0eeccb604..03cbaac71c2d 100755
--- a/graphics/JiveXML/share/JiveXML_jobOptions_PhysicsESD.py
+++ b/graphics/JiveXML/share/JiveXML_jobOptions_PhysicsESD.py
@@ -31,9 +31,6 @@ jp.Rec.doMonitoring.set_Value_and_Lock(False)
jp.Rec.doAOD.set_Value_and_Lock(False)
jp.Rec.doWriteAOD.set_Value_and_Lock(False)
-#### not necessary anymore
-#rec.abortOnUncheckedStatusCode.set_Value_and_Lock(False)
-
#### job options to retrieve spacepoints from ESDs
#### not done by default ! From Thijs Cornellisen
from InDetRecExample.InDetJobProperties import InDetFlags
diff --git a/graphics/JiveXML/share/JiveXML_jobOptions_Reco.py b/graphics/JiveXML/share/JiveXML_jobOptions_Reco.py
index e091e77be3ec..9ec6cf862803 100755
--- a/graphics/JiveXML/share/JiveXML_jobOptions_Reco.py
+++ b/graphics/JiveXML/share/JiveXML_jobOptions_Reco.py
@@ -7,12 +7,6 @@ include ("RecExCommon/RecExCommon_flags.py")
#### This was used in other RTT jOs:
#PoolRDOInput = ["/afs/cern.ch/atlas/offline/ReleaseData/v2/testfile/calib1_csc11.005200.T1_McAtNlo_Jimmy.digit.RDO.v12000301_tid003138._00016_extract_10evt.pool.root"]
-#### Not necessary anymore (tag JiveXML-01-01-22).
-#### This over-rides
-#### Athena crash due to unchecked return codes.
-#
-#rec.abortOnUncheckedStatusCode=False
-
include ("RecExCommon/myTopOptions.py")
include( "JiveXML/JiveXML_jobOptionBase.py" )
--
GitLab