Resolution de quelques bugs mineures.

1 files changed, 11 insertions, 3 deletions

diff --git a/src/main/Quadrupole.cc b/src/main/Quadrupole.cc
index 2d73fbb..9b1c3e9 100644
--- a/src/main/Quadrupole.cc
+++ b/src/main/Quadrupole.cc
@@ -5,18 +5,20 @@
  *      Author: jakob
  */
 
+#include <iostream>
+#include <sstream>
 #include "Quadrupole.h"
 
 namespace vhc {
 
-Quadrupole::Quadrupole(const Vector3D& entry, const Vector3D& exit, double sectionRadius, double focusingCoefficient, Element* next):
+Quadrupole::Quadrupole(const Vector3D& entry, const Vector3D& exit, double sectionRadius, double focalizingCoefficient, Element* next):
 		StraightElement(entry, exit, sectionRadius, next),
-		focalizingCoefficient(focusingCoefficient)
+		focalizingCoefficient(focalizingCoefficient)
 	{};
 
 Quadrupole::~Quadrupole() {};
 
-Vector3D Quadrupole::magneticFieldAt(const Vector3D& position) {
+Vector3D Quadrupole::magneticFieldAt(const Vector3D& position) const {
 	Vector3D x = position - getEntryPosition();
 	Vector3D d = getDiagonal().unit();
 	Vector3D y = x - x.dot(d) * d;
@@ -33,6 +35,12 @@ void Quadrupole::setFocalizingCoefficient(double value) {
 }
 
 std::string Quadrupole::getType() const {return "Quadrupole";}
+std::string Quadrupole::toString() const {
+	std::stringstream s;
+	s << Element::toString() << "\n";
+	s << "\tfocalizing coefficient: " << focalizingCoefficient;
+	return s.str();
+}
 
 void Quadrupole::accept(const ElementVisitor& v) const {v.visit(this);}