add DAQ params, better autofocus
This commit is contained in:
@@ -370,7 +370,7 @@ class WndSwissMx(QMainWindow, Ui_MainWindow):
|
||||
#--- opctical center ----
|
||||
oc_sz=np.array((50,50))
|
||||
#self._goOptCtr=obj=UsrGO.Marker(-opt_ctr+oc_sz/2, oc_sz,mode=1)
|
||||
self._goOptCtr=obj=UsrGO.Marker(opt_ctr-oc_sz/2, oc_sz,mode=1)
|
||||
self._goOptCtr=obj=UsrGO.Marker(opt_ctr-oc_sz/2, oc_sz,mode=1, movable=False)
|
||||
obj.sigRegionChangeFinished.connect(self.cb_marker_moved)
|
||||
grp.addItem(obj)
|
||||
|
||||
@@ -407,14 +407,12 @@ class WndSwissMx(QMainWindow, Ui_MainWindow):
|
||||
#--- beam marker ---
|
||||
size_eu=cfg.value(AppCfg.GEO_BEAM_SZ)/1000 # convert from um to mm
|
||||
pos_eu=cfg.value(AppCfg.GEO_BEAM_POS)/1000 # convert from um to mm
|
||||
self._goBeamMarker=obj=UsrGO.Marker(pos_eu-size_eu/2,size_eu,mode=0)
|
||||
self._goBeamMarker=obj=UsrGO.Marker(pos_eu-size_eu/2,size_eu,mode=0,movable=False)
|
||||
obj.sigRegionChangeFinished.connect(self.cb_marker_moved)
|
||||
#bm.setTransform(tr) # assign transform
|
||||
grp.addItem(obj)
|
||||
|
||||
|
||||
|
||||
|
||||
#--- testing scan grid ---
|
||||
#self.track_objects() # first call is needed to initialize the structure self._goTracked
|
||||
# #go=UsrGO.Grid((120, -100), (200, 150), (30, 22), 2)
|
||||
@@ -2154,7 +2152,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
|
||||
sp.wait_armed() # wait until motors are at first position
|
||||
|
||||
sp.trigger(0.5) # send a start trigger (if needed) after given time
|
||||
jf.acquire('filename.tmp',sp.points.shape[0])
|
||||
jf.acquire(sp.points.shape[0])
|
||||
if not dt._comm is None:
|
||||
dlg.setLabelText("run motion/acquisition")
|
||||
dlg.setMaximum(sp.points.shape[0])
|
||||
|
||||
Reference in New Issue
Block a user