Merge branch 'zero-counts' into 'master'

Create HypoTools for newJO

See merge request !31284

Trigger/TrigValidation/TrigUpgradeTest/share/newJO_build.ref

 TrigSignatureMo...   INFO Chains passing step (1st row events & 2nd row decision counts):
 TrigSignatureMo...   INFO ChainName                     L1         AfterPS    Step1      Step2      Output     
-TrigSignatureMo...   INFO All                           20         20         -          -          0          
+TrigSignatureMo...   INFO All                           20         20         -          -          8          
 TrigSignatureMo...   INFO HLT_2j35_L1J20 #343439338
 TrigSignatureMo...   INFO -- #343439338 Events          20         20         -          -          0          
 TrigSignatureMo...   INFO -- #343439338 Features                              -          -          
@@ -14,10 +14,10 @@ TrigSignatureMo...   INFO HLT_e7_etcut_L1EM7 #2413188894
 TrigSignatureMo...   INFO -- #2413188894 Events         20         20         -          -          0          
 TrigSignatureMo...   INFO -- #2413188894 Features                             -          -          
 TrigSignatureMo...   INFO HLT_g10_etcut_L1EM7 #2921554308
-TrigSignatureMo...   INFO -- #2921554308 Events         20         20         -          -          0          
+TrigSignatureMo...   INFO -- #2921554308 Events         20         20         -          -          8          
 TrigSignatureMo...   INFO -- #2921554308 Features                             -          -          
 TrigSignatureMo...   INFO HLT_g15_etcut_L1EM12 #2516126262
-TrigSignatureMo...   INFO -- #2516126262 Events         20         20         -          -          0          
+TrigSignatureMo...   INFO -- #2516126262 Events         20         20         -          -          5          
 TrigSignatureMo...   INFO -- #2516126262 Features                             -          -          
 TrigSignatureMo...   INFO HLT_j45_L1J20 #1247336154
 TrigSignatureMo...   INFO -- #1247336154 Events         20         20         -          -          0          

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/generateElectron.py

@@ -38,6 +38,8 @@ def generateChains( flags,  chainDict ):
                                      HypoToolGen = TrigL2CaloHypoToolFromDict, 
                                      CA = accCalo)
 
+    fastCaloSequence.createHypoTools(chainDict)
+
     accCalo.printConfig()
 
     fastCaloStep = ChainStep(firstStepName, [fastCaloSequence])
@@ -61,8 +63,8 @@ def generateChains( flags,  chainDict ):
     fakeHypoAlg = fakeHypoAlgCfg(flags, name='FakeHypoForElectron')
 
 
-    def makeFakeHypoTool(name, cfg):
-        return HLTTest__TestHypoTool(name)
+    def makeFakeHypoTool(chainDict, cfg = None):
+        return HLTTest__TestHypoTool(chainDict['chainName'])
 
     accTrk.addEventAlgo(fakeHypoAlg, sequenceName=stepView.getName())
 
@@ -72,6 +74,8 @@ def generateChains( flags,  chainDict ):
                                       HypoToolGen = makeFakeHypoTool,
                                       CA = accTrk)
 
+    fastInDetSequence.createHypoTools(chainDict)
+
     fastInDetStep = ChainStep( secondStepName, [fastInDetSequence] )
 
     l1Thresholds=[]

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py

@@ -37,6 +37,8 @@ def generateChains( flags, chainDict ):
                                      HypoToolGen = TrigMufastHypoToolFromDict,
                                      CA = acc )
 
+    l2muFastSequence.createHypoTools(chainDict)
+
     l2muFastStep = ChainStep( stepName, [l2muFastSequence] )
 
     ### Set muon step2 ###
@@ -71,8 +73,8 @@ def generateChains( flags, chainDict ):
     # TODO remove once full step is in place
     from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestHypoTool
     fakeHypoAlg = fakeHypoAlgCfg(muonflags, name='FakeHypoForMuon')
-    def makeFakeHypoTool(name, cfg):
-        return HLTTest__TestHypoTool(name)
+    def makeFakeHypoTool(chainDict, cfg=None):
+        return HLTTest__TestHypoTool(chainDict['chainName'])
 
     accMS.addEventAlgo(fakeHypoAlg, sequenceName=stepEFMSView.getName())
 
@@ -82,6 +84,8 @@ def generateChains( flags, chainDict ):
                                      HypoToolGen = makeFakeHypoTool,
                                      CA = accMS )
 
+    efmuMSSequence.createHypoTools(chainDict)
+
     efmuMSStep = ChainStep( stepEFMSName, [efmuMSSequence] )
 
     l1Thresholds=[]

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/generatePhoton.py

@@ -33,6 +33,8 @@ def generateChains(flags, chainDict):
                                      HypoToolGen = TrigL2CaloHypoToolFromDict,
                                      CA = accCalo )
 
+    fastCaloSequence.createHypoTools(chainDict)
+
     fastCaloStep = ChainStep(firstStepName, [fastCaloSequence])
 
 
@@ -57,6 +59,8 @@ def generateChains(flags, chainDict):
                                      HypoToolGen = TrigL2PhotonHypoToolFromDict,
                                      CA = accPhoton )
 
+    l2PhotonSequence.createHypoTools(chainDict)
+
     l2PhotonStep = ChainStep(secondStepName, [l2PhotonSequence])