From 8a33f200e7443a007f255bc272e0ae5ab8050d7f Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@uci.edu>
Date: Sat, 24 Mar 2018 14:39:07 -0700
Subject: [PATCH] Remove braced property initialization not supported by 21.0
Gaudi version
Former-commit-id: 0c054b80b4c5ad9c0bbbdf7b603db58687595fea
---
.../src/InDetAdaptiveMultiPriVxFinderTool.cxx | 2 +-
.../TrackDensitySeedFinder.h | 5 +---
.../src/TrackDensitySeedFinder.cxx | 1 +
.../GaussianTrackDensity.h | 15 ++--------
.../src/GaussianDensityTestAlg.cxx | 10 +++++++
.../src/GaussianDensityTestAlg.h | 30 +++++--------------
.../src/GaussianTrackDensity.cxx | 3 ++
7 files changed, 27 insertions(+), 39 deletions(-)
diff --git a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetAdaptiveMultiPriVxFinderTool.cxx b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetAdaptiveMultiPriVxFinderTool.cxx
index 27feffd30f9f..9f0420f1e47b 100755
--- a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetAdaptiveMultiPriVxFinderTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetAdaptiveMultiPriVxFinderTool.cxx
@@ -131,7 +131,7 @@ StatusCode InDetAdaptiveMultiPriVxFinderTool::initialize()
// since some parameters special to an inherited class this method
// will be overloaded by the inherited class
- if (msgLvl(MSG::DEBUG)) printParameterSettings();
+ if (msgLvl(MSG::DEBUG)) m_printParameterSettings();
ATH_MSG_INFO("Initialization successful");
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/TrkVertexSeedFinderTools/TrackDensitySeedFinder.h b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/TrkVertexSeedFinderTools/TrackDensitySeedFinder.h
index 82b5c2a55753..c7013184c152 100755
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/TrkVertexSeedFinderTools/TrackDensitySeedFinder.h
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/TrkVertexSeedFinderTools/TrackDensitySeedFinder.h
@@ -51,10 +51,7 @@ namespace Trk
virtual std::vector<Amg::Vector3D> findMultiSeeds(const std::vector<const Trk::TrackParameters*>& perigeeList,const xAOD::Vertex * constraint=0);
private:
- ToolHandle< IVertexTrackDensityEstimator > m_densityEstimator { this,
- "DensityEstimator",
- "Trk::GaussianTrackDensity",
- "Track density tool" } ;
+ ToolHandle< IVertexTrackDensityEstimator > m_densityEstimator { "DensityEstimator" };
};
}
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/TrackDensitySeedFinder.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/TrackDensitySeedFinder.cxx
index 0a2f9e4f99f1..e5e904ccfd60 100755
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/TrackDensitySeedFinder.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/TrackDensitySeedFinder.cxx
@@ -26,6 +26,7 @@ namespace Trk
AthAlgTool(t,n,p)
{
declareInterface<IVertexSeedFinder>(this);
+ declareProperty( "DensityEstimator", m_densityEstimator );
}
TrackDensitySeedFinder::~TrackDensitySeedFinder() {}
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/GaussianTrackDensity.h b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/GaussianTrackDensity.h
index d61ef0f7570c..3b3a1a6ff8f6 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/GaussianTrackDensity.h
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/GaussianTrackDensity.h
@@ -162,22 +162,13 @@ namespace Trk
// Cuts set by configurable properties
// Maximum allowed d0 significance to use (in sigma)
- Gaudi::Property<double> m_d0MaxSignificance { this,
- "MaxD0Significance",
- 3.5,
- "Maximum radial impact parameter significance to use track" };
+ double m_d0MaxSignificance { 3.5 };
// Tracks within this many sigma(z) are added to weight; increasing cut trades CPU efficiency for improved smoothness in tails
- Gaudi::Property<double> m_z0MaxSignificance { this,
- "MaxZ0Significance",
- 12.0,
- "Maximum longitudinal impact parameter significance to include track in weight"};
+ double m_z0MaxSignificance { 12.0 };
// Assumed shape of density function near peak; Gaussian (true) or parabolic (false)
- Gaudi::Property<bool> m_gaussStep { this,
- "GaussianStep",
- true,
- "Peak search: True means assume Gaussian behavior, False means Newton/parabolic" };
+ bool m_gaussStep { true };
};
}
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.cxx
index 2a6d3f92ae28..c6bfdbb93736 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.cxx
@@ -33,6 +33,8 @@ namespace Trk
GaussianDensityTestAlg::GaussianDensityTestAlg( const std::string& name,
ISvcLocator* pSvcLocator ) :
::AthAlgorithm( name, pSvcLocator ),
+ m_significanceTruthCut(3.0),
+ m_truthVertexTracks(2),
m_useBeamConstraint(true),
m_firstEvent(true),
m_iBeamCondSvc("BeamCondSvc", name),
@@ -41,6 +43,14 @@ GaussianDensityTestAlg::GaussianDensityTestAlg( const std::string& name,
//
// Property declaration
//
+ declareProperty( "SignificanceTruthCut", m_significanceTruthCut );
+ declareProperty( "MinTruthVertexTracks", m_truthVertexTracks );
+ declareProperty( "TrackSelector", m_trackFilter );
+ declareProperty( "Estimator", m_estimator );
+ declareProperty( "IPEstimator", m_ipEstimator );
+ declareProperty( "TrackParticles", m_trackParticlesKey );
+ declareProperty( "TruthEvents", m_truthEventsKey );
+ declareProperty( "TruthPileupEvents", m_pileupEventsKey );
}
// Destructor
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.h b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.h
index 24097ae1e3a1..632c3c13357d 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.h
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.h
@@ -90,29 +90,18 @@ class GaussianDensityTestAlg
///////////////////////////////////////////////////////////////////
private:
// Properties
- Gaudi::Property<double> m_significanceTruthCut { this,
- "SignificanceTruthCut",
- 3.0,
- "Reco track must pass within this many sigma of pp vertex to be good" };
+ double m_significanceTruthCut;
- Gaudi::Property<int> m_truthVertexTracks { this,
- "MinTruthVertexTracks",
- 2,
- "Minimum associated reconstructed tracks for vertex to be considered visible" };
+ int m_truthVertexTracks;
bool m_useBeamConstraint;
bool m_firstEvent;
// Tools
- ToolHandle< InDet::IInDetTrackSelectionTool > m_trackFilter { this, "TrackSelector",
- "InDet::InDetTrackSelectionTool/InDetDetailedTrackSelectionTool",
- "Track selection tool" } ;
+ ToolHandle< InDet::IInDetTrackSelectionTool > m_trackFilter { "InDet::InDetTrackSelectionTool/InDetDetailedTrackSelectionTool" };
+ ToolHandle< Trk::IVertexTrackDensityEstimator > m_estimator { "Trk::GaussianTrackDensity"};
- ToolHandle< Trk::IVertexTrackDensityEstimator > m_estimator { this, "Estimator", "Trk::GaussianTrackDensity",
- "Track density function" };
-
- ToolHandle< Trk::ITrackToVertexIPEstimator > m_ipEstimator { this, "IPEstimator", "Trk::TrackToVertexIPEstimator",
- "Impact point estimator" };
+ ToolHandle< Trk::ITrackToVertexIPEstimator > m_ipEstimator { "Trk::TrackToVertexIPEstimator" };
// Non-property private data
@@ -120,14 +109,11 @@ class GaussianDensityTestAlg
ServiceHandle< ITHistSvc > m_iTHistSvc;
/// Data handle keys
- SG::ReadHandleKey<xAOD::TrackParticleContainer> m_trackParticlesKey { this, "TrackParticles", "InDetTrackParticles",
- "Input track particle collection" };
+ SG::ReadHandleKey<xAOD::TrackParticleContainer> m_trackParticlesKey { "InDetTrackParticles" };
- SG::ReadHandleKey<xAOD::TruthEventContainer> m_truthEventsKey { this, "TruthEvents", "TruthEvents",
- "Key for truth event collection" };
+ SG::ReadHandleKey<xAOD::TruthEventContainer> m_truthEventsKey { "TruthEvents" };
- SG::ReadHandleKey<xAOD::TruthPileupEventContainer> m_pileupEventsKey { this, "TruthPileupEvents", "TruthPileupEvents",
- "Key for truth pileup event collection" };
+ SG::ReadHandleKey<xAOD::TruthPileupEventContainer> m_pileupEventsKey { "TruthPileupEvents" };
/// Histograms and trees
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianTrackDensity.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianTrackDensity.cxx
index 59cb9daeda84..3914bc43a8c5 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianTrackDensity.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianTrackDensity.cxx
@@ -16,6 +16,9 @@ namespace Trk
AthAlgTool(t, n, p), m_maxRange(0.0)
{
declareInterface<IVertexTrackDensityEstimator>(this);
+ declareProperty( "MaxD0Significance", m_d0MaxSignificance );
+ declareProperty( "MaxZ0Significance", m_z0MaxSignificance );
+ declareProperty( "GaussianStep", m_gaussStep );
}
StatusCode GaussianTrackDensity::initialize()
--
GitLab