Merge branch 'beamspotChainMT_ATR-17547' into 'master'

BeamspotChainMT ATR-17547

See merge request !27030

Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py

@@ -46,6 +46,7 @@ class opt:
     doBphysicsSlice   = True
     doStreamingSlice  = True
     doMonitorSlice    = True
+    doBeamspotSlice   = True
     reverseViews      = False
     enabledSignatures = []
     disabledSignatures = []

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py

+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.Logging import logging
+logging.getLogger().info("Importing %s",__name__)
+log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.BeamspotChainConfiguration")
+
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
+from TrigStreamerHypo.TrigStreamerHypoConfigMT import StreamerHypoToolMTgenerator
+from TrigStreamerHypo.TrigStreamerHypoConf import TrigStreamerHypoAlgMT
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
+from DecisionHandling.DecisionHandlingConf import InputMakerForRoI
+from AthenaCommon.CFElements import seqAND
+
+
+#----------------------------------------------------------------
+# fragments generating configuration will be functions in New JO, 
+# so let's make them functions already now
+#----------------------------------------------------------------
+
+ 
+
+def allTE_trkfast_Cfg( flags ):
+        return allTE_trkfast()
+
+def allTE_trkfast():
+
+        inputMakerAlg = InputMakerForRoI("IM_beamspotInputMaker", mergeOutputs=False)
+        inputMakerAlg.RoIs="beamspotInputRoIs"
+        from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
+        (viewAlgs, eventAlgs) = makeInDetAlgs(whichSignature='FS', rois=inputMakerAlg.RoIs)
+        from TrigT2BeamSpot.T2VertexBeamSpotConfig import T2VertexBeamSpot_activeAllTE
+        #beamspotSequence = seqAND("beamspotSequence",viewAlgs+[inputMakerAlg,T2VertexBeamSpot_activeAllTE()])
+        beamspotSequence = seqAND("beamspotSequence",[inputMakerAlg]+viewAlgs+[T2VertexBeamSpot_activeAllTE()])
+
+        #hypo
+        beamspotHypoAlg = TrigStreamerHypoAlgMT("BeamspotHypoAlg")
+        beamspotHypoAlg.RuntimeValidation = False #Needed to avoid the ERROR ! Decision has no 'feature' ElementLink
+        beamspotHypoToolGen= StreamerHypoToolMTgenerator
+
+        return  MenuSequence( Sequence    = beamspotSequence,
+                          Maker       = inputMakerAlg,
+                          Hypo        = beamspotHypoAlg,
+                          HypoToolGen = beamspotHypoToolGen )
+
+# Class to configure chain
+#----------------------------------------------------------------
+class BeamspotChainConfiguration(ChainConfigurationBase):
+
+    def __init__(self, chainDict):
+        ChainConfigurationBase.__init__(self,chainDict)
+
+
+    # ----------------------
+    # Assemble the chain depending on information from chainName
+    # ----------------------
+    def assembleChain(self):                            
+        chainSteps = []
+        log.debug("Assembling chain for " + self.chainName)
+        # --------------------
+        # define here the names of the steps and obtain the chainStep configuration 
+        # --------------------
+        stepDictionary = {
+            "allTE_trkfast":[self.getAllTEStep()]
+            #"activeTE_trkfast":[self.activeTE_trkfast()],
+            #"trkFS_trkfast":[self.trkFS_trkfast()],
+        }
+
+        #key = self.chainPart['EFrecoAlg']
+        key = self.chainPart['addInfo'][0] + "_" + self.chainPart['l2IDAlg'][0]#TODO: hardcoded index
+        steps=stepDictionary[key]
+        for step in steps:
+            chainSteps+=[step]
+            
+        myChain = self.buildChain(chainSteps)
+        return myChain
+
+   
+    # --------------------
+    # Configuration of costmonitor
+    # --------------------
+    def getAllTEStep(self):
+        return self.getStep(1,"allTE_trkfast",[allTE_trkfast_Cfg])

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/GenerateBeamspotChainDefs.py

+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools import splitChainDict
+from TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.BeamspotChainConfiguration import BeamspotChainConfiguration as BeamspotChainConfiguration
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainMerging import mergeChainDefs
+
+
+from AthenaCommon.Logging import logging
+log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.generateChainConfigs' )
+log.info("Importing %s",__name__)
+
+
+
+def generateChainConfigs( chainDict ):
+
+    import pprint
+    pprint.pprint( chainDict )
+
+    listOfChainDicts = splitChainDict(chainDict)
+    log.debug("Will generate Config for streamer: ",chainDict['chainName'])
+
+    listOfChainDefs = []
+        
+    #streamers will never have more than one chainPart but this is still
+    #needed to move to the correct format [{}]->{}
+    for subChainDict in listOfChainDicts:
+        
+        Beamspot = BeamspotChainConfiguration(subChainDict).assembleChain() 
+
+        listOfChainDefs += [Beamspot]
+        log.debug('length of chaindefs %s', len(listOfChainDefs) )
+
+    if len(listOfChainDefs)>1:
+        log.warning("This is a streamer with more than one chainPart, is this really intended?")
+        theChainDef = mergeChainDefs(listOfChainDefs, chainDict)
+    else:
+        theChainDef = listOfChainDefs[0]
+
+    log.debug("theChainDef %s" , theChainDef)
+
+    return theChainDef

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py

@@ -48,7 +48,7 @@ class GenerateMenuMT(object):
         self.allSignatures = ['Egamma', 'Muon', 'Jet', 'Bjet', 'Bphysics', 'MET', 'Tau', 
                               'HeavyIon', 'Beamspot', 'Cosmic', 'EnhancedBias', 
                               'Monitor', 'Calib', 'Streaming', 'Combined'] #, AFP
-        self.calibCosmicMonSigs = ['Streaming','Monitor'] #others not implemented yet ['Beamspot', 'Cosmic', 'EnhancedBias', 'Monitor', 'Calib', 'Streaming']
+        self.calibCosmicMonSigs = ['Streaming','Monitor','Beamspot'] #others not implemented yet ['Beamspot', 'Cosmic', 'EnhancedBias', 'Monitor', 'Calib', 'Streaming']
 
         # flags
         self.doEgammaChains         = True

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py

@@ -189,8 +189,12 @@ def setupMenu():
         #ChainProp(name='HLT_e8_etcut1step_j85_L1EM3_J20', l1SeedThresholds=['EM3', 'J20'], stream=[PhysicsStream], groups=MultiElectronGroup),  
    ]
     TriggerFlags.HeavyIonSlice.signatures  = []
-    TriggerFlags.BeamspotSlice.signatures  = []   
-    TriggerFlags.MinBiasSlice.signatures   = []    
+    TriggerFlags.BeamspotSlice.signatures  = [
+        ChainProp(name='HLT_beamspot_allTE_trkfast_L1J15',  l1SeedThresholds=[''], stream=['BeamSpot'], groups=['RATE:BeamSpot',  'BW:BeamSpot']),
+        #ChainProp(name='HLT_beamspot_activeTE_trkfast_L1J15',  l1SeedThresholds=[''], stream=['BeamSpot'], groups=['RATE:BeamSpot',  'BW:BeamSpot']),
+        #ChainProp(name='HLT_beamspot_trkFS_trkfast_L1J15',  l1SeedThresholds=[''], stream=['BeamSpot'], groups=['RATE:BeamSpot',  'BW:BeamSpot']),
+    ]
+    TriggerFlags.MinBiasSlice.signatures   = []
     TriggerFlags.CalibSlice.signatures     = []
     TriggerFlags.CosmicSlice.signatures    = []
     TriggerFlags.StreamingSlice.signatures = [