diff --git a/Documentation/Examples/helix_example.cc b/Documentation/Examples/helix_example.cc index ebb5cb4e9d2e4da785d76d960496f9d2074d214e..6a220530586988ff0b528a622eba7296b1fa55e4 100644 --- a/Documentation/Examples/helix_example.cc +++ b/Documentation/Examples/helix_example.cc @@ -1,8 +1,8 @@ #include <Units/PhysicalUnits.h> #include <Geometry/Vector.h> #include <Geometry/CoordinateSystem.h> -#include <Geometry/Helix.h> #include <Geometry/Point.h> +#include <Geometry/Helix.h> #include <cstdlib> #include <iostream> #include <array> diff --git a/Framework/Geometry/Helix.h b/Framework/Geometry/Helix.h index 195ae38653987652989c0e48842b671fa94b85d6..d64df54461422222800f79a69cf1eaa9b726fe38 100644 --- a/Framework/Geometry/Helix.h +++ b/Framework/Geometry/Helix.h @@ -9,7 +9,7 @@ class Helix // TODO: inherit from to-be-implemented "Trajectory" { - using SpeedVec = Vector<Speed>; + using SpeedVec = Vector<Speed::dimension_type>; Point const r0; Frequency const omegaC; @@ -21,7 +21,7 @@ class Helix // TODO: inherit from to-be-implemented "Trajectory" public: Helix(Point const pR0, phys::units::quantity<phys::units::frequency_d> pOmegaC, SpeedVec const pvPar, SpeedVec const pvPerp) : - r0(pR0), omegaC(pOmegaC), vPar(pvPar), vPerp(pvPerp), uPerp(vPerp.cross(vPar.normalized()), + r0(pR0), omegaC(pOmegaC), vPar(pvPar), vPerp(pvPerp), uPerp(vPerp.cross(vPar.normalized())), radius(pvPar.norm() / abs(pOmegaC)) {