Commit aff4fc7a authored by Vladimir Lyubushkin's avatar Vladimir Lyubushkin
Browse files

fix bug in TrigBphysHypo

parent b9309ca6
...@@ -12,7 +12,7 @@ atlas_add_component( TrigBphysHypo ...@@ -12,7 +12,7 @@ atlas_add_component( TrigBphysHypo
src/*.cxx src/*.cxx
src/components/*.cxx src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} 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: # Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 ) atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration # Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentFactory import CompFactory from AthenaConfiguration.ComponentFactory import CompFactory
from TrigBphysHypo.TrigBphysHypoConf import TrigBmumuxComboHypo, TrigBmumuxComboHypoTool
from TrigBphysHypo.TrigBmumuxComboHypoMonitoringConfig import TrigBmumuxComboHypoMonitoring, TrigBmumuxComboHypoToolMonitoring from TrigBphysHypo.TrigBmumuxComboHypoMonitoringConfig import TrigBmumuxComboHypoMonitoring, TrigBmumuxComboHypoToolMonitoring
from AthenaCommon.Logging import logging from AthenaCommon.Logging import logging
...@@ -13,14 +12,12 @@ def BmumuxComboHypoCfg(name): ...@@ -13,14 +12,12 @@ def BmumuxComboHypoCfg(name):
suffix = 'Bmumux' suffix = 'Bmumux'
from TrkExTools.AtlasExtrapolator import AtlasExtrapolator from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
from TrkVKalVrtFitter.TrkVKalVrtFitterConf import Trk__TrkVKalVrtFitter
vertexFitter = CompFactory.Trk__TrkVKalVrtFitter( vertexFitter = CompFactory.Trk__TrkVKalVrtFitter(
name = 'TrigBphysFitter_'+suffix, name = 'TrigBphysFitter_'+suffix,
FirstMeasuredPoint = False, FirstMeasuredPoint = False,
MakeExtendedVertex = False, MakeExtendedVertex = False,
Extrapolator = AtlasExtrapolator()) Extrapolator = AtlasExtrapolator())
from InDetConversionFinderTools.InDetConversionFinderToolsConf import InDet__VertexPointEstimator
vertexPointEstimator = CompFactory.InDet__VertexPointEstimator( vertexPointEstimator = CompFactory.InDet__VertexPointEstimator(
name = 'VertexPointEstimator_'+suffix, name = 'VertexPointEstimator_'+suffix,
MinDeltaR = [-10000., -10000., -10000.], MinDeltaR = [-10000., -10000., -10000.],
...@@ -28,7 +25,6 @@ def BmumuxComboHypoCfg(name): ...@@ -28,7 +25,6 @@ def BmumuxComboHypoCfg(name):
MaxPhi = [ 10000., 10000., 10000.], MaxPhi = [ 10000., 10000., 10000.],
MaxChi2OfVtxEstimation = 2000.) MaxChi2OfVtxEstimation = 2000.)
from TrackToVertex.TrackToVertexConf import Reco__TrackToVertex
trackToVertexTool = CompFactory.Reco__TrackToVertex( trackToVertexTool = CompFactory.Reco__TrackToVertex(
name = 'TrackToVertexTool_'+suffix, name = 'TrackToVertexTool_'+suffix,
Extrapolator = AtlasExtrapolator()) Extrapolator = AtlasExtrapolator())
......
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration # Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentFactory import CompFactory from AthenaConfiguration.ComponentFactory import CompFactory
from TrigBphysHypo.TrigBphysHypoConf import TrigBphysStreamerHypoTool
def TrigBphysStreamerHypoToolFromDict(chainDict): def TrigBphysStreamerHypoToolFromDict(chainDict):
tool = CompFactory.TrigBphysStreamerHypoTool(chainDict['chainName']) tool = CompFactory.TrigBphysStreamerHypoTool(chainDict['chainName'])
......
# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration # Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentFactory import CompFactory from AthenaConfiguration.ComponentFactory import CompFactory
from TrigBphysHypo.TrigBphysHypoConf import TrigMultiTrkComboHypo, TrigMultiTrkComboHypoTool
from TrigBphysHypo.TrigMultiTrkComboHypoMonitoringConfig import TrigMultiTrkComboHypoMonitoring, TrigMultiTrkComboHypoToolMonitoring from TrigBphysHypo.TrigMultiTrkComboHypoMonitoringConfig import TrigMultiTrkComboHypoMonitoring, TrigMultiTrkComboHypoToolMonitoring
from AthenaCommon.Logging import logging from AthenaCommon.Logging import logging
...@@ -61,14 +60,12 @@ class TrigMultiTrkComboHypoConfig(object): ...@@ -61,14 +60,12 @@ class TrigMultiTrkComboHypoConfig(object):
raise Exception('TrigMultiTrkComboHypo.trigLevel should be L2 or EF, but %s provided.', trigLevel) raise Exception('TrigMultiTrkComboHypo.trigLevel should be L2 or EF, but %s provided.', trigLevel)
from TrkExTools.AtlasExtrapolator import AtlasExtrapolator from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
from TrkVKalVrtFitter.TrkVKalVrtFitterConf import Trk__TrkVKalVrtFitter
VertexFitter = CompFactory.Trk__TrkVKalVrtFitter( VertexFitter = CompFactory.Trk__TrkVKalVrtFitter(
name = 'TrigBphysFitter_'+trigSequenceName+trigLevel, name = 'TrigBphysFitter_'+trigSequenceName+trigLevel,
FirstMeasuredPoint = False, FirstMeasuredPoint = False,
MakeExtendedVertex = False, MakeExtendedVertex = False,
Extrapolator = AtlasExtrapolator()) Extrapolator = AtlasExtrapolator())
from InDetConversionFinderTools.InDetConversionFinderToolsConf import InDet__VertexPointEstimator
VertexPointEstimator = CompFactory.InDet__VertexPointEstimator( VertexPointEstimator = CompFactory.InDet__VertexPointEstimator(
name = 'VertexPointEstimator_'+trigSequenceName+trigLevel, name = 'VertexPointEstimator_'+trigSequenceName+trigLevel,
MinDeltaR = [-10000., -10000., -10000.], MinDeltaR = [-10000., -10000., -10000.],
......
...@@ -99,6 +99,6 @@ def getDefaultChainNames(): ...@@ -99,6 +99,6 @@ def getDefaultChainNames():
chains = [] chains = []
if bphysSlice: if bphysSlice:
for chain in 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) chains.append(chain.name)
return chains return chains
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