diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/share/args.ESDtoAOD.lucid.py b/ForwardDetectors/LUCID/LUCID_Monitoring/share/args.ESDtoAOD.lucid.py index 63f983ff096dca760776c9d4c9e8b7c06402b312..a92cb9ab1db321dc3f7453c6adebb301ec81c5aa 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 e73685c547c660256f86b088e556f5b76279afc4..fa5864cfefeb99b224a463d132a6e860749b09fc 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 fefa3eb5bfccde925cb94734311fb738ce357a97..3ae13e3a9bdd2a1cb2fd237874b924a6641cf7fc 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 ac4ce59d0180b1a9844d7150f30fe557d6866589..fec5258dd5a08623f898aa5c3863703a5315114a 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 c0dd725344828920f0ad5cbd68ba8903d5bc56c3..dc97d482e5c5aec5c3a44e1b9e7543e1ba823f2f 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 7d837a0de0c076d26fa53defc82f786da3bf4a9d..030109d198efea2a9f3e1cf3485b1c8a6b75b949 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 cb8f5d2f2b2d7feb2853ac0be43e4d700ff79b20..4dfe4ee2b560790ab5ce426ed228e749b1a94114 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 b03ae0e9f15ffe148b61cb11d1c000ce5e3cf7b4..65dc52f2e13bdc701efe209c70e4e39c9e252f16 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 914f8e98ebbca7021980fdb07e339fb6f341e0f8..23e64c46b129dfa9503c0940eeaf8f5f374b2602 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 33beac495b50aa6012e0175c202e90efbecc250e..e1090ef15518f3d157375d9010a619ffe3160dd4 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 c6e1062e2f6edd94d4372f73ac33cd9002e071e5..cd93a4d9e2d5d9973ff946b07ed93e5556d8558d 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 9a0ef6c4899307799b3cdbdd8100039c73d80fbc..039d43f3f44769c53f17b490584b89c9d9872533 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 01173b21ad27c586560105c6083e30c6ea026c36..308da7bc4a2bd6e133334837d17b622c5465ea92 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 f91ad155fe28de040f3147475fb5d1116dc21b8e..1b27c23626800f302dabf64a031436c6278276fe 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 59a7d82e57c92a094f5b49aeb9ecbe97f89315dd..c4981a7930ec92c8ec84b6e1a9ef7e2ac1286943 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 31c0eeccb60460763804c773825e50572dd31897..03cbaac71c2de56a9d1d0cd9e63cc5f0da4a8a91 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 e091e77be3ecff310176a97402d92bf6ed7db813..9ec6cf862803ee8027a1a5c8633037c1031eb944 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" )