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

Changes to psi_device and app_config to add gui options for JFJoch. PSI-device now parses these messages in a message to JFJoch

Browse Source
This commit is contained in:
Appleby Martin Vears
2024-11-25 11:10:19 +01:00
parent 7014351eb4
commit 5d4808e6a1
2 changed files with 169 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
app_config.py
View File

@@ -57,9 +57,13 @@ class AppCfg(QSettings):
DT_HOST="deltatau/host"
DT_MISC="deltatau/miscellaneous"
DATA_PROC="data_processing"
DAQ_DET="daq/detector" #json
DAQ_LOC="daq/location" #json
DAQ_RUN="daq/run" #json
DAQ_SAMPLE="daq/sample"#json
DAQ_UC="daq/unit_cell" #json
DAQ_BS_CH="daq/bs_channels" #list of str
DAQ_PV_CH="daq/pv_channels" #list of str
@@ -120,6 +124,23 @@ class AppCfg(QSettings):
dflt.append((AppCfg.DT_HOST, 'SAR-CPPM-EXPMX1'))
if AppCfg.DT_MISC not in keys:
dflt.append((AppCfg.DT_MISC,{'show_plots':True, 'vel_scl':1.0, 'fel_per':10.0, 'time_ofs':0.03, 'time_cor':0.0005, 'sync_mode':1, 'sync_flag':3, 'verbose':0xff}))
if AppCfg.DATA_PROC not in keys:
dflt.append((AppCfg.DATA_PROC, {
'indexing' : "xgandalf-latt-cell",
'peaks' : "peakfinder8",
'integration' : "rings-nocen-nograd",
'tolerance': "10.0,10.0,10.0,2,3,2",
'threshold': 10,
'min-snr' : 5,
'int-radius' : "5,7,9",
'min-pix-count' : 1,
'min-peaks' : 6,
'multi' : False,
'check-peaks' : False,
'retry' : False,
}))
if AppCfg.DAQ_DET not in keys:
dflt.append((AppCfg.DAQ_DET, {
"name" : "JF17T16V01",
@@ -133,9 +154,31 @@ class AppCfg(QSettings):
"crystfel_lists_laser" : True,
}))
if AppCfg.DAQ_LOC not in keys:
dflt.append((AppCfg.DAQ_LOC, {'end_station':"cristallina", 'p_group':"p20516", 'jungfraujoch' : False,}))
dflt.append((AppCfg.DAQ_LOC, {
'end_station': "cristallina",
'p_group': "p20516",
'jungfraujoch': False,
'event_trigger': 63,
'beam_x': 1613.0,
'beam_y': 1666.0,
'incident_energy_kev': 12.4,
'geometry_file_location': "/res/geometry_files/JF17T16V01.geom",
}))
if AppCfg.DAQ_SAMPLE not in keys:
dflt.append((AppCfg.DAQ_SAMPLE, {'protein':'hewl',}))
if AppCfg.DAQ_UC not in keys:
dflt.append((AppCfg.DAQ_UC, {'a':78.0, 'b':78.0, 'c':38.0 , 'alpha':90.0, 'beta':90.0, 'gamma':90.0, 'space_group_number':96,}))
if AppCfg.DAQ_RUN not in keys:
dflt.append((AppCfg.DAQ_RUN, {'prefix':'jf', 'padding':10, 'cell_name' : 'na', 'block_size':1000,}))
dflt.append((AppCfg.DAQ_RUN, {
'prefix':'jf',
'padding':10,
'cell_name' : 'na',
'triggered': False,
'laser_delay': '',
'laser_pulse_energy': '',
'block_size':1000,
}))
#if AppCfg.DAQ_BS_CH not in keys:
dflt.append((AppCfg.DAQ_BS_CH, ("SARES30-LSCP1-CRISTA1:CH0:1","SAR-CVME-TIFALL6:EvtSet", "SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-AVG", "SARFE10-PBIG050-EVR0:CALCI", "SARFE10-PBPG050:HAMP-INTENSITY-CAL",
"SARFE10-PBPS053:INTENSITY", "SARFE10-PBPS053:XPOS", "SARFE10-PBPS053:YPOS", "SARFE10-PSSS059:SPECTRUM_X", "SARFE10-PSSS059:SPECTRUM_Y", "SARFE10-PSSS059:SPECTRUM_Y_SUM",
@@ -199,7 +242,8 @@ class AppCfg(QSettings):
AppCfg.GEO_FND_FID, AppCfg.GEO_AUTOFOC,
AppCfg.DFT_POS_DET,AppCfg.DFT_POS_GONIO,AppCfg.DFT_POS_PST,AppCfg.DFT_POS_COL,AppCfg.DFT_POS_BKLGT,
AppCfg.DT_MISC,
AppCfg.DAQ_DET,AppCfg.DAQ_LOC,AppCfg.DAQ_RUN,AppCfg.DAQ_BS_CH,AppCfg.DAQ_PV_CH
AppCfg.DATA_PROC,
AppCfg.DAQ_DET,AppCfg.DAQ_LOC,AppCfg.DAQ_RUN,AppCfg.DAQ_BS_CH,AppCfg.DAQ_PV_CH,AppCfg.DAQ_UC,AppCfg.DAQ_SAMPLE
):
val=json.dumps(val, cls=MyJsonEncoder)
val=val.replace('"',"'")
@@ -226,7 +270,8 @@ class AppCfg(QSettings):
AppCfg.GEO_FND_FID, AppCfg.GEO_AUTOFOC,
AppCfg.DFT_POS_DET,AppCfg.DFT_POS_GONIO,AppCfg.DFT_POS_PST,AppCfg.DFT_POS_COL,AppCfg.DFT_POS_BKLGT,
AppCfg.DT_MISC,
AppCfg.DAQ_DET,AppCfg.DAQ_LOC,AppCfg.DAQ_RUN,AppCfg.DAQ_BS_CH,AppCfg.DAQ_PV_CH
AppCfg.DATA_PROC,
AppCfg.DAQ_DET,AppCfg.DAQ_LOC,AppCfg.DAQ_RUN,AppCfg.DAQ_BS_CH,AppCfg.DAQ_PV_CH,AppCfg.DAQ_UC,AppCfg.DAQ_SAMPLE
):
if val is not None:
val=val.replace("'",'"')
@@ -281,10 +326,15 @@ class WndParameter(QMainWindow):
geo_cam_param = cfg.value(AppCfg.GEO_CAM_PARAM)
dt_host = cfg.value(AppCfg.DT_HOST)
dt_misc = cfg.value(AppCfg.DT_MISC)
data_proc = cfg.value(AppCfg.DATA_PROC)
daq_det = cfg.value(AppCfg.DAQ_DET)
daq_loc = cfg.value(AppCfg.DAQ_LOC)
daq_run = cfg.value(AppCfg.DAQ_RUN)
daq_sample = cfg.value(AppCfg.DAQ_SAMPLE)
daq_uc = cfg.value(AppCfg.DAQ_UC)
tip_sync_mode='''\
default=2
@@ -387,8 +437,8 @@ verbose bits:
{'name':'pos_diode','title':'Diode pos', 'value':dft_pos_bklgt.get('pos_diode', 0), 'type':'float','limits':(-31000, 1500), 'step':10, 'decimals':5, 'suffix':'ustep'},
]},
{'name': AppCfg.DFT_POS_DET, 'title':'detector reference positions', 'type':'group','expanded':False, 'children':[
{'name':'pos_in', 'title':'In position', 'value':dft_pos_det.get('pos_in',0), 'type':'float', 'limits':(-200, 200),'step':0.1, 'decimals':5, 'suffix':' mm'},
{'name':'pos_out','title':'Out position', 'value':dft_pos_det.get('pos_out',0), 'type':'float', 'limits':(-200, 200),'step':0.1, 'decimals':5, 'suffix':' mm'},
{'name':'pos_in', 'title':'In position', 'value':dft_pos_det.get('pos_in',0), 'type':'float', 'limits':(112, 280),'step':0.1, 'decimals':5, 'suffix':' mm'},
{'name':'pos_out','title':'Out position', 'value':dft_pos_det.get('pos_out',0), 'type':'float', 'limits':(112, 280),'step':0.1, 'decimals':5, 'suffix':' mm'},
{'name':'set_in', 'title':'use current position as "in"', 'type':'action'},
{'name':'set_out', 'title':'use current position as "out"', 'type':'action'},
]},
@@ -411,29 +461,62 @@ verbose bits:
{'name':'verbose', 'value':dt_misc['verbose'], 'type':'int', 'tip':tip_verbose},
]},
]},
{'name': AppCfg.DATA_PROC, 'title':'data processing parameters', 'type':'group','expanded':False, 'children':[
{'name':'indexing', 'value':data_proc['indexing'], 'type':'str', 'tip':"default=xgandalf-latt-cell"},
{'name':'peaks', 'value':data_proc['peaks'], 'type':'str', 'tip':"default=peakfinder8"},
{'name':'integration', 'value':data_proc['integration'], 'type':'str', 'tip':"default=rings-nocen-nograd"},
{'name':'tolerance', 'value':data_proc['tolerance'], 'type':'str', 'tip':"default=10.0,10.0,10.0,2,3,2"},
{'name':'threshold', 'value':data_proc['threshold'], 'type':'int', 'tip':"default=10"},
{'name':'min-snr', 'value':data_proc['min-snr'], 'type':'int', 'tip':"default=5"},
{'name':'min-pix-count', 'value':data_proc['min-pix-count'], 'type':'int', 'tip':"default=1"},
{'name':'min-peaks', 'value':data_proc['min-peaks'], 'type':'int', 'tip':"default=6"},
{'name':'int-radius', 'value':data_proc['int-radius'], 'type':'str', 'tip':"default=5,7,9"},
{'name':'multi', 'value':data_proc['multi'], 'type':'bool', 'tip':"default=False"},
{'name':'check-peaks', 'value':data_proc['check-peaks'], 'type':'bool', 'tip':"default=False"},
{'name':'retry', 'value':data_proc['retry'], 'type':'bool', 'tip':"default=False"},
]},
{'name':'data acquisition', 'type':'group','expanded':False, 'children':[
{'name':AppCfg.DAQ_DET, 'title':'detector', 'type':'group', 'children':[
{'name':'name', 'value':daq_det['name'], 'type':'str',},
{'name':'adc_to_energy', 'value':daq_det['adc_to_energy'], 'type':'bool'},
{'name':'compression', 'value':daq_det['compression'], 'type':'bool'},
{'name':'factor', 'value':daq_det['factor'], 'type':'float','step':0.01},
{'name':'geometry', 'value':daq_det['geometry'], 'type':'bool'},
{'name':AppCfg.DAQ_DET, 'title':'legacy daq parameters', 'type':'group', 'children':[
{'name':'name', 'value':daq_det['name'], 'type':'str',},
{'name':'adc_to_energy', 'value':daq_det['adc_to_energy'], 'type':'bool'},
{'name':'compression', 'value':daq_det['compression'], 'type':'bool'},
{'name':'factor', 'value':daq_det['factor'], 'type':'float', 'step':0.01},
{'name':'geometry', 'value':daq_det['geometry'], 'type':'bool'},
{'name':'double_pixels_action', 'value':daq_det['double_pixels_action'], 'type':'str'},
{'name':'remove_raw_files', 'value':daq_det['remove_raw_files'], 'type':'bool'},
{'name':'save_dap_results', 'value':daq_det['save_dap_results'], 'type':'bool'},
{'name':'crystfel_lists_laser','value':daq_det['crystfel_lists_laser'],'type':'bool'}
{'name':'remove_raw_files', 'value':daq_det['remove_raw_files'], 'type':'bool'},
{'name':'save_dap_results', 'value':daq_det['save_dap_results'], 'type':'bool'},
{'name':'crystfel_lists_laser', 'value':daq_det['crystfel_lists_laser'], 'type':'bool'}
]},
{'name':AppCfg.DAQ_LOC, 'title':'location', 'type':'group', 'children':[
{'name':'end_station', 'value':daq_loc['end_station'], 'type':'str',},
{'name':'p_group', 'value':daq_loc['p_group'], 'type':'str'},
{'name':'jungfraujoch', 'value':daq_loc['jungfraujoch'], 'type':'bool'},
{'name':AppCfg.DAQ_LOC, 'title':'data handling', 'type':'group', 'children':[
{'name':'end_station', 'value':daq_loc['end_station'], 'type':'str',},
{'name':'p_group', 'value':daq_loc['p_group'], 'type':'str'},
{'name':'jungfraujoch', 'value':daq_loc['jungfraujoch'], 'type':'bool'},
{'name':'event_trigger', 'value':daq_loc['event_trigger'], 'type':'int', 'limits':(1, 256)},
{'name':'beam_x', 'value':daq_loc['beam_x'], 'type':'float','step':0.001, 'decimals':3},
{'name':'beam_y', 'value':daq_loc['beam_y'], 'type':'float','step':0.001, 'decimals':3},
{'name':'incident_energy_kev', 'value':daq_loc['incident_energy_kev'], 'type':'float','step':0.001, 'decimals':5},
{'name':'geometry_file_location', 'value':daq_loc['geometry_file_location'], 'type':'str',},
]},
{'name':AppCfg.DAQ_RUN, 'title':'location', 'type':'group', 'children':[
{'name':'prefix', 'value':daq_run['prefix'], 'type':'str',},
{'name':'padding','value':daq_run['padding'], 'type':'int'},
{'name':'cell_name', 'value':daq_run['cell_name'], 'type':'str'},
{'name':'block_size', 'value':daq_run['block_size'], 'type':'int'},
{'name':AppCfg.DAQ_RUN, 'title':'run paramters', 'type':'group', 'children':[
{'name':'prefix', 'value':daq_run['prefix'], 'type':'str'},
{'name':'padding', 'value':daq_run['padding'], 'type':'int'}, #at some point move to old_daq_config
{'name':'cell_name', 'value':daq_run['cell_name'], 'type':'str'}, #at some point move to old_daq_config
{'name':'laser_delay', 'value':daq_run['laser_delay'], 'type':'str'},
{'name':'laser_pulse_energy', 'value':daq_run['laser_pulse_energy'], 'type':'str'},
{'name':'triggered', 'value':daq_run['triggered'], 'type':'bool'},
{'name':'block_size', 'value':daq_run['block_size'], 'type':'int'},
]},
{'name':AppCfg.DAQ_SAMPLE, 'title':'sample paramters', 'type':'group', 'children':[
{'name':'protein', 'value':daq_sample['protein'], 'type':'str',},
{'name':AppCfg.DAQ_UC, 'title':'unit cell', 'type':'group', 'children':[
{'name':'a', 'value':daq_uc['a'], 'type':'float', 'step':0.001, 'decimals':3},
{'name':'b', 'value':daq_uc['b'], 'type':'float', 'step':0.001, 'decimals':3},
{'name':'c', 'value':daq_uc['c'], 'type':'float', 'step':0.001, 'decimals':3},
{'name':'alpha', 'value':daq_uc['alpha'], 'type':'float', 'step':0.001, 'decimals':3},
{'name':'beta', 'value':daq_uc['beta'], 'type':'float', 'step':0.001, 'decimals':3},
{'name':'gamma', 'value':daq_uc['gamma'], 'type':'float', 'step':0.001, 'decimals':3},
{'name':'space_group_number', 'value':daq_uc['space_group_number'], 'type':'int'},
]},
]},
{'name':AppCfg.DAQ_BS_CH, 'title':'list of beam-sync channels','value':' '.join(cfg.value(AppCfg.DAQ_BS_CH)), 'type':'str'},
{'name':AppCfg.DAQ_PV_CH, 'title':'list of PV channels','value':' '.join(cfg.value(AppCfg.DAQ_PV_CH)), 'type':'str'},
@@ -560,6 +643,7 @@ verbose bits:
cfg.setValue(nm,lst)
elif par_nm in (AppCfg.GBL_MISC,AppCfg.DT_MISC,
AppCfg.GEO_FND_FID,AppCfg.GEO_AUTOFOC,
AppCfg.DAQ_UC, AppCfg.DAQ_SAMPLE, AppCfg.DATA_PROC,
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)