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

SFELPHOTON-927: Beamtime Feb24

Browse Source
This commit is contained in:
zamofing_t
2024-01-10 16:19:30 +01:00
parent e41a3ed7ed
commit 681d42dc2e
3 changed files with 75 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Readme.md
View File

@@ -386,17 +386,6 @@ s.a. ~/Documents/prj/SwissFEL/epics_ioc_modules/ESB_MX/Readme.md -> EVR
----------------------------------- SCRATCH ----------------------------------- ----------------------------------- SCRATCH -----------------------------------
-0.952 -0.952
@@ -547,3 +536,4 @@ test shapepath
cd ~/Documents/prj/SwissFEL/epics_ioc_modules/ESB_MX cd ~/Documents/prj/SwissFEL/epics_ioc_modules/ESB_MX
./shapepath.py --host=localhost:10001:10002 ./shapepath.py --host=localhost:10001:10002
``` ```

68
pyqtUsrObj.py
View File

@@ -203,7 +203,7 @@ class Fiducial(UsrROI):
def __repr__(self): def __repr__(self):
ctr=self.ctr() ctr=self.ctr()
s=f'{self.__class__.__name__}:(ctr:{itr2str(ctr)}, size:{itr2str(self.size())}}}' s=f'{self.__class__.__name__}:(ctr:{itr2str(ctr)}, size:{itr2str(self.size())})'
return s return s
def obj2json(self,encoder): def obj2json(self,encoder):
@@ -219,8 +219,9 @@ class Fiducial(UsrROI):
class Grid(UsrROI): class Grid(UsrROI):
'''a grid''' '''a grid'''
def __init__( self, pos=(0,0), size=(30,20), cnt=(6,4), fiducialSize=.2, **kargs): def __init__( self, pos=(0,0), size=(30,20), cnt=(6,4), fiducialSize=.2, **kwargs):
pg.ROI.__init__(self, pos, size, **kargs) self._param=kwargs
pg.ROI.__init__(self, pos, size)#, **kwargs)
self._cnt=cnt self._cnt=cnt
self._fidSz=fiducialSize self._fidSz=fiducialSize
self.addScaleHandle([1, 1], [0, 0]) self.addScaleHandle([1, 1], [0, 0])
@@ -258,7 +259,7 @@ class Grid(UsrROI):
#p.drawRect(0, 0, 1, 1) #p.drawRect(0, 0, 1, 1)
def __repr__(self): def __repr__(self):
s=f'{self.__class__.__name__}:(pos:{itr2str(self.pos())}, size:{itr2str(self.size())}, cnt:{self._cnt}, fidSize:{self._fidSz}}}' s=f'{self.__class__.__name__}:(pos:{itr2str(self.pos())}, size:{itr2str(self.size())}, cnt:{self._cnt}, fidSize:{self._fidSz}, param:{self._param})'
return s return s
def obj2json(self,encoder): def obj2json(self,encoder):
@@ -269,27 +270,33 @@ class Grid(UsrROI):
'cnt':self._cnt, 'cnt':self._cnt,
'fiducialSize':self._fidSz 'fiducialSize':self._fidSz
} }
jsn.update(self._param)
return jsn return jsn
def get_scan_param(self,mode=0x2): def get_scan_param(self):
'returns scan parameters for scanning with deltatau. the format is as used for shapepath' 'returns scan parameters for scanning with deltatau. the format is as used for shapepath'
scan=1 # snake motion Y fast, X slow (default)
#pos=np.array(self.pos()) #pos=np.array(self.pos())
cnt=np.array(self._cnt,np.int32) cnt=np.array(self._cnt,np.int32)
sz=np.array(self.size()) sz=np.array(self.size())
pitch=sz/cnt pitch=sz/cnt
xx, yy=np.meshgrid(range(cnt[0]), range(cnt[1])) xx, yy=np.meshgrid(range(cnt[0]), range(cnt[1]))
if mode&0x01: #modify x scaning forward backward each line
if scan==0: # snake motion X fast, Y slow
for i in range(1,cnt[1],2): for i in range(1,cnt[1],2):
xx[i]=xx[i][::-1] xx[i]=xx[i][::-1]
if mode&0x02: # modify y scaning forward backward each line else: # scan==1 # snake motion Y fast, X slow (default)
xx=xx.T xx=xx.T
yy=yy.T yy=yy.T
for i in range(1, cnt[0], 2): for i in range(1, cnt[0], 2):
yy[i]=yy[i][::-1] yy[i]=yy[i][::-1]
pts=np.array([xx.reshape(-1), yy.reshape(-1)], dtype=np.float64).transpose()*pitch pts=np.array([xx.reshape(-1), yy.reshape(-1)], dtype=np.float64).transpose()*pitch
#pts+=pos #pts+=pos
return pts param={'points':pts}
param.update(self._param)
assert(param.get('code_gen',0)==0) # this provides fully x,y motor coordinates
return param
class Path(UsrROI): class Path(UsrROI):
@@ -302,9 +309,9 @@ class Path(UsrROI):
a cross is plot at the fiducial positions a cross is plot at the fiducial positions
''' '''
def __init__( self, pos=(0,0), size=(30,20), path=np.array(((6,4),(16,24),(-5,7),(3,12))), fiducial=None, ficucialScale=5, **kwargs): def __init__( self, pos=(0,0), size=(30,20), path=np.array(((6,4),(16,24),(-5,7),(3,12))), fiducial=None, ficucialScale=5, **kwargs):
self.code_gen=kwargs.pop('code_gen',0)
trf=kwargs.pop('trf',None) trf=kwargs.pop('trf',None)
pg.ROI.__init__(self, pos, size, **kwargs) self._param=kwargs
pg.ROI.__init__(self, pos, size)#, **kwargs)
self.szOrig=size self.szOrig=size
if type(path)==list: if type(path)==list:
path=np.array(path) path=np.array(path)
@@ -365,8 +372,7 @@ class Path(UsrROI):
p.drawLines(lh,lv) p.drawLines(lh,lv)
def __repr__(self): def __repr__(self):
s=f'{self.__class__.__name__}:(pos:{itr2str(self.pos())}, size:{itr2str(self.size())}, numFid:{self._fiducial.shape[0]}, numPts:{self._path.shape[0]}, ficucialScale:{self._fidScl}}}' s=f'{self.__class__.__name__}:(pos:{itr2str(self.pos())}, size:{itr2str(self.size())}, numFid:{self._fiducial.shape[0]}, numPts:{self._path.shape[0]}, ficucialScale:{self._fidScl}, param:{self._param})'
return s return s
def obj2json(self,encoder): def obj2json(self,encoder):
@@ -374,11 +380,11 @@ class Path(UsrROI):
'__class__':self.__class__.__name__, '__class__':self.__class__.__name__,
'pos':tuple(self.pos()), 'pos':tuple(self.pos()),
'size':tuple(self.szOrig), 'size':tuple(self.szOrig),
'code_gen':self.code_gen,
'fiducial': self._fiducial.tolist(), 'fiducial': self._fiducial.tolist(),
'ficucialScale':self._fidScl, 'ficucialScale':self._fidScl,
'path':self._path.tolist(), 'path':self._path.tolist(),
} }
jsn.update(self._param)
trf=self.transform() trf=self.transform()
if not trf.isIdentity(): if not trf.isIdentity():
#obj_info(trf) #obj_info(trf)
@@ -386,12 +392,8 @@ class Path(UsrROI):
jsn['trf']=trf jsn['trf']=trf
return jsn return jsn
def get_scan_param(self,mode=0x2): def get_scan_param(self):
'returns scan parameters for scanning with deltatau. the format is as used for shapepath' 'returns scan parameters for scanning with deltatau. the format is as used for shapepath'
#mode=pvt
#param={'points':pts, 'mode':mode}
param={'points':self._path, 'code_gen': self.code_gen}
t=self.transform() t=self.transform()
p=np.array(self.pos()) p=np.array(self.pos())
s=self.size()/self.szOrig s=self.size()/self.szOrig
@@ -401,7 +403,8 @@ class Path(UsrROI):
trf[:2,:]=(trf[:2,:].T*s).T # same as np.asmatrix(np.diag(s))*trf[:2,:], trf[:2,:]*=s not working, scale before rot / shear trf[:2,:]=(trf[:2,:].T*s).T # same as np.asmatrix(np.diag(s))*trf[:2,:], trf[:2,:]*=s not working, scale before rot / shear
# trf*'gridpos in um' -> motor pos in mm # trf*'gridpos in um' -> motor pos in mm
param['trf']=trf param={'points':self._path,'trf':trf}
param.update(self._param)
return param return param
class FixTargetFrame(UsrROI): class FixTargetFrame(UsrROI):
@@ -448,9 +451,8 @@ class FixTargetFrame(UsrROI):
} }
def __init__( self, pos=(0,0), size=(100,100), tpl='test', dscr=None, **kwargs): def __init__( self, pos=(0,0), size=(100,100), tpl='test', dscr=None, **kwargs):
self.code_gen=kwargs.pop('code_gen',0)
trf=kwargs.pop('trf',None) trf=kwargs.pop('trf',None)
assert(kwargs==dict()) self._param=kwargs
pg.ROI.__init__(self, pos, size)#, **kwargs) pg.ROI.__init__(self, pos, size)#, **kwargs)
if trf is not None: if trf is not None:
t=self.transform() t=self.transform()
@@ -533,7 +535,7 @@ class FixTargetFrame(UsrROI):
assert('unknown feducial type') assert('unknown feducial type')
def __repr__(self): def __repr__(self):
s=f'{self.__class__.__name__}:(pos:{itr2str(self.pos())}, size:{itr2str(self.size())}, dscr:{self._dscr}}}' s=f'{self.__class__.__name__}:(pos:{itr2str(self.pos())}, size:{itr2str(self.size())}, dscr:{self._dscr}, param:{self._param})'
return s return s
def obj2json(self,encoder): def obj2json(self,encoder):
@@ -541,9 +543,9 @@ class FixTargetFrame(UsrROI):
'__class__':self.__class__.__name__, '__class__':self.__class__.__name__,
'pos':tuple(self.pos()), 'pos':tuple(self.pos()),
'size':tuple(self.size()), 'size':tuple(self.size()),
'code_gen':self.code_gen, 'dscr': self._dscr,
'dscr': self._dscr
} }
jsn.update(self._param)
trf=self.transform() trf=self.transform()
if not trf.isIdentity(): if not trf.isIdentity():
#obj_info(trf) #obj_info(trf)
@@ -553,7 +555,7 @@ class FixTargetFrame(UsrROI):
def get_scan_param(self): def get_scan_param(self):
'returns scan parameters for scanning with deltatau. the format is as used for shapepath' 'returns scan parameters for scanning with deltatau. the format is as used for shapepath'
scan=0x2 #default fast y axis scan=1 # snake motion Y fast, X slow (default)
grid=self._dscr['grid'] grid=self._dscr['grid']
self._dscr['size'] self._dscr['size']
#pos=np.array(self.pos()) #pos=np.array(self.pos())
@@ -561,10 +563,10 @@ class FixTargetFrame(UsrROI):
#pos =np.array(grid['pos'],np.float64) #pos =np.array(grid['pos'],np.float64)
#pitch=np.array(grid['pitch'],np.float64) #pitch=np.array(grid['pitch'],np.float64)
xx, yy=np.meshgrid(range(cnt[0]), range(cnt[1])) xx, yy=np.meshgrid(range(cnt[0]), range(cnt[1]))
if scan&0x01: #modify x scaning forward backward each line if scan==0: # snake motion X fast, Y slow
for i in range(1,cnt[1],2): for i in range(1,cnt[1],2):
xx[i]=xx[i][::-1] xx[i]=xx[i][::-1]
if scan&0x02: # modify y scaning forward backward each line else: # scan==1 # snake motion Y fast, X slow (default)
xx=xx.T xx=xx.T
yy=yy.T yy=yy.T
for i in range(1, cnt[0], 2): for i in range(1, cnt[0], 2):
@@ -572,8 +574,6 @@ class FixTargetFrame(UsrROI):
pts=np.array([xx.reshape(-1), yy.reshape(-1)], dtype=np.float64).transpose() #*pitch pts=np.array([xx.reshape(-1), yy.reshape(-1)], dtype=np.float64).transpose() #*pitch
param={'grid':grid, 'points':pts, 'code_gen': self.code_gen}
# TODO: simplify !!! # TODO: simplify !!!
t=self.transform() #obj_info(t) t=self.transform() #obj_info(t)
p=np.array(self.pos()) p=np.array(self.pos())
@@ -582,14 +582,16 @@ class FixTargetFrame(UsrROI):
trf[2,:]=p # shift origin trf[2,:]=p # shift origin
trf[:2,:]=(trf[:2,:].T*s).T # same as np.asmatrix(np.diag(s))*trf[:2,:], trf[:2,:]*=s not working, scale before rot / shear trf[:2,:]=(trf[:2,:].T*s).T # same as np.asmatrix(np.diag(s))*trf[:2,:], trf[:2,:]*=s not working, scale before rot / shear
pos=np.array(param['grid']['pos']) # in um pos=np.array(grid['pos']) # in um
pitch=np.array(param['grid']['pitch']) # in um pitch=np.array(grid['pitch']) # in um
trf2=np.asmatrix(np.identity(3)) trf2=np.asmatrix(np.identity(3))
trf2[:, :2]=trf trf2[:, :2]=trf
trf2*=np.asmatrix(((1000, 0, 0), (0, 1000, 0), (0, 0, 1))) trf2*=np.asmatrix(((1000, 0, 0), (0, 1000, 0), (0, 0, 1)))
trf3=np.asmatrix(((pitch[0], 0, 0), (0, pitch[1], 0), (pos[0], pos[1], 1))) trf3=np.asmatrix(((pitch[0], 0, 0), (0, pitch[1], 0), (pos[0], pos[1], 1)))
trf=(trf3*trf2)[:, :2] trf=(trf3*trf2)[:, :2]
param['trf']=trf param={'grid':grid, 'points':pts, 'trf':trf}
param.update(self._param)
# trf*'gridpos' -> motor pos in mm # trf*'gridpos' -> motor pos in mm
# {'pos': [2080, 2080], 'pitch': [120, 120], 'count': [162, 162]} # {'pos': [2080, 2080], 'pitch': [120, 120], 'count': [162, 162]}
#np.array((0,0,1))*trf grid 0,0 (top left) #np.array((0,0,1))*trf grid 0,0 (top left)

46
swissmx.py
View File

@@ -1992,7 +1992,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
mft.setAccessibleName(TASK_FIX_TARGET) mft.setAccessibleName(TASK_FIX_TARGET)
self._tabs_daq_methods.setCurrentWidget(mft) #set this as the active tabs self._tabs_daq_methods.setCurrentWidget(mft) #set this as the active tabs
mft._cbType.addItems(["Fiducial", "FixTarget(12.5x12.5)", "FixTarget(23.0x23.0)", "FixTarget(<param>)", "Grid(<param>)", "SwissMX(<param>)", "SwissFEL(<param>)"]) mft._cbType.addItems(["Fiducial", "FixTarget(12.5x12.5)", "FixTarget(23.0x23.0)", "FixTarget(test)", "Grid()", "SwissMX()", "SwissFEL()"])
mft._btnAdd.clicked.connect(self.module_fix_target_add_obj) mft._btnAdd.clicked.connect(self.module_fix_target_add_obj)
mft._btnDelAll.clicked.connect(self.module_fix_target_del_all_obj) mft._btnDelAll.clicked.connect(self.module_fix_target_del_all_obj)
mft._btnFit.clicked.connect(self.module_fix_target_fit_fiducial) mft._btnFit.clicked.connect(self.module_fix_target_fit_fiducial)
@@ -2110,15 +2110,38 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
#bm_pos_eu=self._goBeamMarker._pos_eu #bm_pos_eu=self._goBeamMarker._pos_eu
#bm_size_eu=self._goBeamMarker._size_eu #bm_size_eu=self._goBeamMarker._size_eu
try: try:
pLst=param.split(',') #parse the parameters: 'key:value [,key:value]'
pStr='{' # as key value separator : and = are allowed
#examples:
#Fiducial:
# no param
#FixTarget(12.5x12.5), FixTarget(23.0x23.0), FixTarget(test):
# code_gen:2
# code_gen=3 | tmove=10 | twait=30
#Grid():
# size:(30, 20)
# cnt:(30, 22)
# fiducialSize:0.1
#SwissMX():
# ofs:(.2, .2)
# width:10
# fidScl:.02
# fiducial:((.1, .1), (.1, 2.7), (10.3, .1), (10.3, 2.7))
#SwissFEL():
# ofs:(.2, .2)
# width:10
# fidScl:.02
# fiducial:((.1, .1), (.1, 2.2), (10.3, .1), (10.3, 2.2))
pLst=param.split('|')
pStr=list()
for p in pLst: for p in pLst:
if not p: continue if not p: continue
m=re.match('\s*(.*?)\s*[=:]\s*(.*)\s*', p) m=re.match('\s*(.*?)\s*[=:]\s*(.*)\s*', p)
k, v=m.groups() k, v=m.groups()
v=v.replace('(', '[').replace(')', ']') v=v.replace('(', '[').replace(')', ']')
pStr+=f'"{k}":{v}' pStr.append(f'"{k}":{v}')
pStr+='}' pStr='{'+','.join(pStr)+'}'
param=json.loads(pStr) # "ofs":[10, 5],"width":200,"fidScl":0.5,"fiducial":[[18,7],[25,16],[70, 20]] param=json.loads(pStr) # "ofs":[10, 5],"width":200,"fidScl":0.5,"fiducial":[[18,7],[25,16],[70, 20]]
except json.decoder.JSONDecodeError as e: except json.decoder.JSONDecodeError as e:
_log.error(f'{e}:{param}') _log.error(f'{e}:{param}')
@@ -2162,9 +2185,9 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
fidScl=param.pop('fidScl',.02) fidScl=param.pop('fidScl',.02)
fiducial=param.pop('fiducial',((.1, .1), (.1, 2.2), (10.3, .1), (10.3, 2.2))) fiducial=param.pop('fiducial',((.1, .1), (.1, 2.2), (10.3, .1), (10.3, 2.2)))
fiducial=np.array(fiducial) fiducial=np.array(fiducial)
gp=psi_device.shapepath.GenPath(); gp.swissfel(ofs=ofs, width=width,flipy=True,**param) gp=psi_device.shapepath.GenPath(); gp.swissfel(ofs=ofs, width=width,flipy=True)
sz=gp.points.max(0)+np.array(ofs)*2 sz=gp.points.max(0)+np.array(ofs)*2
go=UsrGO.Path((fx-sz[0]/2, fy-sz[1]/2), sz, gp.points, fiducial, fidScl) go=UsrGO.Path((fx-sz[0]/2, fy-sz[1]/2), sz, gp.points, fiducial, fidScl,**param)
else: else:
_log.error('index not handeled') _log.error('index not handeled')
@@ -2258,6 +2281,11 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
code_gen: 0 pvt motion using ptsTrf code_gen: 0 pvt motion using ptsTrf
1 pvt motion using trf and points 1 pvt motion using trf and points
2 pvt motion, compact grid code 2 pvt motion, compact grid code
3 pvt motion, compact grid code move and wait
tmove: time to move
twait: time to wait
grid: grid dictionary with orig, pitch, count grid: grid dictionary with orig, pitch, count
trf: transformation matrix trf: transformation matrix
points: list of points without transformation points: list of points without transformation
@@ -2301,7 +2329,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
#dlg.show() #dlg.show()
dlg.setLabelText("Setup Gather/Sync");dlg+=5 dlg.setLabelText("Setup Gather/Sync");dlg+=5
num_pts=kwargs['num_pts'] num_pts=kwargs['num_pts']
code_gen=kwargs['code_gen'] code_gen=kwargs.get('code_gen',0)
sp.setup_gather(num_pts) sp.setup_gather(num_pts)
sp.setup_sync(verbose=sp.verbose&0x40, timeOfs=dt_misc['time_ofs'], timeCor=dt_misc['time_cor']) sp.setup_sync(verbose=sp.verbose&0x40, timeOfs=dt_misc['time_ofs'], timeCor=dt_misc['time_cor'])
dlg.setLabelText("Download motion program");dlg+=5 dlg.setLabelText("Download motion program");dlg+=5
@@ -2311,6 +2339,8 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
sp.setup_motion(fnPrg=fn+'.prg', mode=3, scale=1., dwell=10, points=kwargs['points'],trf=kwargs['trf']) sp.setup_motion(fnPrg=fn+'.prg', mode=3, scale=1., dwell=10, points=kwargs['points'],trf=kwargs['trf'])
elif code_gen==2: elif code_gen==2:
sp.setup_motion(fnPrg=fn+'.prg', mode=4, scale=1., dwell=10, grid=kwargs['grid'], trf=kwargs['trf']) sp.setup_motion(fnPrg=fn+'.prg', mode=4, scale=1., dwell=10, grid=kwargs['grid'], trf=kwargs['trf'])
elif code_gen==3:
sp.setup_motion(fnPrg=fn+'.prg', mode=5, dwell=10, tmove=kwargs['tmove'] ,twait=kwargs['twait'], grid=kwargs['grid'],trf=kwargs['trf'])
try: try:
p=geo._fitPlane p=geo._fitPlane
# TODO: Cleanup # TODO: Cleanup