Commit 378d9531 authored by Raman Sehgal's avatar Raman Sehgal
Browse files

[VECGEOM-425]; Fixed warnings in CoaxialConeImplementation as reported by Gabriele,

               also enabled FPE in unit tests of GenericPolycone & CoaxialCones

[VECGEOM-425]; Minor bug fix in Extent function.
parent 5dd50120
...@@ -68,7 +68,7 @@ void UnplacedGenericPolycone::Extent(Vector3D<Precision> &aMin, Vector3D<Precisi ...@@ -68,7 +68,7 @@ void UnplacedGenericPolycone::Extent(Vector3D<Precision> &aMin, Vector3D<Precisi
* written below can be used. * written below can be used.
*/ */
aMin.Set(-rmax, -rmax, fAMin.z()); aMin.Set(-rmax, -rmax, fAMin.z());
aMin.Set(rmax, rmax, fAMax.z()); aMax.Set(rmax, rmax, fAMax.z());
/*auto coneUnplaced = GeoManager::MakeInstance<UnplacedCone>(0., rmax, 0., rmax, 1., fSPhi, fDPhi); /*auto coneUnplaced = GeoManager::MakeInstance<UnplacedCone>(0., rmax, 0., rmax, 1., fSPhi, fDPhi);
coneUnplaced->Extent(aMin, aMax); coneUnplaced->Extent(aMin, aMax);
aMin.z() = fAMin.z(); aMin.z() = fAMin.z();
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "volumes/EllipticUtilities.h" #include "volumes/EllipticUtilities.h"
#include "volumes/CoaxialCones.h" #include "volumes/CoaxialCones.h"
#include "ApproxEqual.h" #include "ApproxEqual.h"
#include "base/FpeEnable.h"
bool testvecgeom = false; bool testvecgeom = false;
using vecgeom::kInfLength; using vecgeom::kInfLength;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "ApproxEqual.h" #include "ApproxEqual.h"
#include "base/Vector.h" #include "base/Vector.h"
#include "volumes/GenericPolyconeStruct.h" #include "volumes/GenericPolyconeStruct.h"
#include "base/FpeEnable.h"
bool testvecgeom = false; bool testvecgeom = false;
using vecgeom::kInfLength; using vecgeom::kInfLength;
......
...@@ -212,17 +212,6 @@ struct CoaxialConesImplementation { ...@@ -212,17 +212,6 @@ struct CoaxialConesImplementation {
vecCore::MaskedAssign(safety, safeDist > safety, safeDist); vecCore::MaskedAssign(safety, safeDist > safety, safeDist);
} }
} }
template <typename Real_v>
VECGEOM_FORCE_INLINE
VECCORE_ATT_HOST_DEVICE
static Vector3D<Real_v> NormalKernel(UnplacedStruct_t const &coaxialcones, Vector3D<Real_v> const &point,
typename vecCore::Mask_v<Real_v> &valid)
{
// Computes the normal on a surface and returns it as a unit vector
Vector3D<Real_v> normal(0., 0., 0.);
return normal;
}
}; };
} // namespace VECGEOM_IMPL_NAMESPACE } // namespace VECGEOM_IMPL_NAMESPACE
} // namespace vecgeom } // namespace vecgeom
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment