Commit bbe97f2c authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'implantTranslationCorrection' into 'master' 

Implant translation correction

See merge request allpix-squared/allpix-squared!1040
parents 46b3ef24 cc601635

src/core/geometry/DetectorModel.cpp

+6 −1
Original line number Diff line number Diff line
@@ -325,7 +325,12 @@ std::optional<ROOT::Math::XYZPoint> DetectorModel::Implant::intersect(const ROOT 
    // Shift position to implant coordinate system and apply rotation around z axis!

    if(shape_ == Implant::Shape::RECTANGLE) {

        // Use Liang-Barsky line clipping method:

        return LiangBarsky::closestIntersection(orientation_(direction), orientation_(position - offset_), size_);

        auto intercept = LiangBarsky::closestIntersection(orientation_(direction), orientation_(position - offset_), size_);

        if(intercept.has_value()) {

            // Translate back into local coordinates of the sensor:

            intercept = orientation_.Inverse()(intercept.value()) + offset_;

        }

        return intercept;

    } else if(shape_ == Implant::Shape::ELLIPSE) {

        // Translate so the ellipse is centered at the origin.

        auto pos = orientation_(position - offset_);