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

various fixes (post_sample_tube, timing etc.)

Browse Source
This commit is contained in:
zamofing_t
2022-09-28 14:52:13 +02:00
parent 30a9c77230
commit a186d256d3
6 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app_config.py
View File

@@ -497,7 +497,9 @@ verbose bits:
s=param.value()
lst=s.split(' ') if len(s)>0 else ()
cfg.setValue(nm,lst)
elif par_nm in (AppCfg.GBL_MISC,AppCfg.DT_MISC,AppCfg.GEO_FND_FID,AppCfg.GEO_AUTOFOC):
elif par_nm in (AppCfg.GBL_MISC,AppCfg.DT_MISC,
AppCfg.GEO_FND_FID,AppCfg.GEO_AUTOFOC,
AppCfg.DAQ_DET,AppCfg.DAQ_LOC,AppCfg.DAQ_RUN):
d=dict(map(lambda x:(x.name(),x.value()), parent.children()))
cfg.setValue(par_nm, d)
if par_nm in (AppCfg.GBL_MISC):
@@ -545,8 +547,8 @@ verbose bits:
if pos=='in':
lut=((0,'tube_usx'),(1,'tube_usy'),(2,'tube_dsx'),(3,'tube_dsy'),(6,'tube_z'))
elif pos=='out':
cld[4].setValue(cld[0].value()-twk['tube_usx'].get_val()) #x_in_us-x_us
cld[5].setValue(cld[1].value()-twk['tube_usy'].get_val()) #y_in_us-y_us
cld[4].setValue(twk['tube_usx'].get_val()-cld[0].value()) #x_us-x_in_us
cld[5].setValue(twk['tube_usy'].get_val()-cld[1].value()) #y_us-y_in_us
lut=((7,'tube_z'),)
elif dev==AppCfg.DFT_POS_COL:
# k=('x_in', 'y_in', 'x_out', 'y_out')