sf-daq/sf_daq_broker
0
0
Fork 0
mirror of https://github.com/paulscherrerinstitute/sf_daq_broker.git synced 2026-08-11 13:40:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from NichtJens/master

Browse Source 
added option to send units of scanned axis to scan-info json
This commit is contained in:
babic_a
2021-05-20 19:41:26 +02:00
committed by GitHub
parent 135295b1d1 674a5c8e27
commit 31f080308e
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sf_daq_broker/broker_manager.py
+15 -1
View File
@@ -292,7 +292,21 @@ class BrokerManager(object):
os.makedirs(scan_dir)
scan_info_file = scan_dir+"/"+scan_name+".json"
if not os.path.exists(scan_info_file):
scan_info = {"scan_files" : [], "scan_parameters" : {"Id" : request_scan_info.get("motors_pv_name"), "name": request_scan_info.get("motors_name"), "offset": request_scan_info.get("motors_offset"), "conversion_factor": request_scan_info.get("motors_coefficient")}, "scan_readbacks": [], "scan_step_info": [], "scan_values": [], "scan_readbacks_raw": [], "pulseIds": []}
scan_info = {
"scan_parameters": {
"Id": request_scan_info.get("motors_pv_name"),
"name": request_scan_info.get("motors_name"),
"units": request_scan_info.get("motors_units"),
"offset": request_scan_info.get("motors_offset"),
"conversion_factor": request_scan_info.get("motors_coefficient")
},
"scan_files": [],
"scan_readbacks": [],
"scan_step_info": [],
"scan_values": [],
"scan_readbacks_raw": [],
"pulseIds": []
}
else:
with open(scan_info_file) as json_file:
scan_info = json.load(json_file)