change angle for deltatau from rad to 1000*deg

python/helicalscan.py

@@ -489,6 +489,8 @@ open forward
       #https://stackoverflow.com/questions/3471999/how-do-i-merge-two-lists-into-a-single-list
       l=[j for i in zip((i,) * param.shape[1], list(param[i])) for j in i]
       prg.append("  define(z_%i=%g, y_%i=%g, x_%i=%g, r_%i=%g, phi_%i=%g)"%tuple(l))
+    prg.append("  W=qW")
+    prg.append("  qW=qW*%g"%(d2r/1000.)) #scale from 1000*deg to rad
     prg.append('''
   p0_x=x_0+r_0*sin(phi_0+qW)
   p1_x=x_1+r_1*sin(phi_1+qW)
@@ -504,7 +506,6 @@ open forward
   DX=qCX-p0_x
   DZ=qCZ-p0_z
   Y=qFY
-  W=qW
   send 1"forward result    %f %f %f %f\\n",DX,DZ,W,Y
 
   D0=$000001c2; //B=$2 X=$40 Y=$80 Z=$100 hex(2+int('40',16)+int('80',16)+int('100',16)) -> 0x1c2
@@ -525,6 +526,8 @@ open inverse
       # https://stackoverflow.com/questions/3471999/how-do-i-merge-two-lists-into-a-single-list
       l = [j for i in zip((i,) * param.shape[1], list(param[i])) for j in i]
       prg.append("  define(z_%i=%g, y_%i=%g, x_%i=%g, r_%i=%g, phi_%i=%g)" % tuple(l))
+    prg.append("  qW=W")
+    prg.append("  W=W*%g"%(d2r/1000.)) #scale from 1000*deg to rad
     prg.append('''
   p0_x=x_0+r_0*sin(phi_0+W)
   p1_x=x_1+r_1*sin(phi_1+W)
@@ -540,7 +543,6 @@ open inverse
   qCX=DX+p0_x
   qCZ=DZ+p0_z
   qFY=Y
-  qW=W
   send 1"inverse result    %f %f %f %f\\n",qCX,qCZ,qW,qFY
 
 close