Commit 2c3d04d5 authored by kraus's avatar kraus
Browse files

Merge branch 'develop' into svn: the effective length of a bend is a positive quantity

parent 823702f7
......@@ -621,7 +621,7 @@ double RBend::calculateRefTrajectory(const double zBegin) {
// Set "ideal" bend radius and effective length.
R_m = fabs(betagamma * mass / (Physics::c * amplitude_m));
effectiveLength_m = R_m * angle;
effectiveLength_m = R_m * std::abs(angle);
calculateEffectiveCenter();
return angle;
......
......@@ -759,7 +759,7 @@ double SBend::calculateRefTrajectory(const double zBegin) {
// Set "ideal" bend radius and effective length.
R_m = fabs(betaGamma * mass / (Physics::c * amplitude_m));
effectiveLength_m = R_m * angle;
effectiveLength_m = R_m * std::abs(angle);
calculateEffectiveCenter();
return angle;
......
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