mx/Jungfraujoch
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 37 Wiki Activity

Minor modifications in SwissFEL preparations

Browse Source
This commit is contained in:
leonarski_f
2024-02-07 09:43:52 +01:00
parent de95928e64
commit 820c3616e5
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
broker/JFJochBrokerParser.cpp
View File

@@ -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"));

2
fpga/include/jfjoch_fpga.h
View File

@@ -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)

15
frontend_ui/src/components/DetectorSettings.tsx
View File

@@ -30,11 +30,11 @@ class DetectorSettings extends Component<MyProps, MyState> {
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<MyProps, MyState> {
}
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) );
}