From 07268ba451797bb45b726f968847e2262f369f2c Mon Sep 17 00:00:00 2001
From: Paul Gessinger-Befurt <paul.gessinger@cern.ch>
Date: Tue, 7 Jul 2020 18:57:12 +0000
Subject: [PATCH] Adapt to Acts v0.27.0: Change renamed include
---
Projects/AnalysisBase/externals.txt | 2 +-
Projects/AthDataQuality/externals.txt | 2 +-
Projects/AthGeneration/externals.txt | 2 +-
Projects/AthSimulation/externals.txt | 2 +-
Projects/Athena/externals.txt | 2 +-
Projects/VP1Light/externals.txt | 2 +-
.../Acts/ActsGeometry/src/ActsMaterialMapping.cxx | 2 +-
.../ActsAdaptiveMultiPriVtxFinderTool.h | 2 +-
.../src/ActsAdaptiveMultiPriVtxFinderTool.cxx | 13 ++++---------
9 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt
index dbecc1c4cf5..06ede204c08 100644
--- a/Projects/AnalysisBase/externals.txt
+++ b/Projects/AnalysisBase/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AnalysisBaseExternalsVersion = 2.0.69
+AnalysisBaseExternalsVersion = 2.0.70
diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt
index c5635ff6b2f..b7f3b614e53 100644
--- a/Projects/AthDataQuality/externals.txt
+++ b/Projects/AthDataQuality/externals.txt
@@ -5,4 +5,4 @@
# an "origin/" prefix before it. For tags however this is explicitly
# forbidden.
-AtlasExternalsVersion = 2.0.69
+AtlasExternalsVersion = 2.0.70
diff --git a/Projects/AthGeneration/externals.txt b/Projects/AthGeneration/externals.txt
index a7149c426e5..89f6d7054b3 100644
--- a/Projects/AthGeneration/externals.txt
+++ b/Projects/AthGeneration/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthGenerationExternalsVersion = 2.0.69
+AthGenerationExternalsVersion = 2.0.70
# The version of atlas/Gaudi to use:
GaudiVersion = v33r1.004
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index 81840116e1a..3cf9a994d10 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 2.0.69
+AthSimulationExternalsVersion = 2.0.70
# The version of atlas/Gaudi to use:
GaudiVersion = v33r1.004
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index e3e3a41a5fa..d2894d549da 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 2.0.69
+AthenaExternalsVersion = 2.0.70
# The version of atlas/Gaudi to use:
GaudiVersion = v33r1.004
diff --git a/Projects/VP1Light/externals.txt b/Projects/VP1Light/externals.txt
index 254dc48e8f9..71b7e615652 100644
--- a/Projects/VP1Light/externals.txt
+++ b/Projects/VP1Light/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-VP1LightExternalsVersion = 2.0.68
+VP1LightExternalsVersion = 2.0.70
diff --git a/Tracking/Acts/ActsGeometry/src/ActsMaterialMapping.cxx b/Tracking/Acts/ActsGeometry/src/ActsMaterialMapping.cxx
index 3efd705c4e6..7ecd32bcf82 100755
--- a/Tracking/Acts/ActsGeometry/src/ActsMaterialMapping.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsMaterialMapping.cxx
@@ -31,7 +31,7 @@
#include <string>
//TEST
-#include "Acts/EventData/NeutralParameters.hpp"
+#include "Acts/EventData/NeutralTrackParameters.hpp"
#include "Acts/Propagator/ActionList.hpp"
#include "Acts/Propagator/DebugOutputActor.hpp"
#include "Acts/Propagator/Navigator.hpp"
diff --git a/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h b/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h
index b1755eb8347..d7838e87209 100644
--- a/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h
+++ b/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h
@@ -109,7 +109,7 @@ private:
using Propagator = Acts::Propagator<Acts::EigenStepper<ATLASMagneticFieldWrapper>, Acts::Navigator>;
using TrackLinearizer = Acts::HelicalTrackLinearizer<Propagator>;
using VertexFitter = Acts::AdaptiveMultiVertexFitter<TrackWrapper, TrackLinearizer>;
- using VertexSeedFinder = Acts::TrackDensityVertexFinder<VertexFitter, Acts::GaussianTrackDensity>;
+ using VertexSeedFinder = Acts::TrackDensityVertexFinder<VertexFitter, Acts::GaussianTrackDensity<TrackWrapper>>;
using VertexFinder = Acts::AdaptiveMultiVertexFinder<VertexFitter, VertexSeedFinder>;
std::shared_ptr<VertexFinder> m_vertexFinder = nullptr;
diff --git a/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx b/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx
index 2ca64719ffa..bb9e4153080 100755
--- a/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx
+++ b/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx
@@ -100,14 +100,14 @@ ActsAdaptiveMultiPriVtxFinderTool::initialize()
TrackLinearizer linearizer(ltConfig);
// Set up Gaussian track density
- Acts::GaussianTrackDensity::Config trackDensityConfig;
+ Acts::GaussianTrackDensity<TrackWrapper>::Config trackDensityConfig;
trackDensityConfig.d0MaxSignificance = m_gaussianMaxD0Significance;
trackDensityConfig.z0MaxSignificance = m_gaussianMaxZ0Significance;
- Acts::GaussianTrackDensity trackDensity(trackDensityConfig);
+ Acts::GaussianTrackDensity<TrackWrapper> trackDensity(trackDensityConfig);
// Vertex seed finder
VertexSeedFinder::Config seedFinderConfig;
- seedFinderConfig.trackDensityEstimator = trackDensity;
+ //seedFinderConfig.trackDensityEstimator = trackDensity;
VertexSeedFinder seedFinder(seedFinderConfig, extractParameters);
VertexFinder::Config finderConfig(std::move(fitter), seedFinder,
ipEst, linearizer);
@@ -301,12 +301,7 @@ ActsAdaptiveMultiPriVtxFinderTool::findVertex(const EventContext& ctx, std::vect
xAODVtx->makePrivateStore();
xAODVtx->setPosition(vtx.position());
xAODVtx->setCovariancePosition(vtx.covariance());
- // TODO: remove this 1.e9 subtraction once acts bug fix is in.
- double tempChi2 = vtx.fitQuality().first;
- if(tempChi2 >= 1.e9){
- tempChi2 -= 1.e9;
- }
- xAODVtx->setFitQuality(tempChi2, vtx.fitQuality().second);
+ xAODVtx->setFitQuality(vtx.fitQuality().first, vtx.fitQuality().second);
const auto& tracks = vtx.tracks();
std::vector<Trk::VxTrackAtVertex>* trkAtVtxVec = &(xAODVtx->vxTrackAtVertex());
--
GitLab