From 820c3616e5ae8352850a35ee660a892dd7bc94a6 Mon Sep 17 00:00:00 2001 From: leonarski_f Date: Wed, 7 Feb 2024 09:43:52 +0100 Subject: [PATCH] Minor modifications in SwissFEL preparations --- broker/JFJochBrokerParser.cpp | 3 ++- fpga/include/jfjoch_fpga.h | 2 -- frontend_ui/src/components/DetectorSettings.tsx | 15 ++++++++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/broker/JFJochBrokerParser.cpp b/broker/JFJochBrokerParser.cpp index 49d14dcc..7953f978 100644 --- a/broker/JFJochBrokerParser.cpp +++ b/broker/JFJochBrokerParser.cpp @@ -276,7 +276,8 @@ void ParseFacilityConfiguration(const nlohmann::json &input, const std::string& experiment.PedestalG0Frames(GET_I64(j, "pedestal_g0_frames")); experiment.PedestalG1Frames(GET_I64(j, "pedestal_g1_frames")); experiment.PedestalG2Frames(GET_I64(j, "pedestal_g2_frames")); - + if (j.contains("detector_trigger_delay_us")) + experiment.DetectorDelay(GET_TIME(j, "detector_trigger_delay_us")); experiment.FrameTime(GET_TIME(j, "frame_time_us"), GET_TIME(j, "count_time_us")); experiment.PreviewPeriod(GET_TIME(j, "preview_period_us")); diff --git a/fpga/include/jfjoch_fpga.h b/fpga/include/jfjoch_fpga.h index 2422abae..61b8a834 100644 --- a/fpga/include/jfjoch_fpga.h +++ b/fpga/include/jfjoch_fpga.h @@ -41,8 +41,6 @@ typedef __u64 uint64_t; #define STREAM_MERGE_SRC_4x10G 2 #define STREAM_MERGE_SRC_FRAME_GEN 3 -#define PIXEL_OUT_LOST (INT16_MIN) - #define LOAD_CALIBRATION_OK (0) #define LOAD_CALIBRATION_ERR_HOST_ADDR (1) #define LOAD_CALIBRATION_ERR_DEST (2) diff --git a/frontend_ui/src/components/DetectorSettings.tsx b/frontend_ui/src/components/DetectorSettings.tsx index 23b20bac..65c1182e 100644 --- a/frontend_ui/src/components/DetectorSettings.tsx +++ b/frontend_ui/src/components/DetectorSettings.tsx @@ -30,11 +30,11 @@ class DetectorSettings extends Component { fixed_gain_g1: false, use_gain_hg0: false, count_time_us: 980, - pedestal_g0_frames: 2000, - pedestal_g1_frames: 300, - pedestal_g2_frames: 300, + pedestal_g0_frames: undefined, + pedestal_g1_frames: undefined, + pedestal_g2_frames: undefined, storage_cell_delay_ns: 10000, - detector_trigger_delay_ns: 0 + detector_trigger_delay_ns: undefined }, storage_cell_list_value: "1", frame_time_error: false, @@ -136,7 +136,12 @@ class DetectorSettings extends Component { } putValues = () => { - DefaultService.putConfigDetector(this.state.s) + let s = this.state.s; + s.pedestal_g0_frames = undefined; + s.pedestal_g1_frames = undefined; + s.pedestal_g2_frames = undefined; + s.detector_trigger_delay_ns = undefined; + DefaultService.putConfigDetector(s) .catch(error => console.log(error) ); }