From e3dea7772b5b938dc1c06ff22b38c01850ca3107 Mon Sep 17 00:00:00 2001
From: John Derek Chapman <chapman@hep.phy.cam.ac.uk>
Date: Fri, 23 Mar 2018 20:03:51 +0000
Subject: [PATCH] Merge branch 'add_NSW_to_MuonAmbiTrackSelectionTool' into
'21.3'
Adding MM and sTGC to the list of precision detectors in MuonAmbiTrackSelectionTool
See merge request atlas/athena!9877
(cherry picked from commit 127d181c7ee270af7f3b6ec52a5262357d145acc [formerly d524be3dbc584ef020781ae42aa7f465be492546])
c91c9278 Adding MM and sTGC to the list of precision detectors in MuonAmbiTrackSelectionTool
Former-commit-id: 3fa732ee289afa487b1cedef130abbd763c42ac6
---
.../src/MuonAmbiTrackSelectionTool.cxx | 4 ++--
.../share/LUT_mc12.root | Bin
2 files changed, 2 insertions(+), 2 deletions(-)
mode change 100755 => 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/src/MuonAmbiTrackSelectionTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/src/MuonAmbiTrackSelectionTool.cxx
index 16e55ebeb29..82a888c387e 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/src/MuonAmbiTrackSelectionTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/src/MuonAmbiTrackSelectionTool.cxx
@@ -128,7 +128,7 @@ const Trk::Track* Muon::MuonAmbiTrackSelectionTool::getCleanedOutTrack(const Trk
const Trk::RIO_OnTrack* rot = &competingROT->rioOnTrack(i);
if( !rot || !rot->prepRawData() || !m_idHelperTool->isMuon(rot->identify()) ) continue;
//only use precision hits for muon track overlap
- if(!m_idHelperTool->isMdt(rot->identify()) && !(m_idHelperTool->isCsc(rot->identify()) && !m_idHelperTool->measuresPhi(rot->identify()))) continue;
+ if(!m_idHelperTool->isMdt(rot->identify()) && !(m_idHelperTool->isCsc(rot->identify()) && !m_idHelperTool->measuresPhi(rot->identify())) && !m_idHelperTool->isMM(rot->identify()) && !m_idHelperTool->issTgc(rot->identify())) continue;
Muon::MuonStationIndex::StIndex stIndex = m_idHelperTool->stationIndex(rot->identify());
++precisionPerLayer[stIndex];
if ( m_assoTool->isUsed(*(rot->prepRawData()))) {
@@ -141,7 +141,7 @@ const Trk::Track* Muon::MuonAmbiTrackSelectionTool::getCleanedOutTrack(const Trk
}else{
if(!m_idHelperTool->isMuon(rot->identify())) continue;
- if(!m_idHelperTool->isMdt(rot->identify()) && !(m_idHelperTool->isCsc(rot->identify()) && !m_idHelperTool->measuresPhi(rot->identify()))) continue; //only precision hits used for overlap
+ if(!m_idHelperTool->isMdt(rot->identify()) && !(m_idHelperTool->isCsc(rot->identify()) && !m_idHelperTool->measuresPhi(rot->identify())) && !m_idHelperTool->isMM(rot->identify()) && !m_idHelperTool->issTgc(rot->identify())) continue; //only precision hits used for overlap
++numhits;
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/LUT_mc12.root
old mode 100755
new mode 100644
--
GitLab