diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/share/preInclude.SLHC_Rec.py b/InnerDetector/InDetExample/InDetSLHC_Example/share/preInclude.SLHC_Rec.py
index 9e5473d41bf1e043845c43caacad9bf99645746e..3acc9797f2e6eddbb060f6059a6d12a2b9a63081 100644
--- a/InnerDetector/InDetExample/InDetSLHC_Example/share/preInclude.SLHC_Rec.py
+++ b/InnerDetector/InDetExample/InDetSLHC_Example/share/preInclude.SLHC_Rec.py
@@ -15,8 +15,7 @@ if rec.doWriteESD() or rec.doWriteAOD() or ('doWriteESD' in dir() and doWriteESD
# --- turn off trigger
#rec.doTrigger = False
from TriggerJobOpts.TriggerFlags import TriggerFlags
- TriggerFlags.doLVL2.set_Value_and_Lock(False)
- TriggerFlags.doEF.set_Value_and_Lock(False)
+ TriggerFlags.doHLT.set_Value_and_Lock(False)
# --- this is the SLHC
InDetFlags.doSLHC = True
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/EFInDetConfig.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/EFInDetConfig.py
index 24ad50ac90c992592e78c4d2c2f1a4b58c33cec7..e880f6c9e9b3a4ca4bdfe5d0f0089530c0d40ebd 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/EFInDetConfig.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/EFInDetConfig.py
@@ -282,7 +282,7 @@ class TrigEFIDSequence(TrigInDetSequenceBase):
# modify the sequence acoording to triggerflags
from TriggerJobOpts.TriggerFlags import TriggerFlags
- if not ( TriggerFlags.doEF() or TriggerFlags.doHLT() ) or not TriggerFlags.doFEX():
+ if not TriggerFlags.doHLT() or not TriggerFlags.doFEX():
from TrigSteeringTest.TrigSteeringTestConf import PESA__dummyAlgo as dummyAlgo_disabledByTriggerFlags_EFID
dummyAlgEFID = dummyAlgo_disabledByTriggerFlags_EFID("doEF_or_doFEX_False_no_EFID")
alglist = '[dummyAlgEFID]'
diff --git a/LArCalorimeter/LArCafJobs/share/skeleton.LArNoise_fromraw.py b/LArCalorimeter/LArCafJobs/share/skeleton.LArNoise_fromraw.py
index 6ed2b834009b25b3fe73064c08c6ded38454f538..360b07a9a47bc51712c100d67af7d9a704e814ac 100644
--- a/LArCalorimeter/LArCafJobs/share/skeleton.LArNoise_fromraw.py
+++ b/LArCalorimeter/LArCafJobs/share/skeleton.LArNoise_fromraw.py
@@ -217,10 +217,8 @@ if hasattr(runArgs,"outputNTUP_LARNOISEFile") or hasattr(runArgs,"outputNTUP_HEC
from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
tf.readBS.set_Value_and_Lock(True)
tf.doLVL1.set_Value_and_Lock(False)
- tf.doLVL2.set_Value_and_Lock(False)
- tf.doEF.set_Value_and_Lock(False)
+ tf.doHLT.set_Value_and_Lock(False)
tf.doL1Topo.set_Value_and_Lock(False)
- tf.readLVL1Calo.set_Value_and_Lock(True)
tf.enableMonitoring.set_Value_and_Lock(False)
tf.doID.set_Value_and_Lock(False)
tf.doMuon.set_Value_and_Lock(False)
diff --git a/LArCalorimeter/LArMonitoring/share/LArReco_fromraw.py b/LArCalorimeter/LArMonitoring/share/LArReco_fromraw.py
index d118853fe8d52eb3f0fbb67dc068f0ed48efcc82..e375c697c79c6b8baeed3f997cda47754194b666 100644
--- a/LArCalorimeter/LArMonitoring/share/LArReco_fromraw.py
+++ b/LArCalorimeter/LArMonitoring/share/LArReco_fromraw.py
@@ -157,10 +157,8 @@ include("LArCellRec/LArCollisionTime_jobOptions.py")
from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
tf.readBS.set_Value_and_Lock(True)
tf.doLVL1.set_Value_and_Lock(False)
-tf.doLVL2.set_Value_and_Lock(False)
-tf.doEF.set_Value_and_Lock(False)
+tf.doHLT.set_Value_and_Lock(False)
tf.doL1Topo.set_Value_and_Lock(False)
-tf.readLVL1Calo.set_Value_and_Lock(True)
tf.enableMonitoring.set_Value_and_Lock(False)
tf.doID.set_Value_and_Lock(False)
tf.doMuon.set_Value_and_Lock(False)
diff --git a/PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker/python/TrigConfMetadata.py b/PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker/python/TrigConfMetadata.py
index bbc000a87c1d9ff80cc5c9ed824d56929457266c..26b66437fe4413c4a6cf9efea6f7316508ae9792 100644
--- a/PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker/python/TrigConfMetadata.py
+++ b/PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker/python/TrigConfMetadata.py
@@ -1,6 +1,5 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-# $Id: TrigConfMetadata.py 618376 2014-09-24 15:33:35Z tamartin $
#
# This module holds the code that should be used to add trigger configuration
# metadata to the D3PD.
@@ -74,10 +73,8 @@ def addTrigConfMetadata( d3pdalg = None, useTrigConfEventSummaries = False, doCo
else:
logger.info( "TrigConfMetadataTool will use TriggerFlags flags for config" )
from TriggerJobOpts.TriggerFlags import TriggerFlags
- if TriggerFlags.doHLT() and not (TriggerFlags.doEF() or TriggerFlags.doLVL2()):
+ if TriggerFlags.doHLT():
_trigConfTool.keyConfig = "HLT_TrigMonConfigCollection_OPI_HLT_monitoring_config"
- elif TriggerFlags.doEF() or TriggerFlags.doLVL2():
- _trigConfTool.keyConfig = "HLT_TrigMonConfigCollection_OPI_EF_monitoring_config"
logger.info( "TrigConfMetadataTool will use the StoreGate key " + _trigConfTool.keyConfig )
d3pdalg.MetadataTools += [ _trigConfTool ]
else:
diff --git a/Simulation/FastShower/FastCaloSim/share/FastCaloSimFromTruthWithTrigT1Calo.py b/Simulation/FastShower/FastCaloSim/share/FastCaloSimFromTruthWithTrigT1Calo.py
index cadae1f573992a8478b65ab7bea30487d3c94ec2..49bd812c5fa71185494cb358cbc1c466de60d3f1 100755
--- a/Simulation/FastShower/FastCaloSim/share/FastCaloSimFromTruthWithTrigT1Calo.py
+++ b/Simulation/FastShower/FastCaloSim/share/FastCaloSimFromTruthWithTrigT1Calo.py
@@ -75,8 +75,7 @@ TriggerFlags.doID = False
TriggerFlags.doCalo = True
TriggerFlags.doMuon = False
-TriggerFlags.doLVL2 = False
-TriggerFlags.doEF = False
+TriggerFlags.doHLT = False
# if needed to configure AOD building
diff --git a/Simulation/FastShower/FastCaloSim/share/FastCaloSimFromTruthv13WithTrigT1Calo.py b/Simulation/FastShower/FastCaloSim/share/FastCaloSimFromTruthv13WithTrigT1Calo.py
index 827ad87d181af6654468a3603d9580e52f182685..579a5225311d786107801fe5c26fffc7d91a347d 100755
--- a/Simulation/FastShower/FastCaloSim/share/FastCaloSimFromTruthv13WithTrigT1Calo.py
+++ b/Simulation/FastShower/FastCaloSim/share/FastCaloSimFromTruthv13WithTrigT1Calo.py
@@ -33,7 +33,6 @@ TriggerFlags.doID = False
TriggerFlags.doCalo = True
TriggerFlags.doMuon = False
-TriggerFlags.doLVL2 = False
-TriggerFlags.doEF = False
+TriggerFlags.doHLT = False
include ( "FastCaloSim/FastCaloSimFromTruthv13.py" )
diff --git a/Simulation/FastShower/FastCaloSim/share/FastCaloSimFromTruthv14WithTrigT1Calo.py b/Simulation/FastShower/FastCaloSim/share/FastCaloSimFromTruthv14WithTrigT1Calo.py
index 48a86649efec57af63144a4769b0497b5d1b16e7..758e4c5c05b48c7acfa54d52e252035d0304fc23 100644
--- a/Simulation/FastShower/FastCaloSim/share/FastCaloSimFromTruthv14WithTrigT1Calo.py
+++ b/Simulation/FastShower/FastCaloSim/share/FastCaloSimFromTruthv14WithTrigT1Calo.py
@@ -33,7 +33,6 @@ TriggerFlags.doID = False
TriggerFlags.doCalo = True
TriggerFlags.doMuon = False
-TriggerFlags.doLVL2 = False
-TriggerFlags.doEF = False
+TriggerFlags.doHLT = False
include ( "FastCaloSim/FastCaloSimFromTruthv14.py" )
diff --git a/Trigger/TrigAlgorithms/TrigMuSuperEF/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigMuSuperEF/CMakeLists.txt
index e7469ef16b51e36afe08b1cdb7cf15db35908fcf..78eb5422cf181c05454ae8f89cd99d90d0c12358 100644
--- a/Trigger/TrigAlgorithms/TrigMuSuperEF/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigMuSuperEF/CMakeLists.txt
@@ -11,5 +11,3 @@ atlas_add_component( TrigMuSuperEF
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
-atlas_install_joboptions( share/test_TrigMuSuperEF.py share/TrigMuSuperEF_debug_postOptions.py )
-
diff --git a/Trigger/TrigAlgorithms/TrigMuSuperEF/share/TrigMuSuperEF_debug_postOptions.py b/Trigger/TrigAlgorithms/TrigMuSuperEF/share/TrigMuSuperEF_debug_postOptions.py
deleted file mode 100644
index 1341e653f2f212d992f934ad86d9152c134c17a3..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigMuSuperEF/share/TrigMuSuperEF_debug_postOptions.py
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# JobOptions for setting some output levels in Muon HLT Trigger Algorithms
-# Available output level variables to tune the levels:
-# ConfigOutputLevel
-# L2OutputLvl for muFast and muComb
-# TMEFOutputLvl for TrigMuonEF algorithms
-# TMEFSummary for TrigMuonEF algorithms printing summary per event per stage
-# MGOutputLvl for TrigMuGirl algorithms
-#
-
-from AthenaCommon.Logging import logging
-
-# a few default OUTPUT levels depending on the number of events processing
-log = logging.getLogger()
-defaultOutputLvl = log.mapLevelLoggingToGaudi(log.getEffectiveLevel())
-
-if athenaCommonFlags.EvtMax() == -1 or athenaCommonFlags.EvtMax() > 1000:
- if "ConfigOutputLevel" not in dir(): ConfigOutputLevel = defaultOutputLvl
- if "L2OutputLvl" not in dir(): L2OutputLvl = defaultOutputLvl
- if "TMEFOutputLvl" not in dir(): TMEFOutputLvl = defaultOutputLvl
- if "MGOutputLvl" not in dir(): MGOutputLvl = defaultOutputLvl
- if "TMEFSummary" not in dir(): TMEFSummary = False
-
-elif athenaCommonFlags.EvtMax() > 100:
- if "ConfigOutputLevel" not in dir(): ConfigOutputLevel = VERBOSE
- if "L2OutputLvl" not in dir(): L2OutputLvl = INFO
- if "TMEFOutputLvl" not in dir(): TMEFOutputLvl = DEBUG
- if "MGOutputLvl" not in dir(): MGOutputLvl = DEBUG
- if "TMEFSummary" not in dir(): TMEFSummary = True
-else: # <= 100 events
- if "ConfigOutputLevel" not in dir(): ConfigOutputLevel = VERBOSE
- if "L2OutputLvl" not in dir(): L2OutputLvl = INFO
- if "TMEFOutputLvl" not in dir(): TMEFOutputLvl = VERBOSE
- if "MGOutputLvl" not in dir(): MGOutputLvl = VERBOSE
- if "TMEFSummary" not in dir(): TMEFSummary = True
-
-
-# helper function for nice OutputLevel setting printout
-OutputLevelNames = {}
-OutputLevelNames[ALL] = "ALL"
-OutputLevelNames[VERBOSE]="VERBOSE"
-OutputLevelNames[DEBUG]="DEBUG"
-OutputLevelNames[INFO]="INFO"
-OutputLevelNames[WARNING]="WARNING"
-OutputLevelNames[ERROR]="ERROR"
-OutputLevelNames[FATAL]="FATAL"
-
-def setOutputLevel(conf,level):
- print "Setting %s.OutputLevel = %s" % (conf.getJobOptName(),OutputLevelNames[level])
- conf.OutputLevel = level
-
-
-MessageSvc.debugLimit = 10000
-MessageSvc.Format = "% F%65W%S%7W%R%T %0W%M"
-
-try:
- L2_sequence = topSequence.TrigSteer_HLT.getChildren()
-except AttributeError:
- try:
- L2_sequence = topSequence.TrigSteer_L2.getChildren()
- except AttributeError:
- L2_sequence = []
-
-################################################################################
-# L2 tweeking
-################################################################################
-for L2_alg in L2_sequence:
- algType = L2_alg.getType()
-
- # set output levels
- if algType.startswith("Mufast") or algType.startswith("Mucomb"):
- setOutputLevel(L2_alg,L2OutputLvl)
-
-
-################################################################################
-# EF tweeking
-################################################################################
-try:
- EF_sequence = topSequence.TrigSteer_HLT.getChildren()
-except AttributeError:
- try:
- EF_sequence = topSequence.TrigSteer_EF.getChildren()
- except AttributeError:
- EF_sequence = []
-
-#
-# here we add the algorithm used for debugging TrigMuSuperEF
-#
-for EF_alg in EF_sequence:
- algType = EF_alg.getType()
-
- # set output levels
- if algType.startswith('TrigMuonEF'):
- setOutputLevel(EF_alg,TMEFOutputLvl)
- elif algType.startswith('TrigMuGirl'):
- setOutputLevel(EF_alg,MGOutputLvl)
- elif algType.startswith('TrigMuSuperEF'):
- setOutputLevel(EF_alg,min(MGOutputLvl,TMEFOutputLvl))
- elif algType.startswith('TrigCaloClusterMaker'):
- setOutputLevel(EF_alg,INFO)
-
- TMEF_SegmentFinder = None
- TMEF_TrackBuilder = None
- TMEF_Extrapolator = None
- TMEF_Combiner = None
- TMEF_CombinerHypo = None
- TMEF_Isolation = None
- TMEF_IsolationHypo = None
- TrigMuGirl = None
- TrigMuGirlHypo = None
-
-
- if algType == 'TrigMuSuperEF':
- TMEF_SegmentFinder = getattr(ToolSvc,EF_alg.TMEF_standaloneTrackTool.getName())
- TMEF_TrackBuilder = getattr(ToolSvc,EF_alg.TMEF_standaloneTrackTool.getName())
- TMEF_Extrapolator = getattr(ToolSvc,EF_alg.TMEF_standaloneTrackTool.getName())
- TMEF_Combiner = getattr(ToolSvc,EF_alg.TMEF_combinerTool.getName())
- TrigMuGirl = getattr(ToolSvc,EF_alg.TrigMuGirlTool.getName())
- elif algType == 'TrigMuonEFSegmentFinder':
- TMEF_SegmentFinder = EF_alg
- elif algType == 'TrigMuonEFTrackBuilder':
- TMEF_TrackBuilder = EF_alg
- elif algType == 'TrigMuonEFExtrapolator':
- TMEF_Extrapolator = EF_alg
- elif algType == 'TrigMuonEFCombiner':
- TMEF_Combiner = EF_alg
- elif algType == 'TrigMuGirl':
- TrigMuGirl = EF_alg
- else:
- continue
-
- # set some properties
- if TMEF_SegmentFinder is not None:
- setOutputLevel(TMEF_SegmentFinder,TMEFOutputLvl)
- # activate summaries for offline tools (or not)
- TMEF_SegmentFinder.SegmentsFinderTool.DoSummary = TMEFSummary
-
-
- if TMEF_TrackBuilder is not None:
- setOutputLevel(TMEF_TrackBuilder,TMEFOutputLvl)
- # activate summaries for offline tools (or not)
- TMEF_TrackBuilder.TrackBuilderTool.DoSummary = TMEFSummary
-
- if TMEF_Extrapolator is not None:
- setOutputLevel(TMEF_Extrapolator,TMEFOutputLvl)
-
- if TMEF_Combiner is not None:
- setOutputLevel(TMEF_Combiner,TMEFOutputLvl)
-
- if TrigMuGirl is not None:
- setOutputLevel(TrigMuGirl,MGOutputLvl)
-
-
-# less output on some algs
-# only way to shut up CTPSimulation
-from TriggerJobOpts import Lvl1TriggerGetter
-Lvl1TriggerGetter.Lvl1OutputLevel = defaultOutputLvl
-try:
- topSequence.CTPSimulation.OutputLevel = defaultOutputLvl
-except AttributeError:
- pass
-
-if ConfigOutputLevel <= DEBUG:
- from AthenaCommon import CfgGetter
- CfgGetter.printStats()
-
-from AthenaCommon.ConfigurationShelve import saveToAscii
-from MuonRecExample.MuonRecUtils import dumpDetFlags
-saveToAscii("config.txt")
-dumpDetFlags("config.txt")
-
diff --git a/Trigger/TrigAlgorithms/TrigMuSuperEF/share/test_TrigMuSuperEF.py b/Trigger/TrigAlgorithms/TrigMuSuperEF/share/test_TrigMuSuperEF.py
deleted file mode 100755
index 4c9b99cb9caf864f1ff54a3056bfc9a2a80ef223..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigMuSuperEF/share/test_TrigMuSuperEF.py
+++ /dev/null
@@ -1,535 +0,0 @@
-#
-# steering file for testing muon trigger slice with offline supertools
-#
-from RecExConfig.RecFlags import rec
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-from AthenaCommon.GlobalFlags import globalflags
-from AthenaCommon.CfgGetter import getAlgorithm
-from AthenaCommon.Logging import logging
-
-from TriggerJobOpts.TriggerFlags import TriggerFlags
-
-from PerfMonComps import PerfMonFlags
-
-from MuonRecExample.MuonRecFlags import muonRecFlags
-from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
-
-include("TriggerTest/TrigScanFiles.py")
-
-
-if 'doOldChains' not in dir():
- doOldChains=True
-
-if 'doNewChains' not in dir():
- doNewChains=True
-
-if 'doIsolation' not in dir():
- doIsolation=True
-
-if 'doOffline' not in dir():
- doOffline=True
-
-if 'makeESD' not in dir():
- makeESD=True
-
-if 'makeAOD' not in dir():
- makeAOD=False
-
-if 'doMuonCombined' not in dir():
- doMuonCombined=True
-
-if 'doTrackPerformance' not in dir():
- doTrackPerformance=False
-
-# if 'doMuonSA' not in dir():
-# doMuonSA=False
-
-# if 'doMuonSA_only' not in dir():
-# doMuonSA_only=False
-
-if 'v4Menus' not in dir():
- v4Menus=True
-
-if 'v4MenuValidation' not in dir():
- v4MenuValidation = False
-
-if 'EvtMax' not in dir():
- athenaCommonFlags.EvtMax = 1
-else:
- athenaCommonFlags.EvtMax = EvtMax
- del EvtMax # no longer needed and gives WARNING or ERROR from RecExCommon
-
-if 'Input' not in dir():
- Input='T1'
-
-
-# a few specific OUTPUT levels
-if athenaCommonFlags.EvtMax() <= 100:
- ConfigOutputLevel = VERBOSE
- L2OutputLvl = INFO
- EFOutputLvl = VERBOSE
- TMEFOutputLvl = VERBOSE
- MGOutputLvl = VERBOSE
-elif athenaCommonFlags.EvtMax() <= 1000:
- ConfigOutputLevel = VERBOSE
- L2OutputLvl = INFO
- EFOutputLvl = VERBOSE
- TMEFOutputLvl = DEBUG
- MGOutputLvl = DEBUG
-else:
- ConfigOutputLevel = INFO
- L2OutputLvl = INFO
- EFOutputLvl = INFO
- TMEFOutputLvl = INFO
- MGOutputLvl = INFO
-
-
-#athenaCommonFlags.FilesInput = getEOSDirectoryList( "/eos/atlas/atlasgroupdisk/trig-daq/validation/test_data/EnhancedBias10TeV15315m31.digit.RDO.e357_s462_d148_t93a97/", [1,20] )
-
-#athenaCommonFlags.FilesInput = [ "root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data11_7TeV.00191628.physics_eb_zee_zmumu._0001.data" ]
-
-if Input=='Zmumu':
- athenaCommonFlags.FilesInput = getEOSDirectoryList( "/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/mc10_7TeV.106047.PythiaZmumu_no_filter.digit.RDO.e574_s1021_d423_tid211907_00", [1,20] )
-elif Input == "T1":
- athenaCommonFlags.FilesInput = getEOSDirectoryList( "/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/mc10_7TeV.105200.T1_McAtNlo_Jimmy.digit.RDO.e598_s933_s946_d366_tid197091_00", [1,20] )
-elif Input != "user":
- raise RuntimeError("Unknown input data: %r" % Input)
-else:
- # assumes user has set athenaCommonFlags.FilesInput
- pass
-
-# do trigger
-rec.doTrigger.set_Value_and_Lock(True)
-TriggerFlags.doLVL1.set_Value_and_Lock(True)
-TriggerFlags.doLVL2.set_Value_and_Lock(True)
-TriggerFlags.doEF.set_Value_and_Lock(True)
-rec.doESD = True
-
-# detector flags
-rec.doMuon = True
-rec.doInDet = True
-rec.doCalo = True
-rec.doLArg = True
-rec.doTile = True
-rec.doLucid = True
-
-rec.doNameAuditor = True
-
-muonRecFlags.doMuonboy = True
-muonRecFlags.doStandalone = False
-muonRecFlags.doMoore = True
-
-muonRecFlags.Enabled = doOffline
-
-muonCombinedRecFlags.doMuidMuonCollection = True
-muonCombinedRecFlags.doStacoMuonCollection = False
-muonCombinedRecFlags.doMuonCollection = False
-muonCombinedRecFlags.doCaloMuonCollection = False
-
-muonCombinedRecFlags.Enabled = doOffline
-
-# muon flags
-# from MuonRecExample.MuonRecFlags import muonRecFlags
-# muonRecFlags.doStandalone = True
-
-#from MuonRecExample.MuonStandaloneFlags import muonStandaloneFlags
-#muonStandaloneFlags.trackBuilder = 'Moore'
-
-#from TrigMuonSuperEF.TrigMuonFlags import trigMuonFlags
-#trigMuonFlags.doStandalone = True
-#trigMuonFlags.trackBuilder = 'Moore'
-
-
-# input/output
-rec.readESD = False
-rec.doWriteESD = makeESD
-rec.doCBNT = False
-rec.doWriteAOD = makeAOD
-rec.doWriteTAG = False
-rec.doWriteBS = False
-
-if not doOffline: doMuonCombined = False
-
-# don't do unnecessary stuff
-rec.doMuonCombined = doMuonCombined
-rec.doAOD = makeAOD
-rec.doAODall = False
-rec.doJiveXML = False
-
-# physics flags
-rec.doHeavyIon = False
-rec.doEgamma = False
-rec.doTau = False
-rec.doJetMissingETTag = False
-
-# monitoring/auditing
-rec.doPerfMon = False
-rec.doDetailedPerfMon = False
-rec.doSemiDetailedPerfMon = False
-rec.doMonitoring = False
-rec.doFastPhysMonitoring = False
-rec.doDetailedAuditor = False
-rec.doSGAuditor = False
-
-# algorithms
-from RecExConfig.RecAlgsFlags import recAlgs
-recAlgs.doTrigger = True
-recAlgs.doTrackRecordFilter = True # filter truth muons getting into the spectrometer
-recAlgs.doMissingET = False
-recAlgs.doMissingETSig = False
-recAlgs.doObjMissingET = False
-recAlgs.doEFlow = False
-recAlgs.doEFlowJet = False
-recAlgs.doAtlfast = False
-recAlgs.doMuonSpShower = False
-recAlgs.doTileMuID = False
-recAlgs.doMuTag = False
-recAlgs.doCaloTrkMuId = False
-recAlgs.doEgammaBremReco = False
-recAlgs.doAtlfast = False
-
-from CaloRec.CaloRecFlags import jobproperties
-jobproperties.CaloRecFlags.Enabled=doMuonCombined
-
-from InDetRecExample.InDetJobProperties import InDetFlags
-jobproperties.InDetJobProperties.disableInDetReco=not doMuonCombined
-
-from MuonRecExample.MuonRecFlags import muonRecFlags
-jobproperties.MuonRec.Enabled=doMuonCombined
-
-from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
-jobproperties.MuonCombinedRec.Enabled=doMuonCombined
-
-from MuonCombinedRecExample.MuidFlags import muidFlags
-jobproperties.Muid.Enabled=doMuonCombined
-
-from egammaRec.egammaRecFlags import jobproperties
-jobproperties.egammaRecFlags.Enabled=False
-
-from JetRec.JetRecFlags import jobproperties
-jobproperties.JetRecFlags.Enabled=False
-
-from tauRec.tauRecFlags import jobproperties
-jobproperties.tauRecFlags.Enabled=False
-
-# disable JetRec (no RecFlags flag for that)
-try:
- from JetRec.JetRecFlags import jetFlags
- jetFlags.Enabled = False
-except ImportError:
- pass
-
-# bug in RecExCond does not pass rec.doTau()
-try:
- from tauRec.tauRecFlags import jobproperties
- jobproperties.tauRecFlags.Enabled = rec.doTau()
-except ImportError:
- pass
-
-
-if ConfigOutputLevel <= DEBUG:
- from AthenaCommon import CfgGetter
- CfgGetter.setLogLevel(ConfigOutputLevel)
-
-
-def MuonOnly():
- global TriggerFlags,doOldChains,doNewChains,doIsolation,v4Menus
- from TriggerMenuPython.StreamingSliceFlags import StreamingSliceFlags # not included in TriggerFlags
- TriggerFlags.Slices_all_setOff()
- TriggerFlags.MuonSlice.setAll()
-
- from AthenaCommon.JobProperties import JobPropertyContainer
- for prop in TriggerFlags.__dict__.values():
- if isinstance( prop, JobPropertyContainer ) and prop.__name__ != 'MuonSlice':
- try:
- prop.signatures = []
- except AttributeError:
- pass
-
-
- Muons = []
-
- if v4Menus:
- if v4MenuValidation:
- # only use a matching sub-set, so the monitoring histograms can be used for validation
- # if not doMuonSA_only:
- # Muons += [ 'mu24_tight', 'mu24_tight_MuonEF', 'mu24_tight_MG' ]
- # if doIsolation:
- # Muons += [ 'mu24i_tight', 'mu24i_tight_MuonEF', 'mu24i_tight_MG']
- # if doMuonSA and doIsolation:
- # Muons += [ 'mu24i_tight_newMuonSA' ]
-
- #Muons += [ 'mu24_tight', 'mu24_tight_MuonEF', 'mu24_tight_MG' ]
- if doIsolation:
- Muons += [ 'mu24i_tight' ]#, 'mu24i_tight_MuonEF', 'mu24i_tight_MG']
-
- TriggerFlags.MuonSlice.signatures = Muons
- else: # full v4 Menu for Muon
- if not doOldChains:
- Muons = [ m for m in TriggerFlags.MuonSlice.signatures() if not m.endswith('_MuonEF') and not m.endswith('_MG') ]
- TriggerFlags.MuonSlice.signatures = Muons
- pass
-
- return
-
-
- # v3 menus
- if doNewChains:
- # TrigMuSuperEF chains
- Muons += [
-
- # 'mu18_OR_medium',
-
- # special versions for performance comparison
- 'mu18_OR_medium_MGfirst',
- 'mu18_OR_medium_TMEFfirst',
- 'mu18_OR_medium_both',
-
- # special versions for validation
- 'mu18_OR_medium_MGonly',
- 'mu18_OR_medium_TMEFonly',
- ]
-
- if doIsolation:
- Muons += [
-
- # isolation chains
- # 'mu18i1_OR_medium',
- # 'mu18i2_OR_medium',
- # 'mu18i3_OR_medium',
- # 'mu18i4_OR_medium',
- # 'mu24i1_OR_tight',
- # 'mu24i2_OR_tight',
- # 'mu24i3_OR_tight',
- # 'mu24i4_OR_tight',
- # 'mu24i5_OR_tight',
-
- # special versions for performance comparison
- 'mu24i5_OR_tight_MGfirst',
- 'mu24i5_OR_tight_TMEFfirst',
- 'mu24i5_OR_tight_both',
-
- # special versions for validation
- # 'mu24i1_OR_tight_TMEFonly',
- # 'mu24i2_OR_tight_TMEFonly',
- # 'mu24i3_OR_tight_TMEFonly',
- # 'mu24i4_OR_tight_TMEFonly',
- 'mu24i5_OR_tight_TMEFonly',
- 'mu24i5_OR_tight_MGonly',
-
- ]
-
- if doOldChains:
- # MuGirl chains
- Muons += [
- 'mu18_MG_medium',
- ]
-
- # TrigMuonEF chains
- Muons += [
- # non-isolation chains
- 'mu18_medium',
- ]
-
- if doIsolation:
- Muons += [
- # isolation chains
- 'mu24i5_tight',
- ]
-
-
- TriggerFlags.MuonSlice.signatures = Muons
-
-
-
-
-# to get fast error feedback
-MuonOnly()
-
-
-try:
- #-----------------------------------------------------------
- include("RecExCond/RecExCommon_flags.py")
- #-----------------------------------------------------------
-
-
- # from testMuonAthenaTrigRDO.py
- # set up trigger monitoring
- TriggerFlags.enableMonitoring = [ 'Validation', 'Time', 'Log' ]
-
- # set trigger menu
- TriggerFlags.readHLTconfigFromXML=False
- TriggerFlags.readLVL1configFromXML=False
- if v4Menus:
- TriggerFlags.triggerMenuSetup = 'MC_pp_v4'
- else:
- TriggerFlags.triggerMenuSetup = 'MC_pp_v3'
- TriggerFlags.L1PrescaleSet = 'None'
- TriggerFlags.HLTPrescaleSet = 'None'
- TriggerFlags.useL1CaloCalibration = True
-
- logging.getLogger("TriggerMenuPython.MuonDef").setLevel(ConfigOutputLevel)
-
- # enable only Muon slice
- from TriggerMenuPython.GenerateMenu import GenerateMenu
- GenerateMenu.overwriteSignaturesWith(MuonOnly)
-
- # main jobOption
- include ("RecExCommon/RecExCommon_topOptions.py")
-
- include("TriggerTest/TriggerTestCommon.py")
-
- print "printing topSequence: "
- print topSequence
-
- ################################################################################
- # L2 tweeking
- ################################################################################
- for L2_alg in topSequence.TrigSteer_L2.getChildren():
- algType = L2_alg.getType()
-
- # special setting for some algs
- if algType == "muFast":
- L2_alg.MUlvl1INFO = False
- L2_alg.MUtrackINFO = False
- L2_alg.MUroadsINFO = False
- L2_alg.MUdecoINFO = False
- L2_alg.MUcontINFO = False
- L2_alg.MUfitINFO = False
- L2_alg.MUsagINFO = False
- L2_alg.MUptINFO = True
- L2_alg.TestString = L2_alg.getName()+" REGTEST "
-
-
- ################################################################################
- # EF tweeking
- ################################################################################
- TrigSteer_EF = topSequence.TrigSteer_EF
-
- #
- # here we add the algorithm used for debugging TrigMuSuperEF
- #
- for EF_alg in TrigSteer_EF.getChildren():
- algType = EF_alg.getType()
-
- TMEF_SegmentFinder = None
- TMEF_TrackBuilder = None
- TMEF_Extrapolator = None
- TMEF_Combiner = None
- TMEF_CombinerHypo = None
- TMEF_Isolation = None
- TMEF_IsolationHypo = None
- TrigMuGirl = None
- TrigMuGirlHypo = None
-
- if algType == 'TrigMuSuperEF':
- TMEF_SegmentFinder = EF_alg
- TMEF_TrackBuilder = EF_alg
- elif algType == 'TrigMuonEFSegmentFinder':
- TMEF_SegmentFinder = EF_alg
- elif algType == 'TrigMuonEFTrackBuilder':
- TMEF_TrackBuilder = EF_alg
- elif algType == 'TrigMuonEFExtrapolator':
- TMEF_Extrapolator = EF_alg
- elif algType == 'TrigMuonEFCombiner':
- TMEF_Combiner = EF_alg
- elif algType == 'TrigMuGirl':
- TrigMuGirl = EF_alg
- else:
- continue
-
- # set some properties
- if TMEF_SegmentFinder is not None:
- TMEF_SegmentFinder.recordSegmentCombinations = False
- TMEF_SegmentFinder.recordPatternCombinations = False
-
-
- # if TMEF_TrackBuilder is not None:
- # for debug purposes write TrackCollection in StoreGate and use MuonTrackPerformanceAlg
- # if doTrackPerformance:
- # TMEF_TrackBuilder.recordTrackCollection = True
-
- if doTrackPerformance:
- from MuonTrackPerformance.MuonTrackPerformanceConf import MuonTrackPerformanceAlg
- topSequence += MuonTrackPerformanceAlg("MuonTrackPerformanceAlg",
- TrackInputLocation = "TrigMuonEFTBTracks",
- SegmentCombitLocation = "TrigMuonEFSegments" )
- topSequence.MuonTrackPerformanceAlg.DoSummary = 1
- topSequence.MuonTrackPerformanceAlg.DoTrackDebug = 5
-
-
- include("TrigMuSuperEF/TrigMuSuperEF_debug_postOptions.py")
-
-
- if makeESD:
- # Remove the following outputs defined in
- # MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRecOutputItemList_jobOptions.py.
- # To fix bug #79056: ERROR INCORRECT Object/count: Muon PRDs
-
- from AthenaCommon.AppMgr import theApp
- StreamESD = theApp.getOutputStream( "StreamESD" )
-
- while "Muon::CscPrepDataContainer#CSC_Clusters" in StreamESD.ItemList:
- StreamESD.ItemList.remove("Muon::CscPrepDataContainer#CSC_Clusters")
- while "Muon::CscPrepDataContainer#CSC_Clusters" in StreamESD.ItemList:
- StreamESD.ItemList.remove("Muon::CscPrepDataContainer#CSC_Clusters")
- while "Muon::CscPrepDataContainer#CSC_Clusters" in StreamESD.ItemList:
- StreamESD.ItemList.remove("Muon::CscPrepDataContainer#CSC_Clusters")
- while "Muon::CscStripPrepDataContainer#CSC_Measurements" in StreamESD.ItemList:
- StreamESD.ItemList.remove("Muon::CscStripPrepDataContainer#CSC_Measurements")
- while "Muon::RpcPrepDataContainer#RPC_Measurements" in StreamESD.ItemList:
- StreamESD.ItemList.remove("Muon::RpcPrepDataContainer#RPC_Measurements")
- while "Muon::TgcPrepDataContainer#TGC_Measurements" in StreamESD.ItemList:
- StreamESD.ItemList.remove("Muon::TgcPrepDataContainer#TGC_Measurements")
- while "Muon::MdtPrepDataContainer#MDT_DriftCircles" in StreamESD.ItemList:
- StreamESD.ItemList.remove("Muon::MdtPrepDataContainer#MDT_DriftCircles")
-
- while "Muon::TgcPrepDataContainer#TGC_MeasurementsPriorBC" in StreamESD.ItemList:
- StreamESD.ItemList.remove("Muon::TgcPrepDataContainer#TGC_MeasurementsPriorBC")
- while "Muon::TgcPrepDataContainer#TGC_MeasurementsNextBC" in StreamESD.ItemList:
- StreamESD.ItemList.remove("Muon::TgcPrepDataContainer#TGC_MeasurementsNextBC")
-
- while "Muon::TgcCoinDataContainer#TrigT1CoinDataCollection" in StreamESD.ItemList:
- StreamESD.ItemList.remove("Muon::TgcCoinDataContainer#TrigT1CoinDataCollection")
- while "Muon::TgcCoinDataContainer#TrigT1CoinDataCollectionPriorBC" in StreamESD.ItemList:
- StreamESD.ItemList.remove("Muon::TgcCoinDataContainer#TrigT1CoinDataCollectionPriorBC")
- while "Muon::TgcCoinDataContainer#TrigT1CoinDataCollectionNextBC" in StreamESD.ItemList:
- StreamESD.ItemList.remove("Muon::TgcCoinDataContainer#TrigT1CoinDataCollectionNextBC")
-
- while "Muon::RpcCoinDataContainer#RPC_triggerHits" in StreamESD.ItemList:
- StreamESD.ItemList.remove("Muon::RpcCoinDataContainer#RPC_triggerHits")
- while "RpcSectorLogicContainer#RPC_SECTORLOGIC" in StreamESD.ItemList:
- StreamESD.ItemList.remove("RpcSectorLogicContainer#RPC_SECTORLOGIC")
-
-except:
- # still do a few things in case of error
- if ConfigOutputLevel <= DEBUG:
- from AthenaCommon import CfgGetter
- CfgGetter.printStats()
-
- from AthenaCommon.ConfigurationShelve import saveToAscii
- from MuonRecExample.MuonRecUtils import dumpDetFlags
- saveToAscii("config.txt")
- dumpDetFlags("config.txt")
-
- print 80*"="
- print "TriggerFlags"
- print 80*"="
- print TriggerFlags
-
- raise
-
-else:
- if ConfigOutputLevel <= DEBUG:
- from AthenaCommon import CfgGetter
- CfgGetter.printStats()
-
- from AthenaCommon.ConfigurationShelve import saveToAscii
- from MuonRecExample.MuonRecUtils import dumpDetFlags
- saveToAscii("config.txt")
- dumpDetFlags("config.txt")
-
- print 80*"="
- print "TriggerFlags"
- print 80*"="
- print TriggerFlags
diff --git a/Trigger/TrigAlgorithms/TrigT2BeamSpot/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigT2BeamSpot/CMakeLists.txt
index 082eba673cd8c903f0c65156caa7c149899acdf1..ce22c00a73fea15bc07068db2fe0e838af85d5d2 100644
--- a/Trigger/TrigAlgorithms/TrigT2BeamSpot/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigT2BeamSpot/CMakeLists.txt
@@ -15,5 +15,3 @@ atlas_add_component( TrigT2BeamSpot
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
-
diff --git a/Trigger/TrigAlgorithms/TrigT2BeamSpot/share/myNewTrigger_jobOptions.py b/Trigger/TrigAlgorithms/TrigT2BeamSpot/share/myNewTrigger_jobOptions.py
deleted file mode 100644
index 83d68c2896658efc0ec80ffa7a5b802c3f21527f..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigT2BeamSpot/share/myNewTrigger_jobOptions.py
+++ /dev/null
@@ -1,226 +0,0 @@
-#----------------------------------------
-# Return a file list given a directory
-#----------------------------------------
-
-import os,commands
-def getDirectoryList(path):
- cmd = 'ls %s/' % (path)
- file = ["%s/%s" % (path,i) for i in commands.getoutput(cmd).split('\n')]
- return file
-
-def getMixedDirectoryList(path):
- cmd = 'ls %s/*.root*' % (path)
- file = ["%s" % (i) for i in commands.getoutput(cmd).split('\n')]
- return file
-
-def getCastorDirectoryList(path):
- cmd = 'nsls %s/ ' % (path)
- file = ["rfio:%s/%s" % (path,i) for i in commands.getoutput(cmd).split('\n')]
- return files
-
-#-----------------
-# Input files
-#-----------------
-if ('Data' in dir()):
- if Data == "shift":
- PoolRDOInput = getDirectoryList('/u1/fizisist/ttbar_shift')
- elif Data == "gashalo":
- PoolRDOInput = getDirectoryList('/u1/fizisist/gashalo')
- elif Data == "mixed":
- PoolRDOInput = getMixedDirectoryList('/u1/iaracena/data/MixedEventsEnhancedb/RDO')
- elif Data == "EnhancedBias":
- PoolRDOInput = getMixedDirectoryList('/u1/data/user09.SethCaughron.EnhancedBias_10TeV.digit.RDO.e357_s462_d126')
- elif Data == "J2":
- PoolRDOInput = getDirectoryList('/u1/fizisist/J2')
- elif Data == "J3":
- PoolRDOInput = getDirectoryList('/u1/data/J3_RDO_rel12')
- elif Data == "J1":
- PoolRDOInput = getDirectoryList('/u1/fizisist/J1')
- elif Data == "J4":
- PoolRDOInput = getDirectoryList('/u1/fizisist/J4')
- elif Data == "J0":
- PoolRDOInput = getDirectoryList('/u1/fizisist/J0')
-else:
- Data = "shift"
- PoolRDOInput = getDirectoryList('/u1/fizisist/ttbar_shift')
-
-#-----------------
-# Output files
-#-----------------
-PoolESDOutput = 'rfio:/castor/cern.ch/user/f/fizisist/beamspot/myTriggerTest2.mixed.ESD.pool.root'
-PoolAODOutput = 'rfio:/castor/cern.ch/user/f/fizisist/beamspot/myTriggerTest2.mixed.AOD.pool.root'
-
-if not ('EvtMax' in dir()):
- EvtMax=1000
-
-NEvents = "%d" % EvtMax
-
-#-----------------
-# Global Flags
-#-----------------
-from AthenaCommon.GlobalFlags import GlobalFlags
-GlobalFlags.Print()
-DetDescrVersion = "ATLAS-GEO-02-01-00"
-GlobalFlags.DetDescrVersion = DetDescrVersion
-
-#-----------------
-# Global Setup
-#-----------------
-doTAG = False
-doEgamma = False
-doMuon = False
-doJet = False
-doTauRec = False
-doObjMissingET = False
-doMuGirl = False
-doMoore = False
-doMuonIDStandAlone = False
-doMuonIDCombined = False
-
-doCBNT = False
-doWriteAOD = False
-doWriteESD = False
-doWriteTAG = False
-doAOD = False
-doESD = False
-doTAG = False
-doTruth = False
-doAtlfast = False
-
-#-----------------
-# Trigger Setup
-#-----------------
-doTrigger = True
-
-#-----------------------------------------------------------
-include("RecExCommon/RecExCommon_flags.py")
-#-----------------------------------------------------------
-
-#-----------------
-# InDet Flags
-#-----------------
-from InDetRecExample.InDetJobProperties import InDetFlags
-from AthenaCommon.JobProperties import jobproperties
-from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
-if Data == "gashalo":
- InDetFlags.Enabled = True
- InDetFlags.doBeamGas = True
- InDetFlags.doBeamHalo = True
- InDetFlags.doSiSPSeededTrackFinder = True
- InDetFlags.doPrintConfigurables = True
- InDetTrigFlags.doBeamGas = True
- InDetTrigFlags.doBeamHalo = True
-
-#-----------------
-# Trigger Flags
-#-----------------
-from TriggerJobOpts.TriggerFlags import TriggerFlags
-from TriggerMenuPython.BeamSpotSliceFlags import *
-BeamSpotSliceFlags.setAll()
-
-#-----------------
-# BeamSpot Menu
-#-----------------
-def MyBeamSpotMenu():
- if ('Seed' in dir()):
- if Seed == "list":
- TriggerFlags.BeamSpotSlice.signatures = [ 'beamspot_vertex_list' ]
- elif Seed == "jet10":
- TriggerFlags.BeamSpotSlice.signatures = [ 'beamspot_vertex_jet10' ]
- elif Seed == "bjet18":
- TriggerFlags.BeamSpotSlice.signatures = [ 'beamspot_vertex_bjet18' ]
- elif Seed == "FSTracks":
- TriggerFlags.BeamSpotSlice.signatures = [ 'beamspot_vertex_FSTracks' ]
- elif Seed == "tau16i_loose":
- TriggerFlags.BeamSpotSlice.signatures = [ 'beamspot_vertex_tau16i_loose' ]
- elif Seed == "e10_medium":
- TriggerFlags.BeamSpotSlice.signatures = [ 'beamspot_vertex_e10_medium' ]
- elif Seed == "e10_medium_SiTrk":
- TriggerFlags.BeamSpotSlice.signatures = [ 'beamspot_vertex_e10_medium_SiTrk' ]
- elif Seed == "e10_medium_SiTrk_robust":
- TriggerFlags.BeamSpotSlice.signatures = [ 'beamspot_vertex_e10_medium_SiTrk_robust' ]
- elif Seed == "trk9i_calib":
- TriggerFlags.BeamSpotSlice.signatures = [ 'beamspot_vertex_trk9i_calib' ]
- else:
- TriggerFlags.BeamSpotSlice.signatures = [ 'beamspot_vertex_FSTracks' ]
-
-from TriggerMenuPython.GenerateMenu import GenerateMenu
-GenerateMenu.overwriteSignaturesWith(MyBeamSpotMenu)
-
-#-----------------
-# Trigger Options
-#-----------------
-TriggerFlags.doCalo = True
-TriggerFlags.doMuon = True
-TriggerFlags.doID = True
-TriggerFlags.doLVL2 = True
-TriggerFlags.doLVL1 = True
-TriggerFlags.doEF = False
-TriggerFlags.readHLTconfigFromXML = False
-TriggerFlags.readLVL1configFromXML = False
-TriggerFlags.Slices_all_setOn()
-TriggerFlags.doNtuple = True
-TriggerFlags.enableMonitoring = [ 'Validation', 'Time', ]
-TriggerFlags.triggerMenuSetup = 'default'
-#TriggerFlags.triggerMenuSetup='Test_lumi1E31'
-TriggerFlags.abortOnConfigurationError = True
-TriggerFlags.doHypo = True
-TriggerFlags.doFEX = True
-
-#-----------------
-# BeamSpot Config
-#-----------------
-from TrigT2BeamSpot.TrigT2BeamSpotConf import PESA__T2VertexBeamSpot
-PESA__T2VertexBeamSpot.TrackAlgoID = 2
-PESA__T2VertexBeamSpot.HistoTrackAlgs = True
-PESA__T2VertexBeamSpot.SaveAllVertices = False
-
-PESA__T2VertexBeamSpot.TotalNTrackMin = 3
-PESA__T2VertexBeamSpot.TrackMinPt = 0.7
-PESA__T2VertexBeamSpot.TrackSeedPt = 1.0
-PESA__T2VertexBeamSpot.TrackMaxZ0 = 200.0
-PESA__T2VertexBeamSpot.TrackMaxD0 = 10.0
-PESA__T2VertexBeamSpot.TrackMaxZ0err = 1.0
-PESA__T2VertexBeamSpot.TrackMaxD0err = 1.0
-PESA__T2VertexBeamSpot.TrackMinQual = 0.0
-PESA__T2VertexBeamSpot.TrackMaxQual = 10.0
-PESA__T2VertexBeamSpot.TrackMinSiHits = 4
-PESA__T2VertexBeamSpot.TrackMinTRTHits = 1
-
-PESA__T2VertexBeamSpot.VertexMinNTrk = 3
-PESA__T2VertexBeamSpot.VertexMaxNTrk = 30
-PESA__T2VertexBeamSpot.VertexMaxXerr = 0.2
-PESA__T2VertexBeamSpot.VertexMaxYerr = 0.2
-PESA__T2VertexBeamSpot.VertexMaxQual = 1000.0
-
-
-#-----------------------------------------------------------
-include("RecExCommon/RecExCommon_topOptions.py")
-#-----------------------------------------------------------
-
-from GaudiSvc.GaudiSvcConf import THistSvc
-ServiceMgr += THistSvc()
-ServiceMgr.THistSvc.Output = ["SHIFT DATAFILE='shift-monitoring.root' OPT='RECREATE'",
- "EXPERT DATAFILE='expert-monitoring." + SiTrackOpt + "." + Data + "." + Seed + "." + NEvents + "evt." + TrackType + ".root' OPT='RECREATE'",
- "RUNSTAT DATAFILE='runstat-monitoring.root' OPT='RECREATE'",
- "DEBUG DATAFILE='debug-monitoring.root' OPT='RECREATE'"]
-
-jobproperties.PerfMonFlags.doMonitoring = False
-
-Service ("StoreGateSvc" ).ActivateHistory = True
-
-print AlgSequence
-print ServiceMgr
-
-if not ('OutputLevel' in dir()):
- OutputLevel = INFO
-
-AlgSequence().TrigSteer_L2.OutputLevel = OutputLevel
-for algo in AlgSequence().TrigSteer_L2.getChildren():
- algo.OutputLevel = OutputLevel
-
-MessageSvc.debugLimit = 1000000
-MessageSvc.OutputLevel = OutputLevel
-MessageSvc.Format = "% F%48W%S%7W%R%T %0W%M"
-
-ServiceMgr.StoreGateSvc.Dump = False
diff --git a/Trigger/TrigAlgorithms/TrigT2BeamSpot/share/myTrigger_jobOptions.py b/Trigger/TrigAlgorithms/TrigT2BeamSpot/share/myTrigger_jobOptions.py
deleted file mode 100644
index a6a34f1b81121ff39fb749a54c9f889ae44189ac..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigT2BeamSpot/share/myTrigger_jobOptions.py
+++ /dev/null
@@ -1,234 +0,0 @@
-#----------------------------------------
-# Return a file list given a directory
-#----------------------------------------
-
-import os,commands
-
-def getDirectoryList(path):
- cmd = 'ls %s/' % (path)
- file = ["%s/%s" % (path,i) for i in commands.getoutput(cmd).split('\n')]
- return file
-
-def getMixedDirectoryList(path):
- cmd = 'ls %s/*.root*' % (path)
- file = ["%s" % (i) for i in commands.getoutput(cmd).split('\n')]
- return file
-
-def getCastorDirectoryList(path):
- cmd = 'nsls %s/ ' % (path)
- file = ["rfio:%s/%s" % (path,i) for i in commands.getoutput(cmd).split('\n')]
- return files
-
-#-----------------
-# Input/Output
-#-----------------
-
-if ('Data' in dir()):
- if Data == "shift":
- PoolRDOInput = getDirectoryList('/u1/fizisist/ttbar_shift')
- elif Data == "gashalo":
- PoolRDOInput = getDirectoryList('/u1/fizisist/gashalo')
- elif Data == "mixed":
- PoolRDOInput = getMixedDirectoryList('/u1/iaracena/data/MixedEventsEnhancedb/RDO')
- elif Data == "J2":
- PoolRDOInput = getDirectoryList('/u1/fizisist/J2')
- elif Data == "J3":
- PoolRDOInput = getDirectoryList('/u1/fizisist/J3_2')
- elif Data == "J1":
- PoolRDOInput = getDirectoryList('/u1/fizisist/J1')
- elif Data == "J4":
- PoolRDOInput = getDirectoryList('/u1/fizisist/J4')
- elif Data == "J0":
- PoolRDOInput = getDirectoryList('/u1/fizisist/J0')
-else:
- Data = "shift"
- PoolRDOInput = getDirectoryList('/u1/fizisist/ttbar_shift')
-
-#PoolRDOInput=["/afs/cern.ch/atlas/offline/data/testfile/calib1_csc11.005200.T1_McAtNlo_Jimmy.digit.RDO.v12000301_tid003138._00016_extract_10evt.pool.root"]
-#PoolRDOInput = ["rfio:/castor/cern.ch/user/f/fizisist/beamspot/misal1_csc11.005013.J4_pythia_jetjet.digit.RDO.v12003103_tid004016._02277.pool.root.1"]
-
-#PoolRDOInput = getCastorDirectoryList('/castor/cern.ch/user/f/fizisist/beamspot/ttbarShift')
-#PoolRDOInput = getCastorDirectoryList('/castor/cern.ch/grid/atlas/caf/mc12/mc12.005012.J3_pythia_jetjet.digit.RDO.v12000003')
-#PoolRDOInput = getCastorDirectoryList('/castor/cern.ch/grid/atlas/dq2/misal1_csc11/misal1_csc11.005013.J4_pythia_jetjet.digit.RDO.v12003103_tid004016')
-#readRDOBS=["/u1/iaracena/data/14.0.X/Mixed_lumi1E31/daq.csc13.0000000.Single.Stream.LB0000.Athena._0001.data"]
-#PoolRDOInput = getDirectoryList('/u1/fizisist/ttbar_shift')
-#PoolRDOInput = getMixedDirectoryList('/u1/iaracena/data/MixedEventsEnhancedb')
-#PoolRDOInput = getDirectoryList('/u1/fizisist/J2')
-#PoolRDOInput = getDirectoryList('/u1/fizisist/J3')
-
-PoolESDOutput = 'rfio:/castor/cern.ch/user/f/fizisist/beamspot/myTriggerTest2.mixed.ESD.pool.root'
-PoolAODOutput = 'rfio:/castor/cern.ch/user/f/fizisist/beamspot/myTriggerTest2.mixed.AOD.pool.root'
-
-if not ('EvtMax' in dir()):
- EvtMax=1000
-
-NEvents = "%d" % EvtMax
-
-#-----------------
-# Global Flags
-#-----------------
-from AthenaCommon.GlobalFlags import GlobalFlags
-GlobalFlags.Print()
-#GlobalFlags.DetDescrVersion ="ATLAS-CSC-01-02-00"
-#DetDescrVersion = "ATLAS-CSC-01-02-00"
-
-#-----------------
-# Global Setup
-#-----------------
-doTAG = False
-doEgamma = False
-doMuon = False
-doJet = False
-doTauRec = False
-doObjMissingET = False
-doMuGirl = False
-doMoore = False
-doMuonIDStandAlone = False
-doMuonIDCombined = False
-
-doCBNT = False
-doWriteAOD = False
-doWriteESD = False
-doWriteTAG = False
-doAOD = False
-doESD = False
-doTAG = False
-doTruth = False
-doAtlfast = False
-
-#-----------------
-# Trigger Setup
-#-----------------
-doTrigger = True
-
-#-----------------------------------------------------------
-include("RecExCommon/RecExCommon_flags.py")
-#-----------------------------------------------------------
-
-#-----------------
-# InDet Flags
-#-----------------
-from InDetRecExample.InDetJobProperties import InDetFlags
-from AthenaCommon.JobProperties import jobproperties
-from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
-if Data == "gashalo":
- InDetFlags.Enabled = True
- InDetFlags.doBeamGas = True
- InDetFlags.doBeamHalo = True
- InDetFlags.doSiSPSeededTrackFinder = True
- InDetFlags.doPrintConfigurables = True
- InDetTrigFlags.doBeamGas = True
- InDetTrigFlags.doBeamHalo = True
-
-#-----------------
-# Trigger Flags
-#-----------------
-
-TriggerFlags.doCalo = True
-TriggerFlags.doMuon = True
-TriggerFlags.doID = True
-TriggerFlags.doLVL2 = True
-TriggerFlags.doLVL1 = True
-TriggerFlags.doEF = False
-TriggerFlags.readHLTconfigFromXML = False
-TriggerFlags.readLVL1configFromXML = False
-TriggerFlags.Slices_all_setOn()
-TriggerFlags.doNtuple = True
-TriggerFlags.enableMonitoring = [ 'Validation', 'Time', ]
-TriggerFlags.triggerMenuSetup = 'default'
-TriggerFlags.abortOnConfigurationError = True
-TriggerFlags.doHypo = True
-TriggerFlags.doFEX = True
-
-#-----------------
-# SiTrack Setup
-#-----------------
-
-#from TrigSiTrack.TrigSiTrack_Config import *
-#if ('SiTrackOpt' in dir()):
-# if SiTrackOpt == "loose.v2":
-# TrigSiTrackFlags.LoosenCuts = True
-# else:
-# TrigSiTrackFlags.LoosenCuts = False
-#else:
-SiTrackOpt = "defaults"
-# TrigSiTrackFlags.LoosenCuts = False
-
-#-----------------
-# Beamspot Setup
-#-----------------
-
-from TriggerMenuPython.BeamSpotSliceFlags import *
-BeamSpotSliceFlags.unsetAll()
-TriggerFlags.BeamSpotSlice.signatures = [ 'vertex_bjet18' ]
-
-from TrigT2BeamSpot.TrigT2BeamSpotConf import PESA__T2VertexBeamSpot
-
-# Track Algorithm: SiTrack = 1, IdScan = 2
-if ('TrackType' in dir()):
- if TrackType == "SiTrack":
- PESA__T2VertexBeamSpot.TrackAlgoID = 1
- else:
- PESA__T2VertexBeamSpot.TrackAlgoID = 2
-else:
- TrackType = "IdScan"
- PESA__T2VertexBeamSpot.TrackAlgoID = 2
-
-PESA__T2VertexBeamSpot.UseBeamConditionService = True
-
-PESA__T2VertexBeamSpot.DoPerLBHistograms = True
-PESA__T2VertexBeamSpot.LBHistoryLength = 10
-PESA__T2VertexBeamSpot.MonitoringHistoPath = "/EXPERT/T2VertexBeamSpot_Fex/"
-PESA__T2VertexBeamSpot.ExpressHistoPath = "/EXPERT/T2VertexBeamSpot_Fex/"
-
-PESA__T2VertexBeamSpot.HistoTrackAlgs = False
-PESA__T2VertexBeamSpot.SaveAllVertices = False
-
-PESA__T2VertexBeamSpot.TotalNTrackMin = 6
-PESA__T2VertexBeamSpot.TrackMinPt = 1.0
-PESA__T2VertexBeamSpot.TrackSeedPt = 4.0
-PESA__T2VertexBeamSpot.TrackMaxZ0 = 200.0
-PESA__T2VertexBeamSpot.TrackMaxD0 = 10.0
-PESA__T2VertexBeamSpot.TrackMaxZ0err = 1.0
-PESA__T2VertexBeamSpot.TrackMaxD0err = 1.0
-PESA__T2VertexBeamSpot.TrackMinQual = 0.0
-PESA__T2VertexBeamSpot.TrackMaxQual = 10.0
-PESA__T2VertexBeamSpot.TrackMinSiHits = 5
-PESA__T2VertexBeamSpot.TrackMinTRTHits = -1
-
-PESA__T2VertexBeamSpot.VertexMinNTrk = 6
-PESA__T2VertexBeamSpot.VertexMaxNTrk = 30
-PESA__T2VertexBeamSpot.VertexMaxXerr = 0.1
-PESA__T2VertexBeamSpot.VertexMaxYerr = 0.1
-PESA__T2VertexBeamSpot.VertexMaxQual = 30.0
-
-#-----------------------------------------------------------
-include("RecExCommon/RecExCommon_topOptions.py")
-#-----------------------------------------------------------
-
-from GaudiSvc.GaudiSvcConf import THistSvc
-ServiceMgr += THistSvc()
-ServiceMgr.THistSvc.Output = ["SHIFT DATAFILE='shift-monitoring.root' OPT='RECREATE'",
- "EXPERT DATAFILE='/u1/fizisist/beamspot/rootHistos/expert-monitoring.b18." + SiTrackOpt + "." + Data + "." + NEvents + "evt." + TrackType + ".root' OPT='RECREATE'",
- "RUNSTAT DATAFILE='runstat-monitoring.root' OPT='RECREATE'",
- "DEBUG DATAFILE='debug-monitoring.root' OPT='RECREATE'"]
-
-jobproperties.PerfMonFlags.doMonitoring = False
-
-Service ("StoreGateSvc" ).ActivateHistory = True
-
-print AlgSequence
-print ServiceMgr
-
-if not ('OutputLevel' in dir()):
- OutputLevel = INFO
-
-AlgSequence().TrigSteer_L2.OutputLevel = OutputLevel
-for algo in AlgSequence().TrigSteer_L2.getChildren():
- algo.OutputLevel = INFO
-
-MessageSvc.debugLimit = 1000000
-MessageSvc.OutputLevel = OutputLevel
-MessageSvc.Format = "% F%48W%S%7W%R%T %0W%M"
-
-ServiceMgr.StoreGateSvc.Dump = True
diff --git a/Trigger/TrigAlgorithms/TrigT2BeamSpot/share/runBeamSpotTests.sh b/Trigger/TrigAlgorithms/TrigT2BeamSpot/share/runBeamSpotTests.sh
deleted file mode 100755
index 55daf83dd61573c4c0f8df5011ccf3f5a3a38485..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigT2BeamSpot/share/runBeamSpotTests.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-
-echo
-echo "We will now be running several jobs for testing the beam spot code"
-echo
-
-homeDir=/afs/cern.ch/user/f/fizisist
-baseDir=/u1/fizisist/beamspot
-logDir=${baseDir}
-jobOptions=${baseDir}/myTrigger_jobOptions.py
-dataList="gashalo J1 J3 mixed shift" # Data
-trackList="SiTrack IdScan" # TrackType
-optsList="defaults.v8" # SiTrackOpt
-
-#source ${homeDir}/work/14.0.0/cmt/setup.sh -tag=14.0.0,32
-
-cd ${baseDir}
-
-for datatype in ${dataList}; do
- for trktype in ${trackList}; do
- for cutstype in ${optsList}; do
- outDir=${baseDir}/${datatype}/${trktype}/${cutstype}
- if [ ! -d ${outDir} ]; then
- mkdir ${outDir}
- fi
- cd ${outDir}
- echo "*** ${trktype} (SiTrack=${cutstype}) on ${datatype} events"
- #echo "athena.py -c EvtMax=$1;Data='${datatype}';TrackType='${trktype}';SiTrackOpt='${cutstype}'; ${jobOptions} >& ${logDir}/beamspot.${datatype}.$1evt.${trktype}.${cutstype}.log & "
- athena.py -c "EvtMax=$1;Data='${datatype}';TrackType='${trktype}';SiTrackOpt='${cutstype}';" ${jobOptions} >& ${logDir}/beamspot.b18.${datatype}.$1evt.${trktype}.${cutstype}.log &
- done
- done
-done
-
-echo
-
-cd ${baseDir}
-
diff --git a/Trigger/TrigAlgorithms/TrigT2BeamSpot/share/runJob_beamspot.sh b/Trigger/TrigAlgorithms/TrigT2BeamSpot/share/runJob_beamspot.sh
deleted file mode 100644
index 8f8ceea009727ce6e9017ff2a505fba7dddb1ada..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigT2BeamSpot/share/runJob_beamspot.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-echo
-echo "Running single job"
-echo
-
-##--------------
-## Seed choices
-##--------------
-# beamspot_vertex_list
-# beamspot_vertex_jet10
-# beamspot_vertex_bjet18
-# beamspot_vertex_FSTracks
-# beamspot_vertex_tau16i_loose
-# beamspot_vertex_e10_medium
-# beamspot_vertex_e10_medium_SiTrk
-# beamspot_vertex_e10_medium_SiTrk_robust
-# beamspot_vertex_trk9i_calib
-
-
-mydate=`date '+%Y-%m-%d-%HH-%MM-%SS'`
-evtMax=1000
-datatype=EnhancedBias
-L2Seed=beamspot_vertex_FSTracks
-trktype=IdScan
-cutstype=${mydate}
-jobOptions=myNewTrigger_jobOptions.py
-logDir=/u1/fizisist/beamspot
-Output=DEBUG
-
-athena.py -c "EvtMax=${evtMax};OutputLevel=${Output};Data='${datatype}';Seed='${L2Seed}';TrackType='${trktype}';SiTrackOpt='${cutstype}';" ${jobOptions} >& ${logDir}/beamspot.${datatype}.${evtMax}evt.${trktype}.${L2Seed}.${cutstype}.${mydate}.log &
-
-#mydate=`date '+%Y-%m-%d-%HH-%MM-%SS'`
-#athenaMT.py -M -W -c isOnline=True -l INFO -f Raw.data -n 10000 testHLT_standalone.py >& /u1/fizisist/beamspot/testMT.raw.withOH.${mydate}.log &
-
-
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigT2CaloCommonConfig.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigT2CaloCommonConfig.py
index d7362e1066dc07e74a6a70e271017a61a40d1994..da261e7bd2ffbc73e675b56cc4fbe3a13b4f718e 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigT2CaloCommonConfig.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigT2CaloCommonConfig.py
@@ -15,8 +15,8 @@ class TrigDataAccess(_TrigDataAccess):
from AthenaCommon.Logging import logging
log = logging.getLogger(name)
- self.loadFullCollections = ( TriggerFlags.doEF() or TriggerFlags.doHLT() )
- self.loadAllSamplings = ( TriggerFlags.doLVL2() or TriggerFlags.doHLT() )
+ self.loadFullCollections = TriggerFlags.doHLT()
+ self.loadAllSamplings = TriggerFlags.doHLT()
log.info('Not possible anymore to enable HLT calo offset correction, tools deprecated')
from RecExConfig.RecFlags import rec
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcConfig.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcConfig.py
index 59b620da65188398096f77ff782781665c077125..d7aa23160f93ab73583f01294c91e2a5d4738deb 100755
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcConfig.py
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcConfig.py
@@ -354,14 +354,14 @@ class SetupTrigConfigSvc(object):
from TriggerJobOpts.TriggerFlags import TriggerFlags
- if TriggerFlags.doLVL2() or TriggerFlags.doEF() or TriggerFlags.doHLT() or TriggerFlags.configForStartup()=='HLToffline':
+ if TriggerFlags.doHLT() or TriggerFlags.configForStartup()=='HLToffline':
self.mlog.info( "setup HLTConfigSvc and add instance to ServiceMgr (xml file="+self.hltXmlFile+")" )
hlt = HLTConfigSvc("HLTConfigSvc")
hlt.XMLMenuFile = self.hltXmlFile
hlt.doMergedHLT = TriggerFlags.doHLT()
ServiceMgr += hlt
else:
- self.mlog.info( "Will not setup HLTConfigSvc, since TriggerFlags doLVL2(), doEF(), and doHLT() are all False" )
+ self.mlog.info( "Will not setup HLTConfigSvc, since doHLT() is False" )
self.states[self.states.index("xml")] = "xmll1"
self.mlog.info( "setup LVL1ConfigSvc and add instance to ServiceMgr (xml file="+self.l1XmlFile+")" )
diff --git a/Trigger/TrigMonitoring/TrigCostMonitor/python/TrigCostMonitorConfig.py b/Trigger/TrigMonitoring/TrigCostMonitor/python/TrigCostMonitorConfig.py
index 73fcf5b21c6c7b5e82343a9ac56b44135ae1eab8..0b68f913321e58fb59069f212b566be83072e058 100644
--- a/Trigger/TrigMonitoring/TrigCostMonitor/python/TrigCostMonitorConfig.py
+++ b/Trigger/TrigMonitoring/TrigCostMonitor/python/TrigCostMonitorConfig.py
@@ -444,12 +444,7 @@ def setupCostJob(config = 'OPI ROB NOPS'):
from TriggerJobOpts.TriggerFlags import TriggerFlags
if TriggerFlags.doHLT():
configSteeringOPI(topSeq, 'TrigSteer_HLT', config, log)
- else:
- if TriggerFlags.doEF():
- configSteeringOPI(topSeq, 'TrigSteer_EF', config, log)
- if TriggerFlags.doLVL2():
- configSteeringOPI(topSeq, 'TrigSteer_L2', config, log)
-
+
if config.count('ROB'):
log.info('Will try to configure online monitoring for ROBDataProviderSvc...')
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
diff --git a/Trigger/TrigMonitoring/TrigCostMonitor/share/RunTrigCost.py b/Trigger/TrigMonitoring/TrigCostMonitor/share/RunTrigCost.py
index d9bbb1f4f1cc0600edf52729ad803b189c49a6d0..f6d530f4a9f9536c9142d5b97f3105fceb0ac78a 100644
--- a/Trigger/TrigMonitoring/TrigCostMonitor/share/RunTrigCost.py
+++ b/Trigger/TrigMonitoring/TrigCostMonitor/share/RunTrigCost.py
@@ -51,13 +51,11 @@ TriggerFlags.readHLTconfigFromXML=False
TriggerFlags.inputLVL1configFile=''
TriggerFlags.inputHLTconfigFile=''
TriggerFlags.doLVL1=True
-TriggerFlags.doLVL2=True
-TriggerFlags.doEF=True
+TriggerFlags.doHLT=True
TriggerFlags.L1PrescaleSet = 'L1Prescales100_' +TriggerFlags.triggerMenuSetup()
TriggerFlags.HLTPrescaleSet = 'HLTPrescales100_'+TriggerFlags.triggerMenuSetup()
TriggerFlags.configurationSourceList=['xml']
TriggerFlags.enableMonitoring = [ 'Time', 'CostAthena' ]
-TriggerFlags.disableRandomPrescale=False
if setMenu.count('simpleL1Calib') or setMenu.count('InitialBeam') or setMenu.count('Cosmic'):
TriggerFlags.useL1CaloCalibration=False
diff --git a/Trigger/TrigMonitoring/TrigCostMonitor/share/readDataRate.py b/Trigger/TrigMonitoring/TrigCostMonitor/share/readDataRate.py
index 504f3c2fa6fcdc0e2260d8eea68115b138b96c9f..c05ac507f13db73901c1c8603a95b6777c28d84f 100644
--- a/Trigger/TrigMonitoring/TrigCostMonitor/share/readDataRate.py
+++ b/Trigger/TrigMonitoring/TrigCostMonitor/share/readDataRate.py
@@ -17,8 +17,7 @@ globalflags.DataSource = 'data'
from TriggerJobOpts.TriggerFlags import TriggerFlags
TriggerFlags.readBS = True
TriggerFlags.doLVL1 = False
-TriggerFlags.doLVL2 = False
-TriggerFlags.doEF = False
+TriggerFlags.doHLT = False
#----------------------------------------------------------------------
# Set services for reading BS files
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/share/L1Simulation.py b/Trigger/TrigT1/L1Topo/L1TopoSimulation/share/L1Simulation.py
index 644b306b39c97017e06daa0aa3bee2acee6e856d..f9357780a7173398d857bb174b1cb87df453dd55 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/share/L1Simulation.py
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/share/L1Simulation.py
@@ -47,8 +47,6 @@ include ( "RecExCond/RecExCommon_flags.py" )
TriggerFlags.doL1Topo = True
TriggerFlags.doLVL1 = True
-TriggerFlags.doLVL2 = False
-TriggerFlags.doEF = False
TriggerFlags.doHLT = True
TriggerFlags.triggerMenuSetup = "MC_pp_v5"
diff --git a/Trigger/TrigT1/TrigT1CTP/share/TrigT1CTP_standalone_xml_job.py b/Trigger/TrigT1/TrigT1CTP/share/TrigT1CTP_standalone_xml_job.py
index 3a365b2cf7205c96ca229b6b8d606b80a7f20b50..8468b24b2efb0fe477ac2be4039e98d203d686c2 100755
--- a/Trigger/TrigT1/TrigT1CTP/share/TrigT1CTP_standalone_xml_job.py
+++ b/Trigger/TrigT1/TrigT1CTP/share/TrigT1CTP_standalone_xml_job.py
@@ -42,8 +42,6 @@ include("RecExCond/AllDet_detDescr.py")
# use TriggerGetter but disable HLT
from TriggerJobOpts.TriggerFlags import TriggerFlags as TF
TF.doLVL1 = True
-TF.doLVL2 = False
-TF.doEF = False
TF.doHLT = False
TF.readLVL1configFromXML=True
TF.triggerMenuSetup = "MC_pp_v5"
diff --git a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py
index 3cc82e6db4d61e51d2fab557377533054a3deb39..84501919807eb93e1a386c09a877149a41ef3a3a 100644
--- a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py
+++ b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py
@@ -128,7 +128,7 @@ class TrigInDetSequence(TrigInDetSequenceBase):
# modify the sequence acoording to triggerflags
from TriggerJobOpts.TriggerFlags import TriggerFlags
- if not ( TriggerFlags.doEF() or TriggerFlags.doHLT() ) or not TriggerFlags.doFEX():
+ if not TriggerFlags.doHLT() or not TriggerFlags.doFEX():
from TrigSteeringTest.TrigSteeringTestConf import PESA__dummyAlgo as dummyAlgo_disabledByTriggerFlags_EFID
dummyAlgEFID = dummyAlgo_disabledByTriggerFlags_EFID("doEF_or_doFEX_False_no_EFID")
alglist = '[dummyAlgEFID]'
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
index e8058e8941343ee4eac90c5fa9ba7c07819de071..a5b2806068a0f2f277175cade788e023c61f592c 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
@@ -218,22 +218,6 @@ class HLTSimulationGetter(Configured):
if TriggerFlags.writeBS():
- # declare objects to go to BS (from the lists above)
- ## if TriggerFlags.doLVL2():
- ## from TrigEDMConfig.TriggerEDM import getL2BSList
- ## TrigSteer_L2.Navigation.ClassesToPayload = getL2BSList()
- ## TrigSteer_L2.Navigation.ClassesToPreregister = []
- ##
- ## if TriggerFlags.doEF():
- ## from TrigEDMConfig.TriggerEDM import getEFBSList
- ## TrigSteer_EF.Navigation.ClassesToPayload = getEFBSList()
- ## TrigSteer_EF.Navigation.ClassesToPreregister = []
- ## try:
- ## from TrigEDMConfig.TriggerEDM import getEFDSList
- ## TrigSteer_EF.Navigation.ClassesToPayload_DSonly = getEFDSList()
- ## except ImportError:
- ## log.warning("DataScouting not available in this release")
-
if TriggerFlags.doHLT():
from TrigEDMConfig.TriggerEDM import getHLTBSList
TrigSteer_HLT.Navigation.ClassesToPayload = getHLTBSList()
@@ -257,14 +241,6 @@ class HLTSimulationGetter(Configured):
TrigSerializeConvHelper = TrigSerializeConvHelper(doTP = True)
ToolSvc += TrigSerializeConvHelper
- #do not activate T/P of EF classes at L2
- ## if TriggerFlags.doLVL2():
- ## from TrigEDMConfig.TriggerEDM import getL2BSTypeList
- ## TrigSerToolTP.ActiveClasses = getL2BSTypeList()
- ## if TriggerFlags.doEF():
- ## from TrigEDMConfig.TriggerEDM import getL2BSTypeList, getEFBSTypeList
- ## TrigSerToolTP.ActiveClasses = getL2BSTypeList() + getEFBSTypeList()
-
if TriggerFlags.doHLT():
from TrigEDMConfig.TriggerEDM import getHLTBSTypeList
TrigSerToolTP.ActiveClasses = getHLTBSTypeList()
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Modifiers.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Modifiers.py
index f9a8e1cf22bd40c11e3b57fe737eedea8a1e9307..5727d0bb3bcd639846526fb557579cdfdf1a0148 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/Modifiers.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/Modifiers.py
@@ -633,10 +633,6 @@ class rerunLVL1(_modifier):
"""
def preSetup(self):
- # Do nothing for EF only running
- if not TriggerFlags.doLVL2() and TriggerFlags.doEF():
- return
-
from AthenaCommon.Include import include
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
@@ -736,10 +732,6 @@ class rerunDMLVL1(_modifier):
"""
def preSetup(self):
- # Do nothing for EF only running
- if not TriggerFlags.doLVL2() and TriggerFlags.doEF():
- return
-
from AthenaCommon.Include import include
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
index db719bd2be261ed9e0e3e4039e7f142b90c24c20..50490bf04b8dfd15633525f187999afe246e1c5d 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
@@ -310,21 +310,16 @@ def createTriggerFlags():
return flags
# for reference, this flags are skipped as never used or never set in fact, or set identical to de default or used in a very old JO:
- # readLVL1Calo, readLVL1Muon, fakeLVL1, useCaloTTL
+ # fakeLVL1, useCaloTTL
# doCosmicSim - old JO
- # disableRandomPrescale - never used
# doMergedHLTResult - not needed now
# doAlwaysUnpackDSResult - never set
# doTrt - fast TRT or trigger - never used
# doLucid - not sure if ever set to False, identical rec flag exists
# doZdc - never set to anything different than default
- # doHLTpersistency - never red
- # useOfflineSpacePoints - used only to set
- # doNtuple - never red
- # configForStartup
+ # configForStartup
# the flags related to trigger DB are redundant of triggerConfig - need to decide if they are needed in this form
# also not defined the Prescale sets yet
- # abortOnConfigurationError - never red
# in signatures
# egamma: ringerVersion - not used
# muon: doMuonCalibrationStream - not used
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py
index 78517fb357d3ee3366efc162e84fddc64b2b38cb..d3f95dbdefcbefa89d9eb3c02466e298193203e4 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py
@@ -141,15 +141,13 @@ class TriggerConfigGetter(Configured):
# first check the input
if "HIT2RDO" in self._environment:
- TriggerFlags.doLVL2 = False
- TriggerFlags.doEF = False
+ TriggerFlags.doHLT = False
log.info("For simulation jobs the following flags are set:")
log.info("globalflags.InputFormat : %s", globalflags.InputFormat())
log.info("globalflags.DataSource : %s", globalflags.DataSource())
log.info("TriggerFlags.configForStartup : %s", TriggerFlags.configForStartup())
log.info("TriggerFlags.dataTakingConditions : %s", TriggerFlags.dataTakingConditions())
- log.info("TriggerFlags.doLVL2 : %s", TriggerFlags.doLVL2())
- log.info("TriggerFlags.doEF : %s", TriggerFlags.doEF())
+ log.info("TriggerFlags.doHLT : %s", TriggerFlags.doHLT())
else:
if not self.checkInput():
log.error("Could not determine job input. Can't setup trigger configuration and will return!")
@@ -190,14 +188,14 @@ class TriggerConfigGetter(Configured):
# reading from the TriggerDB can mean different things:
- # a) TriggerFlags doLVL2() and doEF() are both False:
+ # a) TriggerFlags doHLT() is False:
# - create a tmp sqlite file with the conditions (menu)
# - use DSConfigSvc
- # b) TriggerFlags doLVL2() or doEF() is True:
+ # b) TriggerFlags doHLT() is True:
# - use HLTConfigSvc
- if self.readTriggerDB and (TriggerFlags.doLVL2() or TriggerFlags.doEF() or TriggerFlags.doHLT()):
+ if self.readTriggerDB and TriggerFlags.doHLT():
self.ConfigSrcList = ['xml'] # to use L1/HLTConfigSvc and not DSConfigSvc, but only if we are running the HLT
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
index e7ea511f414c689c0e4b065ff876a010175f727e..20ce5bdbdab30e69c25ee7e58817b89166078b73 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
@@ -41,34 +41,24 @@ default_true_flags = [
"doZdc", # if False, disable ZDC algorithms at LVL2 & EF """"
"doLucid", # if False, disable Lucid algorithms at LVL2 & EF
"doMuon", # if FAlse, disable Muons, note: muons need input file containing digits"""
- "doHLTpersistency", # serialise L2result """
"doNavigationSlimming", # Enable the trigger navigation slimming"""
]
default_false_flags = [
"readLVL1FromJSON", # the authoritative L1 menu (xml or json) - this flag will be removed after the transition to json has been completed
- "readLVL1Calo", # read LVL1 Calo info from pool or BS """
- "readLVL1Muon", # read LVL1 Muon in from Pool or BS """
"fakeLVL1", # create fake RoI from KINE info """
"useL1CaloCalibration", # Should be false for early data, true for later """
"useRun1CaloEnergyScale",
"doCosmicSim", # run the LVL1 simulation with special setup for cosmic simulation (set to FALSE by default, to do collisions simulation) """
- "disableRandomPrescale", # if True, disable Random Prescales
- "doLVL2", # if False, disable LVL2 selection
- "doEF", # if False, disable EF selection
"doTruth",
"doFTK", # if False, disable FTK result reader """
"doTriggerConfigOnly", # if True only the configuration services should be set, no algorithm """
- "useOfflineSpacePoints", # use online convertors for Si SpacePoints
"doTransientByteStream", # Write transient ByteStream before executing HLT algorithms.
# To be used for running on MC RDO with clients which require BS inputs.
- "doNtuple",
"writeBS", # Write ByteStream output file """
"readBS",
"readMenuFromTriggerDb", # define the TriggerDb to be the source of the LVL1 and HLT trigger menu
"generateMenuDiagnostics", # Generate additional files heling in menu diagnostics """
- "abortOnConfigurationError", # Should the job be stoped if there is an error in configuration
-
]
for name in default_true_flags:
@@ -87,24 +77,6 @@ class doHLT(JobProperty):
allowedType=['bool']
StoredValue=True
- def _do_action(self):
- """ setup flag level consistency """
- if self.get_Value() is True:
- if TriggerFlags.doEF.is_locked():
- TriggerFlags.doEF.unlock()
- TriggerFlags.doEF.set_Off()
- TriggerFlags.doEF.lock()
- else:
- TriggerFlags.doEF.set_Off()
- if TriggerFlags.doEF.is_locked():
- TriggerFlags.doLVL2.unlock()
- TriggerFlags.doLVL2.set_Off()
- TriggerFlags.doLVL2.lock()
- else:
- TriggerFlags.doLVL2.set_Off()
- log = logging.getLogger( 'TriggerFlags.doHLT' )
- log.info("doHLT is True: force doLVL2=False and doEF=False" )
-
_flags.append(doHLT)
class doMT(JobProperty):
@@ -964,8 +936,7 @@ def sync_Trigger2Reco():
if globalflags.InputFormat() == 'bytestream':
TriggerFlags.readBS = True
TriggerFlags.doLVL1 = False
- TriggerFlags.doLVL2 = False
- TriggerFlags.doEF = False
+ TriggerFlags.doHLT = False
if rec.doWriteBS():
TriggerFlags.writeBS = True
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerGetter.py
index d1fd8603a31e15ec9888f305b941ce9611f2e10d..a33ba3f35c0c1413202255d19b54520a15d7435c 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerGetter.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
from AthenaCommon.GlobalFlags import jobproperties
from AthenaCommon.Logging import logging
@@ -44,17 +44,17 @@ class TriggerGetter(Configured):
# start with print some information what this will do
log.info("Basic configuration flags RecAlgsFlag.doTrigger: %d RecFlags.doTrigger: %d TriggerFlags.doTriggerConfigOnly %d", recAlgs.doTrigger(), rec.doTrigger(), TF.doTriggerConfigOnly() )
- log.info("TriggerFlags: doL1Topo: %s, doLVL1: %s, doLVL2: %s, doEF: %s, doHLT: %s, doMT: %s", TF.doL1Topo(), TF.doLVL1(), TF.doLVL2(), TF.doEF(), TF.doHLT(), TF.doMT() )
+ log.info("TriggerFlags: doL1Topo: %s, doLVL1: %s, doHLT: %s, doMT: %s", TF.doL1Topo(), TF.doLVL1(), TF.doHLT(), TF.doMT() )
# RDOtoRDOTrigger MT temporarily coded in the transform skeleton, so skip here
if TF.doMT() and rec.readRDO() and rec.doWriteRDO():
log.info("Nothing happens in TriggerGetter for RDOtoRDOTrigger MT")
return True
- willGenerateMenu = recAlgs.doTrigger() and (TF.doLVL1() or TF.doLVL2() or TF.doEF() or TF.doHLT()) and not TF.doTriggerConfigOnly()
+ willGenerateMenu = recAlgs.doTrigger() and (TF.doLVL1() or TF.doHLT()) and not TF.doTriggerConfigOnly()
willRunTriggerConfigGetter = recAlgs.doTrigger() or rec.doTrigger() or TF.doTriggerConfigOnly()
willRunLVL1SimulationGetter = recAlgs.doTrigger() and not TF.doTriggerConfigOnly()
- willRunHLTSimulationGetter = willRunLVL1SimulationGetter and (TF.doLVL2() or TF.doEF() or TF.doHLT())
+ willRunHLTSimulationGetter = willRunLVL1SimulationGetter and TF.doHLT()
log.info("Will run: %s%s%s%s", "GenerateMenu " if willGenerateMenu else "",
"TriggerConfigGetter " if willRunTriggerConfigGetter else "",
@@ -68,7 +68,7 @@ class TriggerGetter(Configured):
if recAlgs.doTrigger():
from TriggerMenu.menu.GenerateMenu import GenerateMenu
- if ((TF.doLVL1() or TF.doLVL2() or TF.doEF() or TF.doHLT()) and not TF.doTriggerConfigOnly()):
+ if ((TF.doLVL1() or TF.doHLT()) and not TF.doTriggerConfigOnly()):
log.info("generating menu")
# trigger menu files generation
g = GenerateMenu()
@@ -120,7 +120,7 @@ class TriggerGetter(Configured):
lvl1 = Lvl1SimulationGetter() # noqa: F841
- if TF.doTransientByteStream() or (jobproperties.Global.InputFormat() != 'bytestream' and (TF.doLVL2() or TF.doEF() or TF.doHLT())):
+ if TF.doTransientByteStream() or (jobproperties.Global.InputFormat() != 'bytestream' and TF.doHLT()):
# Transient BS construction and intialization
from ByteStreamCnvSvc import WriteByteStream
StreamBS = WriteByteStream.getStream("Transient","StreamBS")
@@ -147,10 +147,8 @@ class TriggerGetter(Configured):
# setup HLT
# initialize HLT config svc
- log.info("TriggerFlags: doLVL2 %r", TF.doLVL2())
- log.info("TriggerFlags: doEF %r", TF.doEF())
log.info("TriggerFlags: doHLT %r", TF.doHLT())
- if TF.doLVL2() or TF.doEF() or TF.doHLT():
+ if TF.doHLT():
log.info("configuring hlt")
from TriggerJobOpts.HLTTriggerGetter import HLTSimulationGetter
hlt = HLTSimulationGetter(g) # noqa: F841
@@ -166,7 +164,7 @@ class TriggerGetter(Configured):
hltouput = Lvl1ResultBuilderGetter()
# prepare result making of HLT
- if TF.doLVL2() or TF.doEF() or TF.doHLT() or (recAlgs.doTrigger() and TF.readBS()):
+ if TF.doHLT() or (recAlgs.doTrigger() and TF.readBS()):
from TriggerJobOpts.HLTTriggerResultGetter import HLTTriggerResultGetter
hltouput = HLTTriggerResultGetter() # noqa: F841
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py b/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py
index 1418276ca6de26138c4402619a037443595a09d2..f7245c3d1b15d6721dc297123a6a3b583aa792e7 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/BStoESD_Tier0_HLTConfig_jobOptions.py
@@ -29,8 +29,7 @@ if rec.doTrigger():
tf.readBS=True # needed in HLTTriggerGetter - do not understand why it is not
# true by default when globalflags.InputFormat = 'bytestream'
tf.doLVL1= False # needed to not rerun the trigger
- tf.doEF= False # needed to not rerun the trigger
- tf.doLVL2 = False # needed to not rerun the trigger
+ tf.doHLT= False # needed to not rerun the trigger
tf.configurationSourceList = ['ds']
try:
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/Trigger_topOptions_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/Trigger_topOptions_standalone.py
index 6889699a20f95c4e20dc5cecea6bdf343695ef5b..268cae97692d734541b98c21c7372a81d692d7c5 100755
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/Trigger_topOptions_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/Trigger_topOptions_standalone.py
@@ -133,7 +133,7 @@ if TriggerFlags.doMuon():
# load services needed for converters
import MuonCnvExample.MuonCablingConfig # noqa: F401 configuration by import, old Run-2 job options
import MuonRecExample.MuonReadCalib # noqa: F401 configuration by import, old Run-2 job options
- if (TriggerFlags.doEF() or TriggerFlags.doHLT()) and 'forceMuonDataPrep' in dir():
+ if TriggerFlags.doHLT() and 'forceMuonDataPrep' in dir():
if (TriggerFlags.MuonSlice.doEFRoIDrivenAccess()):
include("MuonRdoToPrepData/CscRdoToCscPrepData_jobOptions.py")
else:
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_run2.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_run2.py
index 0a92e0bc364cf8c79eb55d234e62b2664b194a1e..9bb40a1bc65fecfcc49d769309a148851ec86d3a 100755
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_run2.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone_run2.py
@@ -324,10 +324,7 @@ if setModifiers:
include.block("RecExCond/RecExCommon_flags.py")
log = logging.getLogger('runHLT_standalone.py')
-TriggerFlags.doHLTpersistency=False
TriggerFlags.writeBS=True
-TriggerFlags.abortOnConfigurationError=True
-
TriggerFlags.triggerMenuSetup=setMenu
def stripPrescales(menu):
diff --git a/Trigger/TriggerSimulation/TrigSimTransforms/share/athena_RDOtoBS.py b/Trigger/TriggerSimulation/TrigSimTransforms/share/athena_RDOtoBS.py
index 61caf0feea3fa0fe7c6e96fc12f3a5974a375588..3214c045ed41a1c0bdd1731e354380ecc1059bdf 100644
--- a/Trigger/TriggerSimulation/TrigSimTransforms/share/athena_RDOtoBS.py
+++ b/Trigger/TriggerSimulation/TrigSimTransforms/share/athena_RDOtoBS.py
@@ -76,8 +76,7 @@ recAlgs.doTrigger.set_Value_and_Lock(True)
# Config trigger
TriggerFlags.doLVL1.set_Value_and_Lock(True) # this should be disabled in the future
-TriggerFlags.doLVL2.set_Value_and_Lock(False)
-TriggerFlags.doEF.set_Value_and_Lock(False)
+TriggerFlags.doHLT.set_Value_and_Lock(False)
#-------------------------------------------------------------------------------
TriggerFlags.configurationSourceList.set_Value_and_Lock(["xml"])
diff --git a/Trigger/TriggerSimulation/TrigSimTransforms/share/skeleton.BStoTRIGBS.fails.py b/Trigger/TriggerSimulation/TrigSimTransforms/share/skeleton.BStoTRIGBS.fails.py
index 5057d3d6c75af0363c4307547ce0b24b1d57892a..d99521e334846e1c0da4de3416eb0fcd6bec9edb 100644
--- a/Trigger/TriggerSimulation/TrigSimTransforms/share/skeleton.BStoTRIGBS.fails.py
+++ b/Trigger/TriggerSimulation/TrigSimTransforms/share/skeleton.BStoTRIGBS.fails.py
@@ -68,14 +68,11 @@ topSequence = AlgSequence()
# Trying manual setup of L1 instead of automatic (throgh L1ConfigGetter).
TriggerFlags.doLVL1 = False
-TriggerFlags.doLVL2 = True
-TriggerFlags.doEF = True
+TriggerFlags.doHLT = True
TriggerFlags.doTruth.set_Value_and_Lock(False)
-TriggerFlags.doHLTpersistency = True
TriggerFlags.writeBS = True
-TriggerFlags.abortOnConfigurationError = True
TriggerFlags.enableMonitoring = []
@@ -337,8 +334,6 @@ hlt = HLTSimulationGetter()
rng = getattr(ToolSvc,'HLT::RandomScaler')
rng.useEventSeed = True
-#EF gets an extra seed "hash-offset" of 1 to make it independent of L2
-rng.config(seed=int(TriggerFlags.doEF()), luxury=2)
### End of the mess.....
###############################