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

running changes made by M.Appleby and J.Beale. Mainly to update due to python 3.10

Browse Source
This commit is contained in:
John Henry Beale
2025-11-10 10:47:31 +01:00
parent 84d74d5d23
commit c4c5ea6491
4 changed files with 182 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app_config.py
View File

@@ -155,14 +155,14 @@ class AppCfg(QSettings):
}))
if AppCfg.DAQ_LOC not in keys:
dflt.append((AppCfg.DAQ_LOC, {
'end_station': "cristallina",
'p_group': "p20516",
'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",
'geometry_file_location': '/res/geometry_files/JF17T16V01.geom',
}))
if AppCfg.DAQ_SAMPLE not in keys:
@@ -177,6 +177,7 @@ class AppCfg(QSettings):
'triggered': False,
'laser_delay': '',
'laser_pulse_energy': '',
'num_of_on_to_1_off': '1',
'block_size':1000,
}))
#if AppCfg.DAQ_BS_CH not in keys:
@@ -186,7 +187,7 @@ class AppCfg(QSettings):
"SARFE10-PSSS059:SPECT-RMS", "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD0", "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD1", "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD2", "SAROP31-PBPS113:Lnk9Ch0-PP_VAL_PD3", "SAROP31-PBPS113:XPOS",
"SAROP31-PBPS113:YPOS", "SAROP31-PBPS113:INTENSITY", "SAROP31-PBPS113:INTENSITY_UJ", "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD0", "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD1", "SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD2",
"SAROP31-PBPS149:Lnk9Ch0-PP_VAL_PD3", "SAROP31-PBPS149:XPOS", "SAROP31-PBPS149:YPOS", "SAROP31-PBPS149:INTENSITY", "SAROP31-PBPS149:INTENSITY_UJ", "SARES30-LSCP1-FNS:CH7:VAL_GET", "SARES30-LSCP1-FNS:CH6:VAL_GET",
"SARES30-LSCP1-FNS:CH5:VAL_GET", "SARES30-LSCP1-FNS:CH4:VAL_GET", "SARES30-LSCP1-FNS:CH3:VAL_GET", "SARES30-LSCP1-FNS:CH2:VAL_GET", "SARES30-LSCP1-FNS:CH1:VAL_GET", "SARES30-LSCP1-FNS:CH0:VAL_GET"))) #list of BS channels
"SARES30-LSCP1-FNS:CH5:VAL_GET", "SARES30-LSCP1-FNS:CH4:VAL_GET", "SARES30-LSCP1-FNS:CH3:VAL_GET", "SARES30-LSCP1-FNS:CH2:VAL_GET", "SARES30-LSCP1-FNS:CH1:VAL_GET", "SARES30-LSCP1-FNS:CH0:VAL_GET", "SARES33-GPS:PR1_CH0_VAL_GET")))#list of BS channels
#if AppCfg.DAQ_PV_CH not in keys:
dflt.append((AppCfg.DAQ_PV_CH, ("SARUN03-UIND030:K_SET.VAL", "SARUN04-UIND030:K_SET.VAL", "SARUN05-UIND030:K_SET.VAL", "SARUN06-UIND030:K_SET.VAL", "SARUN07-UIND030:K_SET.VAL", "SARUN08-UIND030:K_SET.VAL", "SARUN09-UIND030:K_SET.VAL",
"SARUN10-UIND030:K_SET.VAL", "SARUN11-UIND030:K_SET.VAL", "SARUN12-UIND030:K_SET.VAL", "SARUN13-UIND030:K_SET.VAL", "SARUN14-UIND030:K_SET.VAL", "SARUN15-UIND030:K_SET.VAL", "SARCL02-MBND100:P-READ",
@@ -437,8 +438,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':(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':'pos_in', 'title':'In position', 'value':dft_pos_det.get('pos_in',0), 'type':'float', 'limits':(108, 290),'step':0.1, 'decimals':5, 'suffix':' mm'},
{'name':'pos_out','title':'Out position', 'value':dft_pos_det.get('pos_out',0), 'type':'float', 'limits':(108, 290),'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'},
]},
@@ -492,19 +493,20 @@ verbose bits:
{'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':'beam_x', 'value':daq_loc['beam_x'], 'type':'float','step':0.01, 'decimals':2},
{'name':'beam_y', 'value':daq_loc['beam_y'], 'type':'float','step':0.01, 'decimals':2},
{'name':'incident_energy_kev', 'value':daq_loc['incident_energy_kev'], 'type':'float','step':0.001, 'decimals':3},
{'name':'geometry_file_location', 'value':daq_loc['geometry_file_location'], 'type':'str',},
]},
{'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':'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':'triggered', 'value':daq_run['triggered'], 'type':'bool'},
{'name':'num_of_on_to_1_off', 'value':daq_run['num_of_on_to_1_off'], 'type':'int', 'limits':(1, 6)},
{'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',},