sf-daq/dap
0
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

added/use json_load and read_bit utils

Browse Source
This commit is contained in:
augustin_s
2024-07-30 17:02:57 +02:00
parent 1e7d4a0a02
commit 399b887516
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dap/utils.py Normal file
View File

@ -0,0 +1,16 @@
import json
def json_load(filename, *args, **kwargs):
with open(filename, "r") as f:
return json.load(f, *args, **kwargs)
def read_bit(bits, n):
"""
read the n-th bit from bits as boolean
"""
return bool((bits >> n) & 1)

16
dap/worker.py
View File

@ -1,5 +1,4 @@
import argparse import argparse
import json
import os import os
from copy import copy from copy import copy
from random import randint from random import randint
@ -11,6 +10,7 @@ from peakfinder8_extension import peakfinder_8
from algos import calc_radial_integration, calc_apply_additional_mask from algos import calc_radial_integration, calc_apply_additional_mask
from zmqsocks import ZMQSockets from zmqsocks import ZMQSockets
from utils import json_load, read_bit
def main(): def main():
@ -45,8 +45,7 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
peakfinder_parameters = {} peakfinder_parameters = {}
peakfinder_parameters_time = -1 peakfinder_parameters_time = -1
if fn_peakfinder_parameters is not None and os.path.exists(fn_peakfinder_parameters): if fn_peakfinder_parameters is not None and os.path.exists(fn_peakfinder_parameters):
with open(fn_peakfinder_parameters, "r") as read_file: peakfinder_parameters = json_load(fn_peakfinder_parameters)
peakfinder_parameters = json.load(read_file)
peakfinder_parameters_time = os.path.getmtime(fn_peakfinder_parameters) peakfinder_parameters_time = os.path.getmtime(fn_peakfinder_parameters)
pulseid = 0 pulseid = 0
@ -82,8 +81,7 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
if time_delta > 2.0: if time_delta > 2.0:
old_peakfinder_parameters = peakfinder_parameters old_peakfinder_parameters = peakfinder_parameters
sleep(0.5) sleep(0.5)
with open(fn_peakfinder_parameters, "r") as read_file: peakfinder_parameters = json_load(fn_peakfinder_parameters)
peakfinder_parameters = json.load(read_file)
peakfinder_parameters_time = new_time peakfinder_parameters_time = new_time
center_radial_integration = None center_radial_integration = None
if worker == 0: if worker == 0:
@ -112,10 +110,10 @@ def work(backend_address, accumulator_host, accumulator_port, visualisation_host
results["is_hit_frame"] = False results["is_hit_frame"] = False
daq_rec = results.get("daq_rec", 0) daq_rec = results.get("daq_rec", 0)
event_laser = bool((daq_rec >> 16) & 1) event_laser = read_bit(daq_rec, 16)
event_darkshot = bool((daq_rec >> 17) & 1) event_darkshot = read_bit(daq_rec, 17)
# event_fel = bool((daq_rec >> 18) & 1) # event_fel = read_bit(daq_rec, 18)
event_ppicker = bool((daq_rec >> 19) & 1) event_ppicker = read_bit(daq_rec, 19)
if not event_darkshot: if not event_darkshot:
results["laser_on"] = event_laser results["laser_on"] = event_laser