From d18ff6e53172e282243a1c711529731d788c1e87 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Tue, 20 Dec 2016 03:38:00 +0100
Subject: [PATCH] 'Changing constness of some interfaces, to deal with tool
handle constness changes.' (MuonCombinedBaseTools-01-06-29)
* Tagging MuonCombinedBaseTools-01-06-29.
* Changing constness of some interfaces, to deal with tool handle
constness changes.
2016-12-16 Will Leight
* Added number of unspoiled CSC hits from combined/ME track as an auxdata
* Tagging as MuonCombinedBaseTools-01-06-28
2016-12-05 Will Leight
* spectrometerFieldIntegral parameter is now filled in MuonCreatorTool
* Tagging as MuonCombinedBaseTools-01-06-27
---
.../MuonCombinedBaseTools/CMakeLists.txt | 3 ++-
.../MuonCombinedBaseTools/cmt/requirements | 1 +
.../src/MuGirlTagTool.cxx | 2 +-
.../MuonCombinedBaseTools/src/MuGirlTagTool.h | 8 +++---
.../src/MuonCaloTagTool.cxx | 6 ++---
.../src/MuonCaloTagTool.h | 14 +++++-----
.../src/MuonCandidateTool.cxx | 2 +-
.../src/MuonCandidateTool.h | 9 ++++---
.../src/MuonCombinedFitTagTool.cxx | 4 +--
.../src/MuonCombinedFitTagTool.h | 11 ++++----
.../src/MuonCombinedStacoTagTool.cxx | 2 +-
.../src/MuonCombinedStacoTagTool.h | 9 ++++---
.../src/MuonCreatorTool.cxx | 27 ++++++++++++++++---
.../src/MuonCreatorTool.h | 3 ++-
14 files changed, 64 insertions(+), 37 deletions(-)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/CMakeLists.txt b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/CMakeLists.txt
index 97ad245a7fb..8c79e8ebac4 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/CMakeLists.txt
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/CMakeLists.txt
@@ -39,6 +39,7 @@ atlas_depends_on_subdirs( PRIVATE
Reconstruction/MuonIdentification/MuonCombinedToolInterfaces
Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerToolInterfaces
Reconstruction/MuonIdentification/muonEvent
+ Reconstruction/MuonIdentification/MuidEvent
Reconstruction/ParticleTruth
Reconstruction/RecoTools/RecoToolInterfaces
Reconstruction/RecoTools/TrackToCalo
@@ -66,5 +67,5 @@ atlas_add_component( MuonCombinedBaseTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} CaloEvent AthLinks AthenaBaseComps Identifier EventPrimitives FourMomUtils xAODCaloEvent xAODEventInfo xAODMuon xAODTracking xAODTruth GaudiKernel MagFieldInterfaces MuonReadoutGeometry MuonIdHelpersLib MuonCompetingRIOsOnTrack MuonRIO_OnTrack MuonSegment MuonRecHelperToolsLib MuonRecToolInterfaces MuonSegmentMakerUtils MuonSelectorToolsLib ICaloTrkMuIdTools MuGirlInterfaces MuidInterfaces MuonCombinedEvent MuonCombinedToolInterfaces muonEvent ParticleTruth RecoToolInterfaces TrackToCaloLib TrkGeometry TrkSurfaces TrkCaloExtension TrkEventPrimitives TrkEventUtils TrkMaterialOnTrack TrkParameters TrkParametersIdentificationHelpers TrkSegment TrkTrack TrkTrackSummary TrkExInterfaces TrkToolInterfaces )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} CaloEvent AthLinks AthenaBaseComps Identifier EventPrimitives FourMomUtils xAODCaloEvent xAODEventInfo xAODMuon xAODTracking xAODTruth GaudiKernel MagFieldInterfaces MuonReadoutGeometry MuonIdHelpersLib MuonCompetingRIOsOnTrack MuonRIO_OnTrack MuonSegment MuonRecHelperToolsLib MuonRecToolInterfaces MuonSegmentMakerUtils MuonSelectorToolsLib ICaloTrkMuIdTools MuGirlInterfaces MuidInterfaces MuonCombinedEvent MuonCombinedToolInterfaces muonEvent MuidEvent ParticleTruth RecoToolInterfaces TrackToCaloLib TrkGeometry TrkSurfaces TrkCaloExtension TrkEventPrimitives TrkEventUtils TrkMaterialOnTrack TrkParameters TrkParametersIdentificationHelpers TrkSegment TrkTrack TrkTrackSummary TrkExInterfaces TrkToolInterfaces )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/cmt/requirements b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/cmt/requirements
index 54581ecb47d..dc2b0c3505c 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/cmt/requirements
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/cmt/requirements
@@ -23,6 +23,7 @@ use MuGirlInterfaces MuGirlInterfaces-* Reconstruction/M
use MuidInterfaces MuidInterfaces-* Reconstruction/MuonIdentification
use MuonCombinedEvent MuonCombinedEvent-* Reconstruction/MuonIdentification
use MuonCombinedToolInterfaces MuonCombinedToolInterfaces-* Reconstruction/MuonIdentification
+use MuidEvent MuidEvent-* Reconstruction/MuonIdentification
use MuonIdHelpers MuonIdHelpers-* MuonSpectrometer
use MuonReadoutGeometry MuonReadoutGeometry-* MuonSpectrometer/MuonDetDescr
use MuonRIO_OnTrack MuonRIO_OnTrack-* MuonSpectrometer/MuonReconstruction/MuonRecEvent
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuGirlTagTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuGirlTagTool.cxx
index 64f27bdb4cd..b984029cc5c 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuGirlTagTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuGirlTagTool.cxx
@@ -50,7 +50,7 @@ namespace MuonCombined {
return StatusCode::SUCCESS;
}
- void MuGirlTagTool::extend( const InDetCandidateCollection& inDetCandidates ) const {
+ void MuGirlTagTool::extend( const InDetCandidateCollection& inDetCandidates ) {
if (m_pMuGirlReconstruction->MuGirlReco(inDetCandidates).isFailure()) {
ATH_MSG_ERROR("MuGirl reconstruction failed!");
}
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuGirlTagTool.h b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuGirlTagTool.h
index c8ac54f2080..2502976d5a1 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuGirlTagTool.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuGirlTagTool.h
@@ -20,13 +20,13 @@ namespace MuonCombined {
public:
MuGirlTagTool(const std::string& type, const std::string& name, const IInterface* parent);
- ~MuGirlTagTool(void); // destructor
+ virtual ~MuGirlTagTool(void); // destructor
- StatusCode initialize();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
/**IMuonCombinedInDetExtensionTool interface: extend ID candidate */
- void extend( const InDetCandidateCollection& inDetCandidates ) const;
+ virtual void extend( const InDetCandidateCollection& inDetCandidates ) override;
private:
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.cxx
index bad6a6ef594..2a0966a3d21 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.cxx
@@ -142,13 +142,13 @@ namespace MuonCombined {
}
- void MuonCaloTagTool::extend( const InDetCandidateCollection& inDetCandidates ) const {
+ void MuonCaloTagTool::extend( const InDetCandidateCollection& inDetCandidates ) {
extend(inDetCandidates, nullptr, nullptr);
}
void MuonCaloTagTool::extend( const InDetCandidateCollection& inDetCandidates,
const CaloCellContainer* caloCellCont,
- const xAOD::CaloClusterContainer* caloClusterCont) const {
+ const xAOD::CaloClusterContainer* caloClusterCont) {
//return;
@@ -361,7 +361,7 @@ namespace MuonCombined {
// applyTrackIsolation check
- bool MuonCaloTagTool::applyTrackIsolation(const xAOD::TrackParticle& tp ) const {
+ bool MuonCaloTagTool::applyTrackIsolation(const xAOD::TrackParticle& tp ) {
if( m_trackIsolationTool.empty() ) return true;
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.h b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.h
index fd522de5cc8..8de9192070f 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.h
@@ -44,17 +44,19 @@ namespace MuonCombined {
public:
MuonCaloTagTool(const std::string& type, const std::string& name, const IInterface* parent);
- ~MuonCaloTagTool(void); // destructor
+ virtual ~MuonCaloTagTool(void); // destructor
- StatusCode initialize();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
/**IMuonCombinedInDetExtensionTool interface: extend ID candidate */
- void extend( const InDetCandidateCollection& inDetCandidates ) const;
+ virtual
+ void extend( const InDetCandidateCollection& inDetCandidates ) override;
+ virtual
void extend( const InDetCandidateCollection& inDetCandidates,
const CaloCellContainer* caloCellContainer,
- const xAOD::CaloClusterContainer* caloClusterContainer) const;
+ const xAOD::CaloClusterContainer* caloClusterContainer) override;
private:
@@ -65,7 +67,7 @@ namespace MuonCombined {
//bool applyEnergyIsolation(const xAOD::IParticle* muon);
bool selectTrack(const Trk::Track* trk, const Trk::Vertex* vertex) const;
bool selectCosmic(const Trk::Track* ptcl) const;
- bool applyTrackIsolation(const xAOD::TrackParticle& tp) const;
+ bool applyTrackIsolation(const xAOD::TrackParticle& tp);
void showTrackInfo(const Trk::TrackParameters* par) const;
// std::vector<DepositInCalo> getDeposits(const xAOD::TrackParticle* tp, const CaloCellContainer* caloCellCont) const;
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCandidateTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCandidateTool.cxx
index 5f5a25d5aca..0f9b86b6282 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCandidateTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCandidateTool.cxx
@@ -53,7 +53,7 @@ namespace MuonCombined {
return StatusCode::SUCCESS;
}
- void MuonCandidateTool::create( const xAOD::TrackParticleContainer& tracks, MuonCandidateCollection& outputCollection ) const {
+ void MuonCandidateTool::create( const xAOD::TrackParticleContainer& tracks, MuonCandidateCollection& outputCollection ) {
ATH_MSG_DEBUG("Producing MuonCandidates for " << tracks.size() );
unsigned int ntracks = 0;
const xAOD::EventInfo* eventInfo;
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCandidateTool.h b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCandidateTool.h
index a814d9c7dde..c7ae8ebc07b 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCandidateTool.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCandidateTool.h
@@ -30,13 +30,14 @@ namespace MuonCombined {
public:
MuonCandidateTool(const std::string& type, const std::string& name, const IInterface* parent);
- ~MuonCandidateTool(void); // destructor
+ virtual ~MuonCandidateTool(void); // destructor
- StatusCode initialize();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
/**IMuonCandidateTool interface: build a MuonCandidateCollection from a TrackCollection of spectrometer tracks */
- void create( const xAOD::TrackParticleContainer& tracks, MuonCandidateCollection& outputCollection ) const;
+ virtual
+ void create( const xAOD::TrackParticleContainer& tracks, MuonCandidateCollection& outputCollection ) override;
private:
ToolHandle<Muon::MuonEDMPrinterTool> m_printer;
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.cxx
index 70d54adda95..83942fb8a30 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.cxx
@@ -107,7 +107,7 @@ namespace MuonCombined {
return StatusCode::SUCCESS;
}
- void MuonCombinedFitTagTool::combine( const MuonCandidate& muonCandidate, const std::vector<InDetCandidate*>& indetCandidates ) {
+ void MuonCombinedFitTagTool::combine( const MuonCandidate& muonCandidate, const std::vector<InDetCandidate*>& indetCandidates ) const {
ATH_MSG_DEBUG("muon candidate: "<<muonCandidate.toString());
@@ -338,7 +338,7 @@ namespace MuonCombined {
}
- void MuonCombinedFitTagTool::evaluateMatchProperties(CombinedFitTag& tag, const Trk::Track& idTrack, const xAOD::TrackParticle& idTrackParticle)
+ void MuonCombinedFitTagTool::evaluateMatchProperties(CombinedFitTag& tag, const Trk::Track& idTrack, const xAOD::TrackParticle& idTrackParticle) const
{
// evaluate field integral and momentum balance significance for combined track
tag.fieldIntegral(m_trackQuery->fieldIntegral(tag.combinedTrack()));
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.h b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.h
index 407e21245d6..ba1dfef1592 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedFitTagTool.h
@@ -50,13 +50,14 @@ namespace MuonCombined {
public:
MuonCombinedFitTagTool(const std::string& type, const std::string& name, const IInterface* parent);
- ~MuonCombinedFitTagTool(void); // destructor
+ virtual ~MuonCombinedFitTagTool(void); // destructor
- StatusCode initialize();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
/**IMuonCombinedTagTool interface: build combined muons from a muon and a vector of indet candidates */
- void combine( const MuonCandidate& muonCandidate, const std::vector<InDetCandidate*>& indetCandidates );
+ virtual
+ void combine( const MuonCandidate& muonCandidate, const std::vector<InDetCandidate*>& indetCandidates ) const override;
private:
@@ -67,7 +68,7 @@ namespace MuonCombined {
bool combinedTrackQualityCheck(const Trk::Track& combinedTrack,
const Trk::Track& indetTrack) const;
- void evaluateMatchProperties(CombinedFitTag& tag, const Trk::Track& idTrack, const xAOD::TrackParticle& idTrackParticle);
+ void evaluateMatchProperties(CombinedFitTag& tag, const Trk::Track& idTrack, const xAOD::TrackParticle& idTrackParticle) const;
bool extrapolatedNeedsRefit(const Trk::Track& combTrack,
const Trk::Track* extrTrack) const;
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedStacoTagTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedStacoTagTool.cxx
index 3747745f733..26ca36f07f7 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedStacoTagTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedStacoTagTool.cxx
@@ -55,7 +55,7 @@ namespace MuonCombined {
return StatusCode::SUCCESS;
}
- void MuonCombinedStacoTagTool::combine( const MuonCandidate& muonCandidate, const std::vector<InDetCandidate*>& indetCandidates ) {
+ void MuonCombinedStacoTagTool::combine( const MuonCandidate& muonCandidate, const std::vector<InDetCandidate*>& indetCandidates ) const {
// only combine if the back extrapolation was successfull
if( !muonCandidate.extrapolatedTrack() ||
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedStacoTagTool.h b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedStacoTagTool.h
index 7871345f5dc..b3d23c5af94 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedStacoTagTool.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCombinedStacoTagTool.h
@@ -36,13 +36,14 @@ namespace MuonCombined {
public:
MuonCombinedStacoTagTool(const std::string& type, const std::string& name, const IInterface* parent);
- ~MuonCombinedStacoTagTool(void); // destructor
+ virtual ~MuonCombinedStacoTagTool(void); // destructor
- StatusCode initialize();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
/**IMuonCombinedTagTool interface: build combined muons from a muon and a vector of indet candidates */
- void combine( const MuonCandidate& muonCandidate, const std::vector<InDetCandidate*>& indetCandidates );
+ virtual
+ void combine( const MuonCandidate& muonCandidate, const std::vector<InDetCandidate*>& indetCandidates ) const override;
private:
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
index 560f67f70ad..cf956f3044b 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
@@ -67,6 +67,7 @@
#include "MuonCompetingRIOsOnTrack/CompetingMuonClustersOnTrack.h"
#include "MuidInterfaces/IMuonTrackQuery.h"
+#include "MuidEvent/FieldIntegral.h"
#include "TrackSegmentAssociationTool.h"
#include "MuonIdHelpers/MuonStationIndex.h"
@@ -170,7 +171,7 @@ namespace MuonCombined {
<< m_applyCaloNoiseCut << " " << m_sigmaCaloNoiseCut);
ATH_CHECK(m_caloMaterialProvider.retrieve());
-
+
return StatusCode::SUCCESS;
}
@@ -543,7 +544,7 @@ namespace MuonCombined {
// Etcore variables for muon
collectCells(*muon,outputData.clusterContainer);
- ATH_MSG_DEBUG("Done creating muon");
+ ATH_MSG_DEBUG("Done creating muon with "<<muon->auxdata<int>("nUnspoiledCscHits")<<" unspoiled csc hits");
return muon;
}
@@ -622,7 +623,6 @@ namespace MuonCombined {
void MuonCreatorTool::addCombinedFit( xAOD::Muon& muon, const CombinedFitTag* tag, OutputData& outputData ) const {
if (!tag){
// init variables if necessary.
-
return;
}
@@ -1039,6 +1039,11 @@ namespace MuonCombined {
ATH_MSG_DEBUG("Adding standalone fit (refitted): pt " << (*link)->pt() << " eta " << (*link)->eta() << " phi " << (*link)->phi() );
//link.toPersistent();
muon.setTrackParticleLink(xAOD::Muon::ExtrapolatedMuonSpectrometerTrackParticle, link );
+ float fieldInt=m_trackQuery->fieldIntegral(*updatedExtrapolatedTrack).betweenSpectrometerMeasurements();
+ muon.setParameter(fieldInt,xAOD::Muon::spectrometerFieldIntegral);
+ //TrackSummary* tsum=updatedExtrapolatedTrack->trackSummary();
+ int nunspoiled=updatedExtrapolatedTrack->trackSummary()->get(Trk::numberOfCscUnspoiltEtaHits);
+ muon.auxdata<int>("nUnspoiledCscHits")=nunspoiled;
}
}
else{ //no refitted track, so add original un-refitted extrapolated track as ME track
@@ -1050,6 +1055,10 @@ namespace MuonCombined {
ATH_MSG_DEBUG("Adding standalone fit (un-refitted): pt " << (*link)->pt() << " eta " << (*link)->eta() << " phi " << (*link)->phi() );
//link.toPersistent();
muon.setTrackParticleLink(xAOD::Muon::ExtrapolatedMuonSpectrometerTrackParticle, link );
+ float fieldInt=m_trackQuery->fieldIntegral(*extrapolatedTrack).betweenSpectrometerMeasurements();
+ muon.setParameter(fieldInt,xAOD::Muon::spectrometerFieldIntegral);
+ int nunspoiled=extrapolatedTrack->trackSummary()->get(Trk::numberOfCscUnspoiltEtaHits);
+ muon.auxdata<int>("nUnspoiledCscHits")=nunspoiled;
}
}
}
@@ -1063,8 +1072,14 @@ namespace MuonCombined {
ATH_MSG_DEBUG("Adding standalone fit: pt " << (*link)->pt() << " eta " << (*link)->eta() << " phi " << (*link)->phi() );
//link.toPersistent();
muon.setTrackParticleLink(xAOD::Muon::ExtrapolatedMuonSpectrometerTrackParticle, link );
+ float fieldInt=m_trackQuery->fieldIntegral(*extrapolatedTrack).betweenSpectrometerMeasurements();
+ muon.setParameter(fieldInt,xAOD::Muon::spectrometerFieldIntegral);
+ int nunspoiled=extrapolatedTrack->trackSummary()->get(Trk::numberOfCscUnspoiltEtaHits);
+ muon.auxdata<int>("nUnspoiledCscHits")=nunspoiled;
+ }
+ else{
+ ATH_MSG_WARNING("failed to create ME track particle for SA muon");
}
- else ATH_MSG_WARNING("failed to create ME track particle for SA muon");
}
}
}
@@ -1420,6 +1435,10 @@ namespace MuonCombined {
if( !m_trackSegmentAssociationTool.empty() ) addSegmentsOnTrack(muon);
+ if(!muon.isAvailable<int>("nUnspoiledCscHits")){
+ muon.auxdata<int>("nUnspoiledCscHits")=-999;
+ }
+
return true;
}
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.h b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.h
index 2a409d536aa..1170502249c 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.h
@@ -190,7 +190,8 @@ namespace MuonCombined {
ToolHandle<Rec::IMuonPrintingTool> m_muonPrinter;
ToolHandle<Trk::IParticleCaloExtensionTool> m_caloExtTool;
ToolHandle<Trk::ITrackParticleCreatorTool> m_particleCreator;
- ToolHandle<Trk::ITrackAmbiguityProcessorTool> m_ambiguityProcessor;
+ // FIXME mutable
+ mutable ToolHandle<Trk::ITrackAmbiguityProcessorTool> m_ambiguityProcessor;
ToolHandle<Trk::IPropagator> m_propagator;
ToolHandle<xAOD::IMuonDressingTool> m_muonDressingTool;
ToolHandle<Rec::IMuonMomentumBalanceSignificance> m_momentumBalanceTool;
--
GitLab