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

removed unused imports, a no-op function; use SystemExit to exit on missing argument; do not hide error message; cleanup

Browse Source
This commit is contained in:
augustin_s
2024-03-22 21:02:48 +01:00
parent 7c5f5198c9
commit 95138a3bdb
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dap/worker.py
View File

@ -2,10 +2,8 @@ import argparse
import json import json
import os import os
from copy import copy from copy import copy
from datetime import datetime from random import randint
from math import exp from time import sleep
from random import gauss, randint
from time import sleep, time
import jungfrau_utils as ju import jungfrau_utils as ju
import numpy as np import numpy as np
@ -36,10 +34,6 @@ def prepare_radial_profile(data, center, keep_pixels=None):
return r, nr return r, nr
def mask_corner_pixels(pixel_mask, n_pixels):
return pixel_mask
def main(): def main():
@ -58,8 +52,7 @@ def main():
if args.backend: if args.backend:
BACKEND_ADDRESS = args.backend BACKEND_ADDRESS = args.backend
else: else:
print("no backend address defined, exit") raise SystemExit("no backend address defined")
exit()
FA_HOST_ACCUMULATE = args.accumulator FA_HOST_ACCUMULATE = args.accumulator
FA_PORT_ACCUMULATE = args.accumulator_port FA_PORT_ACCUMULATE = args.accumulator_port
@ -132,8 +125,8 @@ def main():
print(f'({pulseid}) update peakfinder parameters {old_peakfinder_parameters}', flush=True) print(f'({pulseid}) update peakfinder parameters {old_peakfinder_parameters}', flush=True)
print(f' --> {peakfinder_parameters}', flush=True) print(f' --> {peakfinder_parameters}', flush=True)
print("",flush=True) print("",flush=True)
except: except Exception as e:
print(f'({pulseid}) problem to read peakfinder parameters file, worker : {worker}', flush=True) print(f'({pulseid}) problem ({e}) to read peakfinder parameters file, worker : {worker}', flush=True)
events = dict(poller.poll(2000)) # check every 2 seconds in each worker events = dict(poller.poll(2000)) # check every 2 seconds in each worker
if backend_socket in events: if backend_socket in events:
@ -181,7 +174,6 @@ def main():
if pedestal_file_name is not None and pedestal_file_name != pedestal_file_name_saved: if pedestal_file_name is not None and pedestal_file_name != pedestal_file_name_saved:
n_corner_pixels_mask = results.get("n_corner_pixels_mask", 0) n_corner_pixels_mask = results.get("n_corner_pixels_mask", 0)
pixel_mask_current = ju_stream_adapter.handler.pixel_mask pixel_mask_current = ju_stream_adapter.handler.pixel_mask
pixel_mask_current = mask_corner_pixels(pixel_mask_current, n_corner_pixels_mask)
ju_stream_adapter.handler.pixel_mask = pixel_mask_current ju_stream_adapter.handler.pixel_mask = pixel_mask_current
pedestal_file_name_saved = pedestal_file_name pedestal_file_name_saved = pedestal_file_name
@ -278,7 +270,7 @@ def main():
# pump probe analysis # pump probe analysis
do_radial_integration = results.get("do_radial_integration", 0) do_radial_integration = results.get("do_radial_integration", 0)
if (do_radial_integration != 0): if do_radial_integration != 0:
data_copy_1 = np.copy(data) data_copy_1 = np.copy(data)
@ -496,6 +488,11 @@ def main():
visualisation_socket.send(data, flags, copy=True, track=True) visualisation_socket.send(data, flags, copy=True, track=True)
if __name__ == "__main__": if __name__ == "__main__":
main() main()