fix bug in TrigBphysHypo

Trigger/TrigHypothesis/TrigBphysHypo/CMakeLists.txt

@@ -12,7 +12,7 @@ atlas_add_component( TrigBphysHypo
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthLinks AthViews AthenaBaseComps AthenaKernel AthenaMonitoringKernelLib BeamSpotConditionsData DecisionHandlingLib InDetConversionFinderToolsLib ITrackToVertex TrigCompositeUtilsLib TrigConfHLTData  TrkVKalVrtFitterLib xAODEgamma xAODEventInfo xAODMuon xAODTracking xAODTrigBphys xAODTrigger )
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthLinks AthViews AthenaBaseComps AthenaKernel AthenaMonitoringKernelLib BeamSpotConditionsData DecisionHandlingLib InDetConversionFinderToolsLib ITrackToVertex TrigCompositeUtilsLib TrigConfHLTData  TrkVKalVrtFitterLib xAODEgamma xAODEventInfo xAODMuon xAODTracking xAODTrigBphys xAODTrigger xAODTrigMuon )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )

Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBmumuxComboHypoConfig.py

 # Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.ComponentFactory import CompFactory
-from TrigBphysHypo.TrigBphysHypoConf import TrigBmumuxComboHypo, TrigBmumuxComboHypoTool
 from TrigBphysHypo.TrigBmumuxComboHypoMonitoringConfig import TrigBmumuxComboHypoMonitoring, TrigBmumuxComboHypoToolMonitoring
 
 from AthenaCommon.Logging import logging
@@ -13,14 +12,12 @@ def BmumuxComboHypoCfg(name):
     suffix = 'Bmumux'
 
     from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
-    from TrkVKalVrtFitter.TrkVKalVrtFitterConf import Trk__TrkVKalVrtFitter
     vertexFitter = CompFactory.Trk__TrkVKalVrtFitter(
         name = 'TrigBphysFitter_'+suffix,
         FirstMeasuredPoint = False,
         MakeExtendedVertex = False,
         Extrapolator = AtlasExtrapolator())
 
-    from InDetConversionFinderTools.InDetConversionFinderToolsConf import InDet__VertexPointEstimator
     vertexPointEstimator = CompFactory.InDet__VertexPointEstimator(
         name = 'VertexPointEstimator_'+suffix,
         MinDeltaR = [-10000., -10000., -10000.],
@@ -28,7 +25,6 @@ def BmumuxComboHypoCfg(name):
         MaxPhi    = [ 10000.,  10000.,  10000.],
         MaxChi2OfVtxEstimation = 2000.)
 
-    from TrackToVertex.TrackToVertexConf import Reco__TrackToVertex
     trackToVertexTool = CompFactory.Reco__TrackToVertex(
         name = 'TrackToVertexTool_'+suffix,
         Extrapolator = AtlasExtrapolator())

Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBphysStreamerHypoConfig.py

 # Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.ComponentFactory import CompFactory
-from TrigBphysHypo.TrigBphysHypoConf import TrigBphysStreamerHypoTool
 
 def TrigBphysStreamerHypoToolFromDict(chainDict):
     tool = CompFactory.TrigBphysStreamerHypoTool(chainDict['chainName'])

Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py

 # Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.ComponentFactory import CompFactory
-from TrigBphysHypo.TrigBphysHypoConf import TrigMultiTrkComboHypo, TrigMultiTrkComboHypoTool
 from TrigBphysHypo.TrigMultiTrkComboHypoMonitoringConfig import TrigMultiTrkComboHypoMonitoring, TrigMultiTrkComboHypoToolMonitoring
 
 from AthenaCommon.Logging import logging
@@ -61,14 +60,12 @@ class TrigMultiTrkComboHypoConfig(object):
             raise Exception('TrigMultiTrkComboHypo.trigLevel should be L2 or EF, but %s provided.', trigLevel)
 
         from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
-        from TrkVKalVrtFitter.TrkVKalVrtFitterConf import Trk__TrkVKalVrtFitter
         VertexFitter = CompFactory.Trk__TrkVKalVrtFitter(
             name = 'TrigBphysFitter_'+trigSequenceName+trigLevel,
             FirstMeasuredPoint = False,
             MakeExtendedVertex = False,
             Extrapolator = AtlasExtrapolator())
 
-        from InDetConversionFinderTools.InDetConversionFinderToolsConf import InDet__VertexPointEstimator
         VertexPointEstimator = CompFactory.InDet__VertexPointEstimator(
             name = 'VertexPointEstimator_'+trigSequenceName+trigLevel,
             MinDeltaR = [-10000., -10000., -10000.],

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsSequenceSetup.py

@@ -99,6 +99,6 @@ def getDefaultChainNames():
     chains = []
     if bphysSlice:
         for chain in bphysSlice:
-            if any(x in chain.name for x in ['bJpsi', 'bUpsi', 'bDimu', 'bBmu', 'bPhi', 'bTau']) and not 'l2io' in chain.name:
+            if any(x in chain.name for x in ['bJpsi', 'bUpsi', 'bDimu', 'bBmu', 'bPhi', 'bTau']) and 'l2io' not in chain.name:
                 chains.append(chain.name)
     return chains