diff --git a/MagneticField/ParametrizedEngine/BuildFile.xml b/MagneticField/ParametrizedEngine/BuildFile.xml index f804ba1f835b2..418d402b49658 100644 --- a/MagneticField/ParametrizedEngine/BuildFile.xml +++ b/MagneticField/ParametrizedEngine/BuildFile.xml @@ -2,6 +2,8 @@ + + diff --git a/MagneticField/ParametrizedEngine/plugins/alpaka/ParabolicParametrizedMagneticField.h b/MagneticField/ParametrizedEngine/interface/alpaka/ParabolicParametrizedMagneticField.h similarity index 91% rename from MagneticField/ParametrizedEngine/plugins/alpaka/ParabolicParametrizedMagneticField.h rename to MagneticField/ParametrizedEngine/interface/alpaka/ParabolicParametrizedMagneticField.h index 332737c3a4de1..4c11bd5a31044 100644 --- a/MagneticField/ParametrizedEngine/plugins/alpaka/ParabolicParametrizedMagneticField.h +++ b/MagneticField/ParametrizedEngine/interface/alpaka/ParabolicParametrizedMagneticField.h @@ -6,7 +6,7 @@ #define DataFormats_EgammaReco_plugins_alpaka_MagneticFieldParabolicPortable_h #include -#include "MagneticField/ParametrizedEngine/plugins/ParabolicParametrizedMagneticField.h" +#include "MagneticField/ParametrizedEngine/interface/ParabolicParametrizedMagneticField.h" using Vector3f = Eigen::Matrix; @@ -35,7 +35,6 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE { template ALPAKA_FN_HOST_ACC ALPAKA_FN_INLINE float MagneticFieldAtPoint(V3 vec) { - Parameters p; return B0Z(vec) * Kr(vec); } diff --git a/MagneticField/ParametrizedEngine/plugins/BuildFile.xml b/MagneticField/ParametrizedEngine/plugins/BuildFile.xml index 9e729ef7fa309..951d74f5e6724 100644 --- a/MagneticField/ParametrizedEngine/plugins/BuildFile.xml +++ b/MagneticField/ParametrizedEngine/plugins/BuildFile.xml @@ -1,13 +1,9 @@ - - - - diff --git a/MagneticField/ParametrizedEngine/test/testParabolicParametrizedMagneticField.cc b/MagneticField/ParametrizedEngine/test/testParabolicParametrizedMagneticField.cc new file mode 100644 index 0000000000000..494eabe54aebc --- /dev/null +++ b/MagneticField/ParametrizedEngine/test/testParabolicParametrizedMagneticField.cc @@ -0,0 +1,10 @@ +#include +#include +#include "MagneticField/ParametrizedEngine/interface/alpaka/ParabolicParametrizedMagneticField.h" + +using Vector3f = Eigen::Matrix; +using namespace MagneticFieldParabolicPortable + +Vector3f position{1, 1, 1}; + +assert(MagneticFieldAtPoint(position) == B0Z(position) * Kr(position))