sf-mx/PBSwissMX
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor changes

Browse Source
This commit is contained in:
zamofing_t
2017-12-20 12:01:55 +01:00
parent f6cc74a6e3
commit 4049955619
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/helicalscan.py
View File

@@ -339,7 +339,7 @@ class HelicalScan:
(cx, cz, w, fy)=self.rec[int(frm),:] (cx, cz, w, fy)=self.rec[int(frm),:]
#data/=. #scale from um to mm #data/=. #scale from um to mm
w*=d2r/1000 # scale from deg to rad w*=d2r/1000 # scale from deg to rad
print (cx,cz,w,fy) #print (cx,cz,w,fy)
self.hCrist,pt=self.pltCrist(-cx,-cz,w,-fy,self.hCrist) self.hCrist,pt=self.pltCrist(-cx,-cz,w,-fy,self.hCrist)
self.fig.canvas.draw_idle() self.fig.canvas.draw_idle()
@@ -458,7 +458,7 @@ class HelicalScan:
if h is None: if h is None:
lseg = tuple(lines) lseg = tuple(lines)
col=('r','g','b') col=('r','g','b')
hlc = plt3d.art3d.Line3DCollection(lseg, colors=col) # , *args[argi:], **kwargs) hlc = plt3d.art3d.Line3DCollection(lseg, colors=col, linewidths=2) # , *args[argi:], **kwargs)
ax.add_collection(hlc) ax.add_collection(hlc)
return hlc return hlc
else: else:
@@ -478,7 +478,7 @@ class HelicalScan:
x+=cx;y+=fy;z+=cz;phi+=w x+=cx;y+=fy;z+=cz;phi+=w
pt[i] = (z, x, y) pt[i] = (z, x, y)
pt[i + 2] = (z + r * np.cos(phi), x + r * np.sin(phi), y) pt[i + 2] = (z + r * np.cos(phi), x + r * np.sin(phi), y)
obj = mpl.patches.Circle((z, x), r, facecolor=mpl.colors.colorConverter.to_rgba('r', alpha=0.3)) obj = mpl.patches.Circle((z, x), r, facecolor=mpl.colors.colorConverter.to_rgba('y', alpha=0.2))
h1=ax.add_patch(obj) h1=ax.add_patch(obj)
h2=plt3d.art3d.pathpatch_2d_to_3d(obj, z=y, zdir="z") h2=plt3d.art3d.pathpatch_2d_to_3d(obj, z=y, zdir="z")
#print h1._segment3d #print h1._segment3d
@@ -504,7 +504,7 @@ class HelicalScan:
pt[i] = (z, x, y) pt[i] = (z, x, y)
pt[i + 2] = (z + r * np.cos(phi), x + r * np.sin(phi), y) pt[i + 2] = (z + r * np.cos(phi), x + r * np.sin(phi), y)
h[i].remove() h[i].remove()
obj = mpl.patches.Circle((z, x), r, facecolor=mpl.colors.colorConverter.to_rgba('r', alpha=0.3)) obj = mpl.patches.Circle((z, x), r, facecolor=mpl.colors.colorConverter.to_rgba('y', alpha=0.2))
ax.add_patch(obj) ax.add_patch(obj)
plt3d.art3d.pathpatch_2d_to_3d(obj, z=y, zdir="z") plt3d.art3d.pathpatch_2d_to_3d(obj, z=y, zdir="z")
h[i]=obj h[i]=obj
@@ -947,8 +947,8 @@ Examples:'''+''.join(map(lambda s:cmd+s, exampleCmd))+'\n '
#hs.gen_prog(fnPrg='/tmp/prg.cfg',host='MOTTEST-CPPM-CRM0485',mode=0) #hs.gen_prog(fnPrg='/tmp/prg.cfg',host='MOTTEST-CPPM-CRM0485',mode=0)
#hs.gen_prog(fnPrg='/tmp/prg.cfg',host='MOTTEST-CPPM-CRM0485',mode=0,cntHor=1) #hs.gen_prog(fnPrg='/tmp/prg.cfg',host='MOTTEST-CPPM-CRM0485',mode=0,cntHor=1)
#hs.gen_prog(fnPrg='/tmp/prg.cfg',host='MOTTEST-CPPM-CRM0485',mode=1) #hs.gen_prog(fnPrg='/tmp/prg.cfg',host='MOTTEST-CPPM-CRM0485',mode=1)
hs.gen_prog(fnPrg='/tmp/prg.cfg',host='MOTTEST-CPPM-CRM0485',mode=1, #hs.gen_prog(fnPrg='/tmp/prg.cfg',host='MOTTEST-CPPM-CRM0485',mode=1,
pt2pt_time=100,cnt=1,cntVert=35,cntHor=7,hRng=(-.3,.3),wRng=(0,360000*3),yRng=(6.2,2.3)) # pt2pt_time=100,cnt=1,cntVert=35,cntHor=7,hRng=(-.3,.3),wRng=(0,360000*3),yRng=(6.2,2.3))
hs.load_rec() hs.load_rec()
hs.interactive_anim() hs.interactive_anim()
hs.show_vel(); plt.show() hs.show_vel(); plt.show()