From be1d9d241fb90bb913a4e10ba00c9c6cb005de65 Mon Sep 17 00:00:00 2001
From: Andreas Salzburger <Andreas.Salzburger@cern.ch>
Date: Wed, 11 Oct 2017 17:08:18 +0200
Subject: [PATCH] Change to Acts::concept::AnyCellLookup
---
Examples/BField/src/BFieldAccessExample.cpp | 9 +++++----
Examples/CMakeLists.txt | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Examples/BField/src/BFieldAccessExample.cpp b/Examples/BField/src/BFieldAccessExample.cpp
index 698c7ae9..cc847be6 100644
--- a/Examples/BField/src/BFieldAccessExample.cpp
+++ b/Examples/BField/src/BFieldAccessExample.cpp
@@ -11,6 +11,7 @@
#include "ACTFW/Random/RandomNumbersOptions.hpp"
#include "ACTFW/Plugins/BField/BFieldOptions.hpp"
#include "ACTFW/Plugins/BField/RootInterpolatedBFieldWriter.hpp"
+#include "ACTS/MagneticField/concept/AnyFieldLookup.hpp"
#include "ACTS/Utilities/Units.hpp"
/// The main executable
@@ -25,10 +26,10 @@ namespace po = boost::program_options;
using UniformDist = std::uniform_real_distribution<double>;
using RandomEngine = std::mt19937;
-template <typename Field, typename Cell >
+template <typename Field>
Acts::Vector3D
accessFieldCell(Field& bField,
- Cell& cell,
+ Acts::concept::AnyFieldCell<>& cell,
size_t istep,
const Acts::Vector3D& position)
{
@@ -76,9 +77,9 @@ accessStepWise(Field& bField,
for (size_t istep = 0; istep < access_steps; ++istep){
Acts::Vector3D position = currentStep * dir;
// access the field directly
- auto field_direct = accessFieldDirect(bField, position);
+ auto field_direct = accessFieldDirect<Field>(bField, position);
// access the field with the cell
- auto field_cell = accessFieldCell(bField, cell, istep, position);
+ auto field_cell = accessFieldCell<Field>(bField, cell, istep, position);
// check
if (!field_direct.isApprox(field_cell)){
++mismatched;
diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
index 49ac698c..fa285618 100644
--- a/Examples/CMakeLists.txt
+++ b/Examples/CMakeLists.txt
@@ -2,7 +2,7 @@ add_subdirectory(Extrapolation)
add_subdirectory(Fatras)
add_subdirectory(GeometryBuilding)
add_subdirectory(HelloWorld)
-#add_subdirectory_if(MaterialMapping USE_DD4HEP AND USE_GEANT4)
+add_subdirectory_if(MaterialMapping USE_DD4HEP AND USE_GEANT4)
add_subdirectory(RandomNumbers)
add_subdirectory_if(ReadEvgen USE_PYTHIA8)
add_subdirectory(WhiteBoard)
--
GitLab