Commit 95bbaaca authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'vulture_triggermenumt' into 'master'

Remove unused TriggerMenuMT code

See merge request !30538
parents db76b570 b6646f5e
......@@ -2,10 +2,6 @@
from AthenaCommon.CFElements import parOR
#from AthenaCommon.Constants import DEBUG
def getFirstStageBjetTracking( jetName,vertexName ):
return None
# To be implemented on a later stage
def getSecondStageBjetTracking( inputRoI ):
algSequence = []
......
......@@ -82,11 +82,6 @@ class ElectronChainConfiguration(ChainConfigurationBase):
myChain = self.buildChain(chainSteps)
return myChain
myChain = self.buildChain(chainSteps)
return myChain
# --------------------
# Configuration of electron steps
# --------------------
......
......@@ -22,7 +22,7 @@ class CFNaming(object):
return "F" + ChainStepName
@staticmethod
def simplifyOutName( name, dropIM=False ):
def simplifyOutName(name):
"""Removes all HLT_decisions except the front one + additiona cleaning of common words"""
return "HLTNav_" + name.replace("HLTNav_", "").replace("Trig", "").replace("Alg", "")
......
......@@ -11,12 +11,12 @@ def minbiasSpacePointAthSequence(ConfigFlags):
minbiasSpacePointAthSequence = seqAND("minbiasSpacePointAthSequence",[InputMakerAlg, recoSequence ])
return (minbiasSpacePointAthSequence, InputMakerAlg, sequenceOut)
def minbiasTrackAthSequence(ConfigFlags):
InputMakerAlg= clusterFSInputMaker()
(recoSequence, sequenceOut) = MinBiasRecoSequences()
def minbiasTrackAthSequence(ConfigFlags):
InputMakerAlg= clusterFSInputMaker()
(recoSequence, sequenceOut) = MinBiasRecoSequences()
minbiasTrackAthSequence = seqAND("minbiasTrackAthSequence",[InputMakerAlg, recoSequence ])
return (minbiasTrackAthSequence, InputMakerAlg, sequenceOut)
minbiasTrackAthSequence = seqAND("minbiasTrackAthSequence",[InputMakerAlg, recoSequence ])
return (minbiasTrackAthSequence, InputMakerAlg, sequenceOut)
def MinBiasRecoSequences():
......
......@@ -13,11 +13,10 @@ class ThresholdDef:
@staticmethod
def registerThresholds(tc):
if ThresholdDef.alreadyExecuted:
if ThresholdDef.alreadyExecuted:
raise RuntimeError("Calling ThresholdDef.registerThresholds twice")
return # just for safety
ThresholdDef.alreadyExecuted = True
# MU
ThresholdValue.setDefaults('MU', {})
......
......@@ -224,7 +224,7 @@ class L1MenuConfig(object):
return None
def writeJSON(self, outputFile, destdir="./", screenprint = False):
def writeJSON(self, outputFile, destdir="./"):
if self.generated:
outputFile = destdir.rstrip('/') + '/' + outputFile
L1MenuJSONConverter(l1menu = self.l1menu, outputFile = outputFile).writeJSON(pretty=True)
......
......@@ -11,8 +11,7 @@ from TriggerMenuMT.LVL1MenuConfig.LVL1.Lvl1Flags import Lvl1Flags
from AthenaCommon.Logging import logging
log = logging.getLogger("generateLVL1MenuMT")
def generateL1Menu(menu, useTopoMenu="MATCH"):
def generateL1Menu(menu):
# what menu to build
TF.triggerMenuSetup = menu
......@@ -145,8 +144,8 @@ def main():
generateL1Menu(menu="MC_pp_run3_v1" )
generateL1Menu(menu="Cosmic_pp_run3_v1")
return 0
if sys.argv[1].endswith(".xml"):
readL1MenuFromXML(sys.argv[1])
return 0
......@@ -216,7 +215,7 @@ def main():
return 0
if sys.argv[1].lower().startswith("dc14"):
generateL1Menu(menu="DC14",useTopoMenu="Physics_pp_v6")
generateL1Menu(menu="DC14")
return 0
if sys.argv[1].lower().startswith("hiphy"):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment