Skip to content
Snippets Groups Projects
Commit 254c0256 authored by Nicolas Koehler's avatar Nicolas Koehler
Browse files

remove MuonTrackTagTestTool from MuonCombinedFitTagTool

parent 5c786a6d
No related branches found
No related tags found
No related merge requests found
...@@ -37,7 +37,6 @@ namespace MuonCombined { ...@@ -37,7 +37,6 @@ namespace MuonCombined {
ATH_MSG_INFO( "Initializing MuonCombinedFitTagTool - package version " << PACKAGE_VERSION ); ATH_MSG_INFO( "Initializing MuonCombinedFitTagTool - package version " << PACKAGE_VERSION );
ATH_CHECK(m_printer.retrieve()); ATH_CHECK(m_printer.retrieve());
ATH_CHECK(m_tagTool.retrieve());
ATH_CHECK(m_trackBuilder.retrieve()); ATH_CHECK(m_trackBuilder.retrieve());
if(! m_outwardsBuilder.empty() ) ATH_CHECK(m_outwardsBuilder.retrieve()); if(! m_outwardsBuilder.empty() ) ATH_CHECK(m_outwardsBuilder.retrieve());
ATH_CHECK(m_trackQuery.retrieve()); ATH_CHECK(m_trackQuery.retrieve());
...@@ -171,7 +170,6 @@ namespace MuonCombined { ...@@ -171,7 +170,6 @@ namespace MuonCombined {
} }
if( bestCandidate ){ if( bestCandidate ){
double outerMatchChi2 = 1e19;
// take the best MS Track, first the update extrapolated, than the extrapolated, last the spectrometer track // take the best MS Track, first the update extrapolated, than the extrapolated, last the spectrometer track
bool haveME=true; bool haveME=true;
if( !bestMETrack ){ if( !bestMETrack ){
...@@ -181,7 +179,6 @@ namespace MuonCombined { ...@@ -181,7 +179,6 @@ namespace MuonCombined {
} }
if( bestCandidate->indetTrackParticle().trackLink().isValid() && bestMETrack ){ if( bestCandidate->indetTrackParticle().trackLink().isValid() && bestMETrack ){
outerMatchChi2 = m_tagTool->chi2(*bestCandidate->indetTrackParticle().track(),*bestMETrack);
if(msgLevel() >= MSG::DEBUG) { if(msgLevel() >= MSG::DEBUG) {
dumpCaloEloss(bestCombTrack.get(), " bestCandidate Combined Track "); dumpCaloEloss(bestCombTrack.get(), " bestCandidate Combined Track ");
...@@ -192,7 +189,7 @@ namespace MuonCombined { ...@@ -192,7 +189,7 @@ namespace MuonCombined {
ATH_MSG_DEBUG("Final combined muon: "<<m_printer->print(*bestCombTrack)); ATH_MSG_DEBUG("Final combined muon: "<<m_printer->print(*bestCombTrack));
ATH_MSG_DEBUG(m_printer->printStations(*bestCombTrack)); ATH_MSG_DEBUG(m_printer->printStations(*bestCombTrack));
ATH_MSG_DEBUG("Combined Muon with ID " << m_printer->print(bestCandidate->indetTrackParticle().perigeeParameters()) 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()); combTracks->push_back(bestCombTrack.release());
ElementLink<TrackCollection> comblink( *combTracks,combTracks->size()-1); ElementLink<TrackCollection> comblink( *combTracks,combTracks->size()-1);
bestTag->setCombinedTrackLink(comblink); bestTag->setCombinedTrackLink(comblink);
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "GaudiKernel/ServiceHandle.h" #include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h" #include "GaudiKernel/ToolHandle.h"
#include "MuonCombinedToolInterfaces/IMuonTrackTagTool.h"
#include "TrkTrack/TrackCollection.h" #include "TrkTrack/TrackCollection.h"
#include "TrkParameters/TrackParameters.h" #include "TrkParameters/TrackParameters.h"
#include "TrkSegment/SegmentCollection.h" #include "TrkSegment/SegmentCollection.h"
...@@ -73,7 +72,6 @@ namespace MuonCombined { ...@@ -73,7 +72,6 @@ namespace MuonCombined {
ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"}; ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
ToolHandle<Muon::MuonEDMPrinterTool> m_printer {this, "Printer", "Muon::MuonEDMPrinterTool/MuonEDMPrinterTool"}; 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_trackBuilder {this, "TrackBuilder", ""};
ToolHandle<Rec::ICombinedMuonTrackBuilder> m_outwardsBuilder {this, "OutwardsTrackBuilder", ""}; ToolHandle<Rec::ICombinedMuonTrackBuilder> m_outwardsBuilder {this, "OutwardsTrackBuilder", ""};
ToolHandle<Rec::IMuonTrackQuery> m_trackQuery {this, "TrackQuery", "Rec::MuonTrackQuery/MuonTrackQuery"}; ToolHandle<Rec::IMuonTrackQuery> m_trackQuery {this, "TrackQuery", "Rec::MuonTrackQuery/MuonTrackQuery"};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment