Commit 45a96375 authored by kraus's avatar kraus
Browse files

fixing bug introduced with rev. 34805a45

parent 6172e02c
...@@ -270,7 +270,7 @@ void OpalBeamline::compute3DLattice() { ...@@ -270,7 +270,7 @@ void OpalBeamline::compute3DLattice() {
sin(0.5 * (0.5 * bendAngle - entranceAngle)) * effectiveRotationAxis); sin(0.5 * (0.5 * bendAngle - entranceAngle)) * effectiveRotationAxis);
Vector_t exitHardEdge = thisLength * directionExitHardEdge.rotate(Vector_t(0, 0, 1)); Vector_t exitHardEdge = thisLength * directionExitHardEdge.rotate(Vector_t(0, 0, 1));
double distanceEntryHETruePath = euclidean_norm(truePath.front()); double distanceEntryHETruePath = euclidean_norm(truePath.front());
double distanceExitHETruePath = euclidean_norm(truePath.back() - exitHardEdge); double distanceExitHETruePath = euclidean_norm(rotationAboutZ.rotate(truePath.back()) - exitHardEdge);
double pathLengthTruePath = (*it).getEnd() - (*it).getStart(); double pathLengthTruePath = (*it).getEnd() - (*it).getStart();
arcLength = pathLengthTruePath - distanceEntryHETruePath - distanceExitHETruePath; arcLength = pathLengthTruePath - distanceEntryHETruePath - distanceExitHETruePath;
} }
...@@ -341,7 +341,7 @@ void OpalBeamline::compute3DLattice() { ...@@ -341,7 +341,7 @@ void OpalBeamline::compute3DLattice() {
sin(0.5 * (0.5 * bendAngle - entranceAngle)) * effectiveRotationAxis); sin(0.5 * (0.5 * bendAngle - entranceAngle)) * effectiveRotationAxis);
Vector_t exitHardEdge = thisLength * directionExitHardEdge.rotate(Vector_t(0, 0, 1)); Vector_t exitHardEdge = thisLength * directionExitHardEdge.rotate(Vector_t(0, 0, 1));
double distanceEntryHETruePath = euclidean_norm(truePath.front()); double distanceEntryHETruePath = euclidean_norm(truePath.front());
double distanceExitHETruePath = euclidean_norm(truePath.back() - exitHardEdge); double distanceExitHETruePath = euclidean_norm(rotationAboutZ.rotate(truePath.back()) - exitHardEdge);
double pathLengthTruePath = (*it).getEnd() - (*it).getStart(); double pathLengthTruePath = (*it).getEnd() - (*it).getStart();
arcLength = pathLengthTruePath - distanceEntryHETruePath - distanceExitHETruePath; arcLength = pathLengthTruePath - distanceEntryHETruePath - distanceExitHETruePath;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment