Merge pull request #642 from hibtc/srotation_angle_survey

Revert "Think this is the correct handeling in survey."
MethodicalAcceleratorDesign · Jul 5, 2018 · 9a95c0e · 9a95c0e
2 parents ad23634 + 07f07ae
commit 9a95c0e
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 55 deletions.
diff --git a/src/survey.f90 b/src/survey.f90
@@ -281,8 +281,8 @@ subroutine suelem(el, ve, we, tilt)
      case (code_srotation) !---- Rotation around S-axis. SPECIAL CASE
         tilt = node_value('angle ') * bv
         we(1,1) =  cos(tilt)
-        we(2,1) = -sin(tilt) !should be - according to convention in MAD8 PhysG. or MADX manual?
-        we(1,2) =  sin(tilt) !should be + according to convention in MAD8 PhysG. or MADX manual?
+        we(2,1) =  sin(tilt) !should be - according to convention in MAD8 PhysG. or MADX manual?
+        we(1,2) = -sin(tilt) !should be + according to convention in MAD8 PhysG. or MADX manual?
         we(2,2) =  cos(tilt)
 
      case (code_yrotation) !---- Rotation around Y-axis.  QUESTIONABLE USEFULNESS  !!!!!!!!!!!!!