From dd4b35e52f8211395d1eb7e87b9471003557779d Mon Sep 17 00:00:00 2001
From: Maximilian Reininghaus <maximilian.reininghaus@kit.edu>
Date: Mon, 20 Aug 2018 14:43:54 +0200
Subject: [PATCH] fixed Helix
---
Documentation/Examples/helix_example.cc | 2 +-
Framework/Geometry/Helix.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/Examples/helix_example.cc b/Documentation/Examples/helix_example.cc
index ebb5cb4e9..6a2205305 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 195ae3865..d64df5446 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))
{
--
GitLab