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

turn of monitors during data collection

Browse Source
This commit is contained in:
zamofing_t
2023-06-30 16:37:58 +02:00
parent e910083b1a
commit 05edca9d88
1 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
swissmx.py
View File

@@ -715,6 +715,7 @@ class WndSwissMx(QMainWindow, Ui_MainWindow):
_log.debug(f'diff:{k},{v} != {paramSv[k]}') _log.debug(f'diff:{k},{v} != {paramSv[k]}')
cam.run(self.cb_new_frame_pv) cam.run(self.cb_new_frame_pv)
app._pv_mon_lst.append(cam._pv['pic'])
def cb_new_frame_pv(self, **kwargs): def cb_new_frame_pv(self, **kwargs):
try: #pv-monitor-func try: #pv-monitor-func
@@ -995,11 +996,19 @@ class WndSwissMx(QMainWindow, Ui_MainWindow):
#pv-monitor-func #pv-monitor-func
#_log.info('modify monitors') #_log.info('modify monitors')
#for w in widgets[1:-1]: #ignore last item app=QApplication.instance()
pv_mon_lst=app._pv_mon_lst
try:
for w in widgets[:-1]: #ignore last item
for pv in w._motor._pvs.values():
pv_mon_lst.append(pv)
# for k,pv in w._motor._pvs.items(): # for k,pv in w._motor._pvs.items():
# pv.auto_monitor=False # pv.auto_monitor=False
# for k,pv in w._motor._pvs.items(): # for k,pv in w._motor._pvs.items():
# pv.auto_monitor=True # pv.auto_monitor=True
except AttributeError as e:
sim=app._args.sim
assert(sim&0x10,'assuming simulated motors')
def build_group_collimator(self, toolbox): def build_group_collimator(self, toolbox):
pfx=QApplication.instance()._cfg.value(AppCfg.GBL_DEV_PREFIX)[1] pfx=QApplication.instance()._cfg.value(AppCfg.GBL_DEV_PREFIX)[1]
@@ -2262,6 +2271,11 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
sp.meta['sync_mode']=dt_misc['sync_mode'] sp.meta['sync_mode']=dt_misc['sync_mode']
sp.meta['sync_flag']=dt_misc['sync_flag'] sp.meta['sync_flag']=dt_misc['sync_flag']
#pv-monitor-func: stop monitors
pv_mon_lst=app._pv_mon_lst
for pv in pv_mon_lst:
pv.auto_monitor=False
with pg.ProgressDialog('Progress', 0, 100) as dlg: with pg.ProgressDialog('Progress', 0, 100) as dlg:
dlg.setWindowModality(Qt.WindowModal) dlg.setWindowModality(Qt.WindowModal)
#dlg.setRange(0, 0) #dlg.setRange(0, 0)
@@ -2325,6 +2339,9 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
comm.gpascii._cb_func=lambda i, sz:self.cb_progress(i, sz, dlg) comm.gpascii._cb_func=lambda i, sz:self.cb_progress(i, sz, dlg)
if dlg.wasCanceled(): if dlg.wasCanceled():
# pv-monitor-func: start monitors
for pv in pv_mon_lst:
pv.auto_monitor=True
return return
dlg.setLabelText("Homing and get ready");dlg+=5 dlg.setLabelText("Homing and get ready");dlg+=5
sp.homing() # homing if needed sp.homing() # homing if needed
@@ -2365,6 +2382,9 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
#plt.show(block=True) #plt.show(block=True)
shutter.close() shutter.close()
# pv-monitor-func: start monitors
for pv in pv_mon_lst:
pv.auto_monitor=True
def esc_run_steps(self, steps, title, esc_state): def esc_run_steps(self, steps, title, esc_state):
self._esc_state ="busy" self._esc_state ="busy"
@@ -4139,6 +4159,9 @@ if __name__=="__main__":
app._args=args app._args=args
app._pv_mon_lst=list() #pv-monitor-func: list of all pv that are monitored and that should
# be turned on/off during data collection to avoid (hopefully) segmentation fault
startupWin.set(5, f'load settings') startupWin.set(5, f'load settings')
app._cfg=cfg=AppCfg() app._cfg=cfg=AppCfg()