From 254c025660888a123fad885b7215da8dba3d7251 Mon Sep 17 00:00:00 2001
From: Nicolas Koehler <nicolas.koehler@cern.ch>
Date: Thu, 3 Dec 2020 19:01:21 +0000
Subject: [PATCH] remove MuonTrackTagTestTool from MuonCombinedFitTagTool

---
 .../MuonCombinedBaseTools/src/MuonCombinedFitTagTool.cxx     | 5 +----
 .../MuonCombinedBaseTools/src/MuonCombinedFitTagTool.h       | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.cxx
index 4e9cd12b48ec..c9b468236d84 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.cxx
@@ -37,7 +37,6 @@ namespace MuonCombined {
     ATH_MSG_INFO( "Initializing MuonCombinedFitTagTool - package version " << PACKAGE_VERSION );
     
     ATH_CHECK(m_printer.retrieve());
-    ATH_CHECK(m_tagTool.retrieve());
     ATH_CHECK(m_trackBuilder.retrieve());
     if(! m_outwardsBuilder.empty() ) ATH_CHECK(m_outwardsBuilder.retrieve());
     ATH_CHECK(m_trackQuery.retrieve());
@@ -171,7 +170,6 @@ namespace MuonCombined {
     }
     
     if( bestCandidate ){
-      double outerMatchChi2 = 1e19;
       // take the best MS Track, first the update extrapolated, than the extrapolated, last the spectrometer track
       bool haveME=true;
       if( !bestMETrack ){
@@ -181,7 +179,6 @@ namespace MuonCombined {
       }
 
       if( bestCandidate->indetTrackParticle().trackLink().isValid() && bestMETrack ){
-        outerMatchChi2 = m_tagTool->chi2(*bestCandidate->indetTrackParticle().track(),*bestMETrack);
         
         if(msgLevel() >= MSG::DEBUG) {
           dumpCaloEloss(bestCombTrack.get(), " bestCandidate Combined Track ");
@@ -192,7 +189,7 @@ namespace MuonCombined {
       ATH_MSG_DEBUG("Final combined muon: "<<m_printer->print(*bestCombTrack));
       ATH_MSG_DEBUG(m_printer->printStations(*bestCombTrack));
       ATH_MSG_DEBUG("Combined Muon with ID " << m_printer->print(bestCandidate->indetTrackParticle().perigeeParameters())
-        << " match chi2 " << bestTag->matchChi2() << " outer match " << outerMatchChi2 );
+        << " match chi2 " << bestTag->matchChi2());
       combTracks->push_back(bestCombTrack.release());
       ElementLink<TrackCollection> comblink( *combTracks,combTracks->size()-1);
       bestTag->setCombinedTrackLink(comblink);
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.h b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.h
index 0926a88c7cea..17cb7d85fd74 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.h
@@ -10,7 +10,6 @@
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ToolHandle.h"
 
-#include "MuonCombinedToolInterfaces/IMuonTrackTagTool.h"
 #include "TrkTrack/TrackCollection.h"
 #include "TrkParameters/TrackParameters.h"
 #include "TrkSegment/SegmentCollection.h"
@@ -73,7 +72,6 @@ namespace MuonCombined {
     ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
 
     ToolHandle<Muon::MuonEDMPrinterTool> m_printer {this, "Printer", "Muon::MuonEDMPrinterTool/MuonEDMPrinterTool"};
-    ToolHandle<MuonCombined::IMuonTrackTagTool> m_tagTool {this, "MuonTrackTagTool", "MuonCombined::MuonTrackTagTestTool/MuonTrackTagTestTool"};
     ToolHandle<Rec::ICombinedMuonTrackBuilder> m_trackBuilder {this, "TrackBuilder", ""};
     ToolHandle<Rec::ICombinedMuonTrackBuilder> m_outwardsBuilder {this, "OutwardsTrackBuilder", ""};
     ToolHandle<Rec::IMuonTrackQuery> m_trackQuery {this, "TrackQuery", "Rec::MuonTrackQuery/MuonTrackQuery"};
-- 
GitLab