From 6e31c7e705540d61f3ed56cc12f46d6bba958cdf Mon Sep 17 00:00:00 2001 From: Thierry Zamofing Date: Thu, 22 Dec 2016 10:13:32 +0100 Subject: [PATCH] add preliminary PBMotionAnalyzer.py --- cfg/mygatherplot.py | 180 --------------------------- python/PBMotionAnalyzer.py | 232 +++++++++++++++++++++++++++++++++++ python/images/PBMA.ico | Bin 0 -> 2238 bytes python/images/PBMA.png | Bin 0 -> 3459 bytes {cfg => python}/shapepath.py | 4 +- {cfg => python}/utilities.py | 0 6 files changed, 235 insertions(+), 181 deletions(-) delete mode 100755 cfg/mygatherplot.py create mode 100644 python/PBMotionAnalyzer.py create mode 100644 python/images/PBMA.ico create mode 100644 python/images/PBMA.png rename {cfg => python}/shapepath.py (98%) rename {cfg => python}/utilities.py (100%) diff --git a/cfg/mygatherplot.py b/cfg/mygatherplot.py deleted file mode 100755 index aff654d..0000000 --- a/cfg/mygatherplot.py +++ /dev/null @@ -1,180 +0,0 @@ -#!/usr/bin/env python -# *-----------------------------------------------------------------------* -# | | -# | Copyright (c) 2015 by Paul Scherrer Institute (http://www.psi.ch) | -# | | -# | Author Thierry Zamofing (thierry.zamofing@psi.ch) | -# *-----------------------------------------------------------------------* -''' -gathers data on powerpmac and plot - -#mode bits: - - 0 1 configure acquisition -> needs -c - 1 2 start acquisition ->Gather.Enable=2 - 2 4 stop acquisition ->Gather.Enable=0 - 3 8 wait acquisition stopped ->while(1){if(Gather.Enable==0) break} - 4 16 upload acquisition - 5 32 plot acquisition -> needs -a (or -c) - -mode 1+2+8+16+32 | user sets a stop -mode 1+2 | motion, wait some time| #mode 4+16+32 -mode 1+8+16+32 | start acqu, do motion stop acqu. - -verbose bits: - 1 basic info - 2 wait progress - 4 upload progress - -#config file example: -{ - "channels": [ - "Motor[1].ActPos", - "Motor[9].ActPos", - "Motor[10].ActPos", - "Motor[11].ActPos", - "PowerBrick[0].GpioData[0]" - ], - "axes": [ - [0, "b", "ActPos 1"], - [1, "g", "ActPos_9"], - [2, "r", "ActPos_10"], - [3, "m", "ActPos_11"], - [4, ["bits", 15, 3], "GPIO"]], - "gather": { - "MaxSamples":1000, - "Period":10 - } -} - -Acquired time is:MaxSamples*Period*.2 - -''' -#gatherPlot -#channels -c '[Sys.ServoCount,Motor[1].ActPos,Motor[9].ActPos,Motor[10].ActPos,Motor[11].ActPos,PowerBrick[0].GpioData[0]]' -#axis -a '(((0,1),'b','ActPos 1'), ((0,2),'g','ActPos 9'), ((0,3),'r','ActPos 10'), ((0,4),'m','ActPos 11'), ((0,5),('bits',14,18),'GPIO')) -#('bits',14,18) means decode bits 14-18 -# - -#check: Gather.Enable Gather.Index - -#on PPMAC do something like: -#Gather.Items=6 -#Gather.MaxSamples=10000 -#Gather.Period=10 -#Gather.Addr[0]=Sys.ServoCount.a -#Gather.Addr[1]=Motor[1].ActPos.a -#Gather.Addr[2]=Motor[9].ActPos.a -#Gather.Addr[3]=Motor[10].ActPos.a -#Gather.Addr[4]=Motor[11].ActPos.a -#Gather.Addr[5]=PowerBrick[0].GpioData[0].a -# -#Gather.Enable=2 -## move the motor[1] -#Gather.Enable=0 -# -#1;&1;#1->1000X -#k;j=0;P1=1000 -#b3r - -# to run that script without password, make first an ssh connection e.g. ssh root@PPMACZT84 -# - -import os, sys, json -import numpy as np -import matplotlib as mpl -import subprocess as sprc - -class GatherPlot: - def __init__(self): - pass - - def plot1(self): - import matplotlib.pyplot as plt - fnLoc='/tmp/gather.txt' - data = np.genfromtxt(fnLoc, delimiter=' ') - x=np.arange(data.shape[0])*2. #-> msec - pass #-> needs -a (or -c) - fig=plt.figure() - ax0 = fig.add_subplot(1,1,1) - ax0.set_xlabel('msec') - - ax=[ax0,] - axArgs=[(0,'r','A'),(1,'g','B'),(2,'b','C')] - for i in range(len(axArgs)-1): - ax.append(ax0.twinx()) - fig.subplots_adjust(right=0.75) - n=(len(ax)-2);dx=.2/n - for i in range(n): - ax[2+i].spines['right'].set_position(('axes', 1+dx*(1+i))) - ax[2+i].set_frame_on(True) - ax[2+i].patch.set_visible(False) - - - for i in range(len(axArgs)): - idx,param,lbl=axArgs[i] - col=param - ax[i].set_ylabel(lbl, color=col) - ax[i].plot(x, data[:,idx], color=col) - ax[i].tick_params(axis='y', colors=col) - - plt.show() - - def plot(self): - import matplotlib.pyplot as plt - fnLoc='/tmp/gather.txt' - data = np.genfromtxt(fnLoc, delimiter=' ') - fig=plt.figure() - ax0 = fig.add_subplot(1,1,1) - ax0.set_xlabel('msec') - ax=[ax0,] - #fig.subplots_adjust(right=0.75) - col='b' - #idx=1 - #ax[0].set_ylabel(ch[idx], color=col) - x=data[:,1] - y=data[:,2] - hl=ax[0].plot(x, y, color=col) - ax[0].tick_params(axis='y', colors=col) - - - cid = fig.canvas.mpl_connect('scroll_event', self.onclick) - fig.obj=self - self.data=data - #self.ch=ch - self.idx=1 - self.ax=ax - self.col=col - self.hl=hl - - plt.show() - - @staticmethod - def onclick(event): - #print 'button=%s, x=%d, y=%d, xdata=%f, ydata=%f'%( - # event.button, event.x, event.y, event.xdata, event.ydata) - obj=event.canvas.figure.obj - if event.button=='up': - if obj.idx0: - obj.idx-=1 - - obj.ax[0].set_ylabel(obj.ch[obj.idx], color=obj.col) - d=obj.data[:,obj.idx] - if obj.args.diff: - d=np.diff(d) - obj.hl[0].set_ydata(d) - #obj.ax[0].plot(x, obj.data[:,obj.idx]obj.data[:,obj.idx]obj.data[:,obj.idx], color=obj.col) - min=bottom=d.min() - max=d.max() - delta=(max-min)/10. - obj.ax[0].set_ylim(bottom=min-delta,top=max+delta,emit=True,auto=True) - event.canvas.figure.show() - - - -if __name__=='__main__': - gp=GatherPlot() - gp.plot() diff --git a/python/PBMotionAnalyzer.py b/python/PBMotionAnalyzer.py new file mode 100644 index 0000000..8870948 --- /dev/null +++ b/python/PBMotionAnalyzer.py @@ -0,0 +1,232 @@ +import os,sys +import wx +import wx.py +import numpy as np +#from hdfTree import * +#from hdfGrid import * +#from hdfAttrib import * +#from hdfImage import * + +import utilities as ut + +class Path(): + @staticmethod + def GetImage(): + path=__file__ + try:symPath=os.readlink(path) #follow symbolic link + except (AttributeError,OSError) as e:pass + else: + path=symPath + path=os.path.abspath(path) + path=os.path.dirname(path) + return os.path.join(path,'images') + + +class AboutFrame(wx.Frame): + def __init__(self,parent): + wx.Frame.__init__(self,parent,-1,'About MotionAnalyzer',size=(300,330)) + imgDir=Path.GetImage() + icon = wx.Icon(os.path.join(imgDir,'PBMA.ico'), wx.BITMAP_TYPE_ICO) + self.SetIcon(icon) + self.Centre() + panel=wx.Panel(self,-1) + #import pkg_resources + #v=pkg_resources.get_distribution("h5pyViewer") + v='my version info' + s='Version:'+str(v)+'\n(c) www.psi.ch\n Author: Thierry Zamofing\n thierry.zamofing@psi.ch' + + st0=wx.StaticText(panel,-1,s,(30,10)) + bmp = wx.StaticBitmap(panel,-1,wx.Bitmap(os.path.join(imgDir,'PBMA.png'), wx.BITMAP_TYPE_ANY ), (30,st0.Position[1]+st0.Size[1]+10)) + for k,v in os.environ.iteritems(): + print k,'=',v + +class MAMainFrame(wx.Frame): + + def OpenFile(self,fn_npz): + try: + self.fh=fh=np.load(fn_npz) + except IOError as e: + sys.stderr.write('Unable to open File: '+fn_npz+'\n') + else: + pass + s='content of numpy file: '+fn_npz+'\n' + for k,v in fh.iteritems(): + s+=' '+k+': '+str(v.dtype)+' '+str(v.shape)+'\n' + self.wxTxt.SetLabel(s) + #self.wxTree.ShowHirarchy(self.fid) + + def CloseFile(self): + #http://docs.wxwidgets.org/2.8/wx_windowdeletionoverview.html#windowdeletionoverview + #print 'CloseFile' + try: + self.fh.close() + del self.fh + except AttributeError as e: + pass + + def __init__(self, parent, title): + wx.Frame.__init__(self, parent, title=title, size=wx.Size(650, 350)) + imgDir=Path.GetImage() + icon = wx.Icon(os.path.join(imgDir,'PBMA.ico'), wx.BITMAP_TYPE_ICO) + self.SetIcon(icon) + #wxSplt = wx.SplitterWindow(self, -1) + #wxTree = HdfTreeCtrl(wxSplt, 1, wx.DefaultPosition, (-1,-1), wx.TR_HAS_BUTTONS) + #wxTree.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnSelChanged, id=1) + #wxTree.Bind(wx.EVT_TREE_ITEM_MENU, self.OnMenu, id=1) + #wx.EVT_TREE_ITEM_MENU(id, func) + #wxTxt = wx.StaticText(wxSplt, -1, '',(10,10) )#, style=wx.ALIGN_CENTRE) + self.wxTxt = wx.StaticText(self, wx.ID_ANY, "MyLabel", wx.DefaultPosition, wx.DefaultSize, 0 ) + + #wxSplt.SplitVertically(wxTree, wxTxt) + #wxSplt.SetMinimumPaneSize(320) + #wxLstCtrl=HdfAttrListCtrl(wxSplt) + #wxSplt.SplitVertically(wxTree, wxLstCtrl) + self.BuildMenu() + + self.Centre() + + #self.wxTree=wxTree + #self.display=wxTxt + def __del__(self): + self.CloseFile() + + def OnOpen(self, event): + dlg = wx.FileDialog(self, "Choose a file", os.getcwd(), '','numpy files (*.npz;*.npy)|*.npz;*.npy|all (*.*)|*.*', wx.OPEN|wx.FD_CHANGE_DIR) + if dlg.ShowModal() == wx.ID_OK: + path = dlg.GetPath() + #mypath = os.path.basename(path) + #self.SetStatusText("You selected: %s" % mypath) + self.CloseFile() + self.OpenFile(path) + #print 'OnOpen',path + dlg.Destroy() + + def OnCloseWindow(self, event): + #print 'OnCloseWindow' + self.Destroy() + + def OnAbout(self,event): + frame=AboutFrame(self) + frame.Show() + + def BuildMenu(self): + #http://wiki.wxpython.org/AnotherTutorial#wx.MenuBar + mnBar = wx.MenuBar() + + #-------- File Menu -------- + mn = wx.Menu() + mnItem=mn.Append(wx.ID_OPEN, '&Open', 'Open a new document');self.Bind(wx.EVT_MENU, self.OnOpen, mnItem) + #mnSub = wx.Menu() + #mnItem=mnSub.Append(wx.ID_ANY, 'SubMenuEntry', 'My SubMenuEntry') + #mn.AppendMenu(wx.ID_ANY, 'SubMenu', mnSub) + mn.AppendSeparator() + mnItem=mn.Append(wx.ID_EXIT, '&Quit', 'Quit the Application');self.Bind(wx.EVT_MENU, self.OnCloseWindow, mnItem) + mnBar.Append(mn, '&File') + + self.Bind(wx.EVT_CLOSE, self.OnCloseWindow) + + #-------- Edit Menu -------- + mn = wx.Menu() + mnItem = mn.Append(wx.ID_ANY, 'Show &XY-Path', 'Show XY-path motion path');self.Bind(wx.EVT_MENU, self.OnShowXYPath, mnItem) + mnItem = mn.Append(wx.ID_ANY, 'Show &Error', 'Show error of motion path');self.Bind(wx.EVT_MENU, self.OnShowError, mnItem) + mnItem = mn.Append(wx.ID_ANY, 'Show &Velocity', 'Show velocity of motion path');self.Bind(wx.EVT_MENU, self.OnShowVelocity, mnItem) + mnItem = mn.Append(wx.ID_ANY, '&Python Shell', 'Opens an interactive python shell"');self.Bind(wx.EVT_MENU, self.OnShell, mnItem) + + mnBar.Append(mn, '&Window') + + #-------- Help Menu -------- + mn = wx.Menu() + #mnItem=mn.Append(wx.ID_HELP,'Help','Application Help') + mnItem=mn.Append(wx.ID_ABOUT,'About','Application About');self.Bind(wx.EVT_MENU, self.OnAbout, mnItem) + mnBar.Append(mn, '&Help') + + #mn.AppendSeparator() + #mnItem = wx.MenuItem(mn, 105, '&Quit\tCtrl+Q', 'Quit the Application') + #mnItem.SetBitmap(wx.Image('stock_exit-16.png', wx.BITMAP_TYPE_PNG).ConvertToBitmap()) + #mn.AppendItem(mnItem) + self.SetMenuBar(mnBar) + self.CreateStatusBar() + + def OnShowXYPath(self, event): + pass + def OnShowError(self, event): + pass + def OnShowVelocity(self, event): + pass + + def OnShell(self, event): + frame = wx.Frame(self, -1, "wxPyShell",size=wx.Size(800, 500)) + imgDir=Path.GetImage() + icon = wx.Icon(os.path.join(imgDir,'PBMA.ico'), wx.BITMAP_TYPE_ICO) + frame.SetIcon(icon) + frame.Centre() + fh=app.GetTopWindow().fh + wnd=app.GetTopWindow() + loc={'app' :app, + 'fh' :fh, + 'pts' :fh['pts'], + 'rec' :fh['rec'] + } + introText='''Shell to the HDF5 objects +app: application object +fh: numpy file +pts: desired motion points +rec: recorded data + +#Examples: +pts +rec + +#using user defined modules +#import userSample as us;reload(us);us.test1(hid) +''' + shell=wx.py.shell.Shell(frame, introText=introText,locals=loc) + frame.Show(True) + #if loc is None, all variables are visible. the context is global + #shell.push('wnd=app.GetTopWindow()') + #for cmd in [ + # 'wnd=app.GetTopWindow();wxTree=wnd.wxTree', + # 'wxNode=wnd.wxTree.GetSelection()', + # 'print wnd.fid', + # 'lbl=wxTree.GetItemText(wxNode)', + # 'hid=wxTree.GetPyData(wxNode)']: + # shell.run(cmd, prompt=False) + + + +if __name__ == '__main__': + def GetArgs(): + import sys,argparse #since python 2.7 + exampleCmd='/tmp/shapepath.npz' + parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter, + description=__doc__, + epilog='Example:\n'+os.path.basename(sys.argv[0])+' '+exampleCmd+'\n ') + parser.add_argument('npzFile', nargs='?', help='the npz file with motion path data to show',default='/tmp/shapepath.npz') + + args = parser.parse_args() + return args + + + class MyApp(wx.App): + + def OnInit(self): + args=GetArgs() + frame = MAMainFrame(None, 'PBMotionAnalyzer') + if args.npzFile: + frame.OpenFile(args.npzFile) + frame.Show(True) + self.SetTopWindow(frame) + return True + +#------------------ Main Code ---------------------------------- + #redirect stdout/stderr: + #http://www.blog.pythonlibrary.org/2009/01/01/wxpython-redirecting-stdout-stderr/ + #https://groups.google.com/forum/#!topic/wxpython-users/S9uSKIYdYoo + #https://17677433047266577941.googlegroups.com/attach/e4d343dc6a751906/REDIRECT.PY?part=2&view=1&vt=ANaJVrFeyCjCMydKnkyfFbYJM7ip07mE-ozUIBxJ5A1QuK1GhycJYJsPTxpAaNk5L2LpXvGhzRPInxDt8_WUcUyK2Ois28Dq8LNebfYoWG9Yxr-tujf5Jk4 + #http://www.wxpython.org/docs/api/wx.PyOnDemandOutputWindow-class.html + rd=not sys.stdout.isatty()#have a redirect window, if there is no console + #rd=True #force to open a redirect window + rd=False #avoid a redirect window + app = MyApp(redirect=rd) + app.MainLoop() + diff --git a/python/images/PBMA.ico b/python/images/PBMA.ico new file mode 100644 index 0000000000000000000000000000000000000000..aa1f97d4271736b0fed4ecf61f802752061596e7 GIT binary patch literal 2238 zcmdUvc~q4}7>6G~6mfw-Em2C*Oi8X~qNHZHf(puF1>&AdiiCsp+U}RxZ zY2|IvFcc9~5;BBOTsX(%xUeW5NiTYmgv&ISB?!^}t-0r!nfLem=AGrtTriTqUcHdD z8T-tj8_-`OC7dM&{Yga_8&hp!f-pCy+|m@$u_HKw`4A&SH<`@|YHhl6sZSpgrKYp9 zBgx4OE2~tQR?v46RN31T=qkg`579e1Qaap$#a``j_l3$4j=0V?p}S2jTfJYy*EMZ13WM1*y&)V- z!i}+7+YaI3!O&IKj9Ar`HW6(wjWDH?+6)VId;I)@D4Xt%wewx(&7VW>2y29o55m`% z9#LHg44jN#s69+6!EfC_{Qdpu8Pk)In+FgS6og%@9r~sIxW_nBzH9*w@eYiN8_bX$ zgXkTS$eN84=(OYt+R#u~UPw*IO2+RQ&+1K^5Mg16hzN)*z%6DsV*PrC#>cZFc@`o% z8sg3n9xhO;1px;Z6RizKBqXpfIhlY%0h~-q0&NyTwyM1s5mMi()w2C)6zWVh9n#W> zJRXTjdL~`6vPex$B{nA(k&;4UZX)9FVRq-sdDGJo$Bwb&)D>LMo@J86t)KvR$rQ;{ ziT1*NJkFiNQ{pA@mP|W;9-j*r@Rj&UW?Z~T%B2*JTt33V+&{Q+KA+4hndBB_k$t9y z6IV}=mnSIwEsw~nSBa8rkch%UHeS0%c5ya2#W_S@zs?p(jHKl9WwsR;6D!#+iIe1( z=AtPnVTUAMva_@lQB*|1%>t5d+@M%~BcxVaR>q;*w<-F)h_s3dM0q*l)-8_Txx=4Q z&%S$?5?u)ucPc2WEaT?Ao1DFOj{?a#iB6}Z@cw;7WhK`hJU~~aqq3@!s_H5#tE&+Y zA0lLXzov$2eKl2jJvI6o^tF0wYikh(gm}`^`u}^{jEszNlBTLzq=gJcQCuWVRehwH zt5IAs9_u^VTH0zF{a__NbnT3FVc~hfGSSkFn>K$q)q9NP++aC=oQsPT4}7(6@0Xt^ z8|G0m6L%)Wukq|+;p8%|K7XCuqSDOKD2g1vHM@n;Je2+jhhEMeqhA>?@CBP^U-enh z%nf#Fp8x0Aw#edUas>fPh7Sq1*u;Mecp5Hys$<*ILTI=!hV|6E_Atth#wXr;GTUHs_$2HA0o z(qYl#{gbLAhm3bW-d{HU^sKIVjs7F+`$6@^YSY!yZgqWmajvR~CX4GvKYBi=cTE{) z-{$3y8tmrhm-X?=dG14B>e$`y>qfV3{NdDH5dkwNja0qZ*Shob(+)P7vM2Z7wtc&& zo_V@w|H<>;|2DtD+@E6Tw7Ncnu{|ip(8$v2`Duo~(?i~^2ET6q->W}}TpzXJm_a+W zWVWy6T-j;LADo`N=d%T$esV&QSNWIeo_4kx!$nsN_q&z%W4OBYkEnIuF!XQ#-`?kc H{2%Bqm2AQ! literal 0 HcmV?d00001 diff --git a/python/images/PBMA.png b/python/images/PBMA.png new file mode 100644 index 0000000000000000000000000000000000000000..00bb818a5fddec643a7e3f422a4753e509d77c69 GIT binary patch literal 3459 zcmV-}4Se#6P)lYY?mp8cZ$bZRsjJ^+bCG96Mvp)h2dre@@yJ(b_i z%;UP%G&KWK6%`dTs(MEL*;D!L%oG5--9DY(H*e*1I;B!6*ZUqo@8d{u;z)6%I8q#` zIUzoPef#zag~CwKHPZ-i7D=zi$&=W!1w}uZ`2c!) z-c+eJ(sbP9V!!`JfB!oaMTKYr6hNuf|2mbF&Gu<9I0EnhD&!Z7mro_-^L0BM^%I`Z zLC9E`jb(j4U(bXgWMaL_HiKNWoXy8cQT~cY8)A>M1@c}&c7?euL<&eq3U!_vS zR*WT;KGNHJfDo3Vc+n>{@=Q4^Ts#!ew7ImwCXIJM?Jy~9Mup#gmFK&^&G zGyba4AR%GakxEP~V%gEr(Q9IHZuCjzb|}5X?hf3D%W0-Ij14$%47ja9Hkc$#N);)j zv_injT>*vLt+-;5yY-5ZKE*({JYY{*xR44Vn_#EaV#yLHmEb+3Zq4HflafkZu1oh% zD#EJE)Y%M6*kSLm#bvR$EmpVH;<8xXR*U=ApRRyQz!NMK%B4JId{D(7RWTzf?||CT zwcOgeJWe3U%tTfemMlS5*7%$Bbnw5ESti4HXj&Zg*~~r8`#b?ph@Hu4GPz8l*Bj0o zt%I!rCXg*%si8}x?$t1t40mLAchN>82tj%}^74?MkAec^=Oa5CLSf9z`=UHUW(nJQ zv-6_)qRyVZk)YntY`JLw)o4JVK6|e z#hNu(yB2HLqNoUQar1`MR5^T(tG25lY6hD@XV%$9Z6(T*_1g8TQr8Oy$_$rM8XM8r z2!{hJS7PHvR8*j>3?k7yBNZk>h|zAW@2d|TS8Z2w({k5q)|YA5FQuR8zO4N6OPo0a zhXWfo;(OmiMFq06=Ow8y4S9yn^`EQntFP;;yJWspC@b8wbkmNao$ebM)zvt226c5< zwhY_1yfST2jX9?e%0(W6GB`r zQdvo!dW!J*q`aIQK1|&12%lwHw!S{iZf}UbNmAOi#8pK57&rnmRE^NUnSSBI|t?2DhN-&H67XYwz<{H4`p zC4{gnsjVfOHW9Iyy!IM#I&b-Vdw<*7`s{op6%xZTHO87vA8kr_E8)<^LlfWm!Ua-Z zPULcO;>5VqZf~fsPm9V$#U!Z-ooGLS|G?o(hbN6qq_UDECzG8!iPuXQ#`pEtLXW2- zTBKrieQI=U6u=_!qDjkm_{mSu(t_4jJozM?PEk@)iQC;2wPiv8FTM0q%hjfPsAz?*varo#X965r&{Vl4ejNKg^7MDf-U-F%Q z-8sgLO)WimkmTo+`@gK1Z&Lu|iSmoPE}k`>{jlZ3sinJi!D7KzUvc+l003%<`uP>l zpEaJHS`;6T9Xs%+KXIhKQP^+aWNqH;KXu9zS_tPzfk*K?W1fgb>(&Xz#)6HF9ULhD z*pj{Fbm!?_dvAnWPkdfML3drk&&!OFfN^e2x?Voa#7b_t^_% z1rbX(Y*?VzYp2Fs^O2NBstGWGA38(+uG%enQ}p-VzehCG){?Ze`b(PJP%>&KN1I;eK>$S4iBHFHB z$F^lD~+FHE)@~wfKqIgp2y8GFH9W&#Ucg(xvuRAD;YWb&@Whu+122G!Q zg5UiPBO}Bl96gF7N1#$+?_Rv{!fkh2Nu^~L%lmVxO$C_1U)uh1NO$PG>AXZFDN&XbD~hY0 zt18o!h4w8m3>q46^eB!U10mS94JS{ctn4m9lSHz{@3;7TeQ|Nx*e2x*`Z{lR*7Vf; zrr|eYfp|~pp2{CoW-Q1E(IEtFZ8&=tUwwtzS_lN#x)mRPj7J{@O;4+SnieM|6}jE| zdn5IbcbZw<*3UaWKh=4v+1lJ=?-2{dg|fm|*1hs<&a*s<=l7$f1v(vSYjO50JRX#n zE>md*QnQIr(~y! zlv_RaG5T!`|VFtcve1 z*_=avf6%z7y&VPv3v zF}+}gXiMtwX0PF~j`q0DPS7-Ra*&%leiRlWE9;>>Npj~l#gA5dF}Y0rj{bgU|8?7q zc2mFcX8(0pyN&IR3#bIPB478Kv9^B~lNIhvN}YqEQoQ(&$jwE1`n?P{4@EO0#js4j zv%m9Z=M_t5bAMNt&1iD>4+Z)?7^Da-@Tyq5CU{dL@M=uSI4i zGBO|*BX-4)7|vK+)((s5s@dE%VCo$)nO){VuW5uax#%7OhH_?*p{2BA=>n855@{Zh zXtL5YOBFIrKCRIpGZU$)v-hdMV9?dq_x9q&2PkT0jhO(n`WsWR!g*GEyBT%WZa3Nwb5e3Tz8yb>}is};+SIl^v z>ay5Ul9bEE1sbV(ajG&~smf8yR0_UCg1MKJgU91bBx@axbJHg^Do{yv?lC?fxuitOxNZsxCo-YxL3*B!0++4|vu2!vToat0~o@T(g zhZO}bR}e?)uF~tVe?Roo9j#{L4vvWwm4pz04ZY#<1Yz?JLP#(;GCAiZKqyKi5G)9v zp9KaP#sjdoob7E1&+LKOjQ8KaT~^BonI&p!RwX9V#l`2tBG2LB>aMO=zWLJQ={mEr z4yL61L)bTNY}9@`11FoBx+OdNaM-yGhUaazPbX*o1n}sizA)S1;L-N>ABX)jFYoB0 zML!BVZ*6UOpGZsl(emX-!~WUU_T!4bL{{8sXukIRoQUE$T|3@Mb zr>6dp_wAJ-zu)3^>%YmX$qT(nOe_!zWnpzW9Oovd-voF9!NU0X@SEH|Uq8b*CujZy zsDy;@n|BN|8VrtvotMv-ggsPD2w@n{x2~V!0X!a$Kdr9!^wTh#p}c#h)YMbH5c=cJ@l+rXm~c)< lGxE=#%BPxV^u;*g{{a_cjpI!bmRkS-002ovPDHLkV1lcC+6({y literal 0 HcmV?d00001 diff --git a/cfg/shapepath.py b/python/shapepath.py similarity index 98% rename from cfg/shapepath.py rename to python/shapepath.py index e1cf7ca..f970c31 100755 --- a/cfg/shapepath.py +++ b/python/shapepath.py @@ -200,9 +200,11 @@ class ShapePath: self.ax=ax self.hl=hl - def plot_gather(self,fnLoc='/tmp/gather.txt'): + def plot_gather(self,fnLoc='/tmp/gather.txt',fnOut='/tmp/shapepath.npz'): pts=self.points rec = np.genfromtxt(fnLoc, delimiter=' ') + if fnOut: + np.savez_compressed(fnOut, rec=rec, pts=pts) fig=plt.figure() ax = fig.add_subplot(1,1,1) #hl=ax[0].plot(x, y, color=col) diff --git a/cfg/utilities.py b/python/utilities.py similarity index 100% rename from cfg/utilities.py rename to python/utilities.py