From 27becda76076f42e374b4d10738fdf7ee2f254c6 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Sun, 13 Dec 2020 18:06:05 +0100
Subject: [PATCH] InDetTestBLayerTool. The methods using Trk::ParticleBase most
prb should be unused. Try to remove them
---
.../IInDetTestBLayerTool.h | 26 ++--
.../InDetTestBLayer/InDetTestBLayerTool.h | 29 -----
.../src/InDetTestBLayerTool.cxx | 115 ------------------
3 files changed, 7 insertions(+), 163 deletions(-)
diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h
index a294fbeb9ba..beef2f0ce1e 100755
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h
@@ -12,8 +12,13 @@
#include <vector>
#include <string>
-namespace Trk { class Track; class TrackParticleBase; class IResidualPullCalculator;}
-namespace InDet { class TrackStateOnBLayerInfo; }
+namespace Trk {
+class Track;
+class IResidualPullCalculator;
+}
+namespace InDet {
+class TrackStateOnBLayerInfo;
+}
namespace InDet {
@@ -32,8 +37,6 @@ namespace InDet {
virtual bool expectHitInBLayer(const EventContext& ctx,
const Trk::Track* track,
bool recompute = false) const = 0;
- virtual bool expectHitInBLayer(const Trk::TrackParticleBase*,
- bool recompute = false) const = 0;
bool expectHitInBLayer(const Trk::Track* track, bool recompute = false) const
{
return expectHitInBLayer(Gaudi::Hive::currentContext(), track, recompute);
@@ -42,10 +45,7 @@ namespace InDet {
const Trk::TrackParameters* trackpar) const = 0;
virtual const Trk::ResidualPull* bLayerHitResidual(const Trk::Track* ) const=0;
- virtual const Trk::ResidualPull* bLayerHitResidual(const Trk::TrackParticleBase*) const=0;
- virtual bool getTrackStateOnBlayerInfo(const Trk::TrackParticleBase*,
- std::vector<TrackStateOnBLayerInfo>& infoList) const=0;
virtual bool getTrackStateOnBlayerInfo(const Trk::Track*,
std::vector<TrackStateOnBLayerInfo>& infoList) const=0;
virtual bool getTrackStateOnBlayerInfo(const Trk::TrackParameters* trackpar,
@@ -55,9 +55,6 @@ namespace InDet {
const EventContext& ctx,
const Trk::Track* track,
bool recompute = false) const = 0;
- virtual bool expectHitInInnermostPixelLayer(
- const Trk::TrackParticleBase*,
- bool recompute = false) const = 0;
bool expectHitInInnermostPixelLayer(const Trk::Track* track,
bool recompute = false) const
{
@@ -68,10 +65,7 @@ namespace InDet {
const Trk::TrackParameters* trackpar) const = 0;
virtual const Trk::ResidualPull* innermostPixelLayerHitResidual(const Trk::Track* ) const=0;
- virtual const Trk::ResidualPull* innermostPixelLayerHitResidual(const Trk::TrackParticleBase*) const=0;
- virtual bool getTrackStateOnInnermostPixelLayerInfo(const Trk::TrackParticleBase*,
- std::vector<TrackStateOnBLayerInfo>& infoList) const=0;
virtual bool getTrackStateOnInnermostPixelLayerInfo(const Trk::Track*,
std::vector<TrackStateOnBLayerInfo>& infoList) const=0;
virtual bool getTrackStateOnInnermostPixelLayerInfo(const Trk::TrackParameters* trackpar,
@@ -81,9 +75,6 @@ namespace InDet {
const EventContext& ctx,
const Trk::Track* track,
bool recompute = false) const = 0;
- virtual bool expectHitInNextToInnermostPixelLayer(
- const Trk::TrackParticleBase*,
- bool recompute = false) const = 0;
bool expectHitInNextToInnermostPixelLayer(const Trk::Track* track,
bool recompute = false) const
{
@@ -95,10 +86,7 @@ namespace InDet {
virtual const Trk::ResidualPull* nextToInnermostPixelLayerHitResidual(
const Trk::Track*) const = 0;
- virtual const Trk::ResidualPull* nextToInnermostPixelLayerHitResidual(const Trk::TrackParticleBase*) const=0;
- virtual bool getTrackStateOnNextToInnermostPixelLayerInfo(const Trk::TrackParticleBase*,
- std::vector<TrackStateOnBLayerInfo>& infoList) const=0;
virtual bool getTrackStateOnNextToInnermostPixelLayerInfo(const Trk::Track*,
std::vector<TrackStateOnBLayerInfo>& infoList) const=0;
virtual bool getTrackStateOnNextToInnermostPixelLayerInfo(const Trk::TrackParameters* trackpar,
diff --git a/InnerDetector/InDetRecTools/InDetTestBLayer/InDetTestBLayer/InDetTestBLayerTool.h b/InnerDetector/InDetRecTools/InDetTestBLayer/InDetTestBLayer/InDetTestBLayerTool.h
index 3e42bc06d7a..2924eb9357d 100644
--- a/InnerDetector/InDetRecTools/InDetTestBLayer/InDetTestBLayer/InDetTestBLayerTool.h
+++ b/InnerDetector/InDetRecTools/InDetTestBLayer/InDetTestBLayer/InDetTestBLayerTool.h
@@ -21,7 +21,6 @@
namespace Trk {
class Track;
-class TrackParticleBase;
}
namespace Rec { class TrackParticle; }
class AtlasDetectorID;
@@ -45,18 +44,13 @@ namespace InDet {
const Trk::Track*,
bool recompute = false) const override final;
- virtual bool expectHitInBLayer(const Trk::TrackParticleBase*,
- bool recompute = false) const override final;
virtual bool expectHitInBLayer(
const Trk::TrackParameters* trackpar) const override final;
virtual const Trk::ResidualPull* bLayerHitResidual(
const Trk::Track*) const override;
- virtual const Trk::ResidualPull* bLayerHitResidual(const Trk::TrackParticleBase*) const override;
//// return false if extrapolation failed
- virtual bool getTrackStateOnBlayerInfo(const Trk::TrackParticleBase*,
- std::vector<TrackStateOnBLayerInfo>& infoList) const override;
virtual bool getTrackStateOnBlayerInfo(const Trk::Track*,
std::vector<TrackStateOnBLayerInfo>& infoList) const override;
virtual bool getTrackStateOnBlayerInfo(const Trk::TrackParameters* trackpar,
@@ -66,19 +60,11 @@ namespace InDet {
const EventContext& ctx,
const Trk::Track* track,
bool recompute = false) const override final;
- virtual bool expectHitInInnermostPixelLayer(
- const Trk::TrackParticleBase*,
- bool recompute = false) const override final;
virtual bool expectHitInInnermostPixelLayer(
const Trk::TrackParameters* trackpar) const override final;
virtual const Trk::ResidualPull* innermostPixelLayerHitResidual(const Trk::Track*) const override;
- virtual const Trk::ResidualPull* innermostPixelLayerHitResidual(
- const Trk::TrackParticleBase*) const override;
- virtual bool getTrackStateOnInnermostPixelLayerInfo(
- const Trk::TrackParticleBase*,
- std::vector<TrackStateOnBLayerInfo>& infoList) const override;
virtual bool getTrackStateOnInnermostPixelLayerInfo(
const Trk::Track*,
@@ -92,19 +78,11 @@ namespace InDet {
const EventContext& ctx,
const Trk::Track*,
bool recompute = false) const override final;
- virtual bool expectHitInNextToInnermostPixelLayer(
- const Trk::TrackParticleBase*,
- bool recompute = false) const override final;
virtual bool expectHitInNextToInnermostPixelLayer(
const Trk::TrackParameters* trackpar) const override final;
virtual const Trk::ResidualPull* nextToInnermostPixelLayerHitResidual(const Trk::Track*) const override;
- virtual const Trk::ResidualPull* nextToInnermostPixelLayerHitResidual(
- const Trk::TrackParticleBase*) const override;
- virtual bool getTrackStateOnNextToInnermostPixelLayerInfo(
- const Trk::TrackParticleBase*,
- std::vector<TrackStateOnBLayerInfo>& infoList) const override;
virtual bool getTrackStateOnNextToInnermostPixelLayerInfo(
const Trk::Track*,
std::vector<TrackStateOnBLayerInfo>& infoList) const override;
@@ -117,9 +95,6 @@ namespace InDet {
const Trk::Track*,
int layer,
bool recompute = false) const;
- bool expectHitInPixelLayer(const Trk::TrackParticleBase*,
- int layer,
- bool recompute = false) const;
bool expectHitInPixelLayer(const EventContext& ctx,
const Trk::TrackParameters* trackpar,
int layer) const;
@@ -132,11 +107,7 @@ namespace InDet {
const Trk::ResidualPull* pixelLayerHitResidual(const Trk::Track*, int layer) const;
- const Trk::ResidualPull* pixelLayerHitResidual(const Trk::TrackParticleBase*, int layer) const;
- bool getTrackStateOnPixelLayerInfo(const Trk::TrackParticleBase*,
- std::vector<TrackStateOnBLayerInfo>& infoList,
- int layer) const;
bool getTrackStateOnPixelLayerInfo(const Trk::Track*,
std::vector<TrackStateOnBLayerInfo>& infoList,
int layer) const;
diff --git a/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx b/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx
index 53a0749595c..871f24d9eeb 100644
--- a/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx
@@ -133,35 +133,6 @@ namespace InDet {
return StatusCode::SUCCESS;
}
- const Trk::ResidualPull* InDet::InDetTestBLayerTool::bLayerHitResidual(const Trk::TrackParticleBase* trackparticle) const
- {
- return pixelLayerHitResidual(trackparticle,0);
- }
-
- const Trk::ResidualPull* InDet::InDetTestBLayerTool::innermostPixelLayerHitResidual(const Trk::TrackParticleBase* trackparticle) const
- {
- return pixelLayerHitResidual(trackparticle,0);
- }
-
- const Trk::ResidualPull* InDet::InDetTestBLayerTool::nextToInnermostPixelLayerHitResidual(const Trk::TrackParticleBase* trackparticle) const
- {
- return pixelLayerHitResidual(trackparticle,1);
- }
-
- const Trk::ResidualPull* InDet::InDetTestBLayerTool::pixelLayerHitResidual(const Trk::TrackParticleBase* trackparticle, int layer) const
- {
- assert(layer>=0 && layer<=1);
- const Trk::Track* track = trackparticle->originalTrack();
-
- if (!track) {
- ATH_MSG_DEBUG( "No original track, residual calculation for " << s_layerNames[layer] << " can not be performed" );
- return 0;
- }
-
- return(this->pixelLayerHitResidual(track,layer));
- }
-
-
const Trk::ResidualPull* InDet::InDetTestBLayerTool::bLayerHitResidual(const Trk::Track* track) const
{
return pixelLayerHitResidual(track,0);
@@ -295,56 +266,6 @@ namespace InDet {
}
}
- bool InDet::InDetTestBLayerTool::expectHitInBLayer(const Trk::TrackParticleBase* track, bool recompute) const
- {
- return expectHitInPixelLayer(track,0,recompute);
- }
-
- bool InDet::InDetTestBLayerTool::expectHitInInnermostPixelLayer(const Trk::TrackParticleBase* track, bool recompute) const
- {
- return expectHitInPixelLayer(track,0,recompute);
- }
-
-
- bool InDet::InDetTestBLayerTool::expectHitInNextToInnermostPixelLayer(const Trk::TrackParticleBase* track, bool recompute) const
- {
- return expectHitInPixelLayer(track,1,recompute);
- }
-
- bool InDet::InDetTestBLayerTool::expectHitInPixelLayer(const Trk::TrackParticleBase *track, int layer, bool recompute) const {
- assert( layer>=0 && layer<=1);
- if(!recompute){
- const Trk::TrackSummary* ts = track->trackSummary();
- if(ts){
- int ehbl = ts->get(s_layerSummaryTypeExpectHit[layer]);
- if(0==ehbl || 1==ehbl ){
- ATH_MSG_DEBUG("Found the expected hit in the " << s_layerNames[layer] << " info in TrackSummary: return cached value" );
- return ehbl;
- }
- }
- }
- else{
- ATH_MSG_DEBUG("Forced to recompute whether a hit is expected in the " << s_layerNames[layer] << " or not." );
- }
-
- ATH_MSG_DEBUG("Computing whether a hit is expected in the " << s_layerNames[layer] << " or not." );
-
- const Trk::Perigee* mp = track->perigee();
-
- if(!mp)
- {
- //This can happen if re-creating the summary for tracks prior to ambi-solving and final fit, e.g. in StatisticAlg
- ATH_MSG_DEBUG("Found TrackParticle with no perigee parameters: no information whether a hit is expected in the " << s_layerNames[layer] << " will be provided." );
- return false;
- }
- else
- {
- ATH_MSG_DEBUG("TrackParticle perigee parameters");
- // mp->dump(mLog);
- return (this->expectHitInPixelLayer(mp,layer));
- }
- }
-
bool InDet::InDetTestBLayerTool::expectHitInBLayer(const Trk::TrackParameters* trackpar) const
{
@@ -507,42 +428,6 @@ namespace InDet {
}
- bool InDet::InDetTestBLayerTool::getTrackStateOnBlayerInfo(const Trk::TrackParticleBase* trackparticle,
- std::vector<TrackStateOnBLayerInfo>& infoList) const {
- return getTrackStateOnPixelLayerInfo(trackparticle, infoList,0);
- }
-
- bool InDet::InDetTestBLayerTool::getTrackStateOnInnermostPixelLayerInfo(const Trk::TrackParticleBase* trackparticle,
- std::vector<TrackStateOnBLayerInfo>& infoList) const {
- return getTrackStateOnPixelLayerInfo(trackparticle, infoList,0);
- }
-
-
- bool InDet::InDetTestBLayerTool::getTrackStateOnNextToInnermostPixelLayerInfo(const Trk::TrackParticleBase* trackparticle,
- std::vector<TrackStateOnBLayerInfo>& infoList) const {
- return getTrackStateOnPixelLayerInfo(trackparticle, infoList,1);
- }
-
-
- bool InDet::InDetTestBLayerTool::getTrackStateOnPixelLayerInfo(const Trk::TrackParticleBase* track,
- std::vector<TrackStateOnBLayerInfo>& infoList,
- int layer) const
- {
- assert( layer>=0 && layer<=1);
-
- const Trk::Perigee* startParameters = track->perigee();
-
- if(!startParameters){
- //This can happen if re-creating the summary for tracks prior to ambi-solving and final fit, e.g. in StatisticAlg
- ATH_MSG_DEBUG("Found TrackParticle with no perigee parameters: no " << s_layerNames[layer] << " info will be provided");
- return false;
- }
-
- return getTrackStateOnPixelLayerInfo(startParameters, infoList, layer);
-
- }
-
-
bool InDet::InDetTestBLayerTool::getTrackStateOnBlayerInfo(const Trk::TrackParameters* trackpar, std::vector<TrackStateOnBLayerInfo>& infoList) const {
return getTrackStateOnPixelLayerInfo(trackpar,infoList,0);
--
GitLab