changes for 2023 Dec. beamtime
This commit is contained in:
@@ -326,6 +326,10 @@ no motion -> wait 1h
|
||||
constant up-dow motion code -> wait 1h
|
||||
|
||||
|
||||
```
|
||||
|
||||
```
|
||||
https://docs.google.com/document/d/1yEmV_DbRBKQKVCoovjXriNgSjNEBaz50WA0l3yA5jtg/edit#heading=h.z9io692b8tow
|
||||
```
|
||||
|
||||
try: #pv-monitor-func
|
||||
|
||||
@@ -990,6 +990,10 @@ class WndSwissMx(QMainWindow, Ui_MainWindow):
|
||||
# for k,pv in w._motor._pvs.items():
|
||||
# pv.auto_monitor=True
|
||||
except AttributeError as e:
|
||||
if type(w)==SimMotorTweak:
|
||||
_log.warning(f'{e},{w},{w._motor._rec_name}')
|
||||
else:
|
||||
_log.warning(f'{e},{w},{pv}')
|
||||
sim=app._args.sim
|
||||
assert(sim&0x10,'assuming simulated motors')
|
||||
|
||||
@@ -1007,7 +1011,7 @@ class WndSwissMx(QMainWindow, Ui_MainWindow):
|
||||
# self.get_tweaker('f"{pfx}:MOT_BLGT', alias='backlight', label='backlight'),
|
||||
self.get_tweaker(f"{pfx}:MOT_FY", alias="fast_y", label="fast Y"),
|
||||
self.get_tweaker(f"{pfx}:MOT_FX", alias="fast_x", label="fast X"),
|
||||
self.get_tweaker(f"{pfx}:MOT_ROT_Y", alias="omega", label="omega", tweak_min=0.001, tweak_max=180.0, ),
|
||||
self.get_tweaker(f"{pfx}:MOT_CY", alias="base_y", label="base Y"),
|
||||
self.get_tweaker(f"{pfx}:MOT_CX", alias="base_x", label="base X"),
|
||||
self.get_tweaker(f"{pfx}:MOT_CZ", alias="base_z", label="base Z"),
|
||||
self.get_tweaker(f"{pfx}:MOT_DET_Z", alias="det_z", label="detector Z"),
|
||||
|
||||
Reference in New Issue
Block a user