Loading src/core/geometry/PixelDetectorModel.cpp +1 −1 Original line number Diff line number Diff line Loading @@ -118,7 +118,7 @@ ROOT::Math::XYZPoint PixelDetectorModel::getSensorIntercept(const ROOT::Math::XY auto translation_local = ROOT::Math::Translation3D(static_cast<ROOT::Math::XYZVector>(getMatrixCenter())); auto intersection_point = LiangBarsky::ClosestIntersection(direction, translation_local.Inverse()(inside), getSensorSize()); LiangBarsky::closestIntersection(direction, translation_local.Inverse()(inside), getSensorSize()); // Get intersection from Liang-Barsky line clipping and re-transform to local coordinates: if(intersection_point) { Loading src/tools/liang_barsky.h +3 −3 Original line number Diff line number Diff line Loading @@ -37,7 +37,7 @@ namespace allpix { * `direction`, with sign of these distances meaning direction w.r.t. line-defining vector or std::nullopt if the * line has no intersection with the given box */ static std::optional<std::pair<double, double>> IntersectionDistances(const ROOT::Math::XYZVector& direction, static std::optional<std::pair<double, double>> intersectionDistances(const ROOT::Math::XYZVector& direction, const ROOT::Math::XYZPoint& position, const ROOT::Math::XYZVector& box) { Loading Loading @@ -87,11 +87,11 @@ namespace allpix { * or std::nullopt if no intersection of track segment with the box volume can be found in positive * direction from the given position. */ static std::optional<ROOT::Math::XYZPoint> ClosestIntersection(const ROOT::Math::XYZVector& direction, static std::optional<ROOT::Math::XYZPoint> closestIntersection(const ROOT::Math::XYZVector& direction, const ROOT::Math::XYZPoint& position, const ROOT::Math::XYZVector& box) { auto intersect = IntersectionDistances(direction, position, box); auto intersect = intersectionDistances(direction, position, box); if(!intersect) { return std::nullopt; Loading Loading
src/core/geometry/PixelDetectorModel.cpp +1 −1 Original line number Diff line number Diff line Loading @@ -118,7 +118,7 @@ ROOT::Math::XYZPoint PixelDetectorModel::getSensorIntercept(const ROOT::Math::XY auto translation_local = ROOT::Math::Translation3D(static_cast<ROOT::Math::XYZVector>(getMatrixCenter())); auto intersection_point = LiangBarsky::ClosestIntersection(direction, translation_local.Inverse()(inside), getSensorSize()); LiangBarsky::closestIntersection(direction, translation_local.Inverse()(inside), getSensorSize()); // Get intersection from Liang-Barsky line clipping and re-transform to local coordinates: if(intersection_point) { Loading
src/tools/liang_barsky.h +3 −3 Original line number Diff line number Diff line Loading @@ -37,7 +37,7 @@ namespace allpix { * `direction`, with sign of these distances meaning direction w.r.t. line-defining vector or std::nullopt if the * line has no intersection with the given box */ static std::optional<std::pair<double, double>> IntersectionDistances(const ROOT::Math::XYZVector& direction, static std::optional<std::pair<double, double>> intersectionDistances(const ROOT::Math::XYZVector& direction, const ROOT::Math::XYZPoint& position, const ROOT::Math::XYZVector& box) { Loading Loading @@ -87,11 +87,11 @@ namespace allpix { * or std::nullopt if no intersection of track segment with the box volume can be found in positive * direction from the given position. */ static std::optional<ROOT::Math::XYZPoint> ClosestIntersection(const ROOT::Math::XYZVector& direction, static std::optional<ROOT::Math::XYZPoint> closestIntersection(const ROOT::Math::XYZVector& direction, const ROOT::Math::XYZPoint& position, const ROOT::Math::XYZVector& box) { auto intersect = IntersectionDistances(direction, position, box); auto intersect = intersectionDistances(direction, position, box); if(!intersect) { return std::nullopt; Loading