diff --git a/pyqtUsrObj.py b/pyqtUsrObj.py index e414194..3719520 100644 --- a/pyqtUsrObj.py +++ b/pyqtUsrObj.py @@ -448,6 +448,19 @@ class FixTargetFrame(UsrROI): 'pitch':(120, 120), 'count':(162, 162) #(172,172)... but sone covered } + }, + '23.0x23.0_160x156':{ + 'size':(23000+120*4, 23000+120*4), + 'fiducial':{ + 'type':0, + 'pos':((240, 240), (240+23000, 240), (240, 240+23000), (240+23000, 240+23000)) + }, + 'grid':{ + # removed 1 column from each side and 6 rows from top + 'pos':(2200, 2800), + 'pitch':(120, 120), + 'count':(160, 156) + } } } diff --git a/swissmx.py b/swissmx.py index cb7a1ce..cd6a688 100755 --- a/swissmx.py +++ b/swissmx.py @@ -1980,7 +1980,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch) mft.setAccessibleName(TASK_FIX_TARGET) 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(test)", "Grid()", "SwissMX()", "SwissFEL()"]) + mft._cbType.addItems(["Fiducial", "FixTarget(12.5x12.5)", "FixTarget(23.0x23.0)", "FixTarget(23.0x23.0_160x156)", "FixTarget(test)", "Grid()", "SwissMX()", "SwissFEL()"]) #print(psi_device.shapepath.ShapePath.setup_motion.__doc__) mft._txtParam.setToolTip('''\ additional parameter as yaml for object settings and motion generation: @@ -2010,7 +2010,7 @@ motion generation: object settings: Fiducial: no param - FixTarget(12.5x12.5), FixTarget(23.0x23.0), FixTarget(test): + FixTarget(12.5x12.5), FixTarget(23.0x23.0), FixTarget(23.0x23.0_160x156), FixTarget(test): no param Grid(): size:[30,20] @@ -2154,14 +2154,17 @@ object settings: sz=param.pop('size',(23, 23)) go=UsrGO.FixTargetFrame((fx-sz[0]/2,fy-sz[1]/2), sz, tpl='23.0x23.0',**param) elif idx==3: + sz=param.pop('size',(23, 23)) + go=UsrGO.FixTargetFrame((fx-sz[0]/2,fy-sz[1]/2), sz, tpl='23.0x23.0_160x156',**param) + elif idx==4: sz=param.pop('size',(.120*12, .120*8)) go=UsrGO.FixTargetFrame((fx-sz[0]/2,fy-sz[1]/2), sz, tpl='test',**param) - elif idx==4: + elif idx==5: w,h=size=param.pop('size',(30, 20)) cnt=param.pop('cnt',(30, 22)) fiducialSize=param.pop('fiducialSize',.1) go=UsrGO.Grid((fx-w/2,fy-h/2), size, cnt, fiducialSize,**param) - elif idx==5: + elif idx==6: ofs=param.pop('ofs',(.2, .2)) width=param.pop('width',10) fidScl=param.pop('fidScl',.02) @@ -2170,7 +2173,7 @@ object settings: gp=psi_device.shapepath.GenPath(); gp.swissmx(ofs=ofs, width=width, flipy=True) 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,**param) - elif idx==6: + elif idx==7: ofs=param.pop('ofs',(.2, .2)) width=param.pop('width',10) fidScl=param.pop('fidScl',.02)