From a67da96bee63b75f21beba973a01bbd17d74beaf Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Sat, 16 Sep 2023 12:56:41 +0200 Subject: [PATCH] broker.json: Adapt to 9M --- etc/broker.json | 88 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 30 deletions(-) diff --git a/etc/broker.json b/etc/broker.json index ee189318..0492329e 100644 --- a/etc/broker.json +++ b/etc/broker.json @@ -26,45 +26,65 @@ "source_name_short": "SLS", "instrument_name": "X06SA VESPA", "instrument_name_short": "VESPA", - "datastreams": 2, + "datastreams": 4, "pedestal_g0_frames": 2000, "pedestal_g1_frames": 300, "pedestal_g2_frames": 300, "frame_time_us": "1000 us", "count_time_us": "980 us", - "spot_finding_period_us": "3500 us", + "spot_finding_period_us": "3000 us", "preview_period_us": "1 s", "detector_ipv4": "10.10.85.0" }, "detectors": [ { "standard_geometry": { - "nmodules": 8, - "horizontal_stacking": 2, + "nmodules": 18, + "horizontal_stacking": 3, "gap_x": 8, "gap_y": 36, "mirror_y": true }, - "description": "PSI JUNGFRAU 4M", + "description": "PSI JUNGFRAU 9M", "module_hostname": [ - "10.10.10.10", - "10.10.10.11", - "10.10.10.12", - "10.10.10.13", - "10.10.10.14", - "10.10.10.15", - "10.10.10.16", - "10.10.10.17" + "10.10.10.200", + "10.10.10.201", + "10.10.10.202", + "10.10.10.203", + "10.10.10.204", + "10.10.10.205", + "10.10.10.206", + "10.10.10.207", + "10.10.10.208", + "10.10.10.209", + "10.10.10.210", + "10.10.10.211", + "10.10.10.212", + "10.10.10.213", + "10.10.10.214", + "10.10.10.215", + "10.10.10.216", + "10.10.10.217" ], "gain_files": [ - "/opt/jfjoch/gainmaps/gainMaps_M352_2020-01-31.bin", - "/opt/jfjoch/gainmaps/gainMaps_M307_2020-01-20.bin", - "/opt/jfjoch/gainmaps/gainMaps_M264_2019-07-29.bin", - "/opt/jfjoch/gainmaps/gainMaps_M253_2019-07-29.bin", - "/opt/jfjoch/gainmaps/gainMaps_M351_2020-01-20.bin", - "/opt/jfjoch/gainmaps/gainMaps_M312_2020-01-20.bin", - "/opt/jfjoch/gainmaps/gainMaps_M261_2019-07-29.bin", - "/opt/jfjoch/gainmaps/gainMaps_M310_2021-01-26.bin" + "/opt/jfjoch/gainmaps/gainMaps_M261_2021-10-29.bin", + "/opt/jfjoch/gainmaps/gainMaps_M312_2021-10-29.bin", + "/opt/jfjoch/gainmaps/gainMaps_M352_2021-10-29.bin", + "/opt/jfjoch/gainmaps/gainMaps_M351_2021-10-29.bin", + "/opt/jfjoch/gainmaps/gainMaps_M548_2023-07-25.bin", + "/opt/jfjoch/gainmaps/gainMaps_M474_2023-05-30.bin", + "/opt/jfjoch/gainmaps/gainMaps_M482_2023-07-10.bin", + "/opt/jfjoch/gainmaps/gainMaps_M487_2023-07-10.bin", + "/opt/jfjoch/gainmaps/gainMaps_M499_2023-07-25.bin", + "/opt/jfjoch/gainmaps/gainMaps_M417_2023-01-14.bin", + "/opt/jfjoch/gainmaps/gainMaps_M437_2023-05-27.bin", + "/opt/jfjoch/gainmaps/gainMaps_M480_2023-05-30.bin", + "/opt/jfjoch/gainmaps/gainMaps_M307_2021-10-29.bin", + "/opt/jfjoch/gainmaps/gainMaps_M421_2023-01-14.bin", + "/opt/jfjoch/gainmaps/gainMaps_M310_2021-10-29.bin", + "/opt/jfjoch/gainmaps/gainMaps_M427_2023-07-25.bin", + "/opt/jfjoch/gainmaps/gainMaps_M253_2021-10-29.bin", + "/opt/jfjoch/gainmaps/gainMaps_M264_2021-10-29.bin" ] }, { @@ -75,18 +95,26 @@ "gap_y": 36, "mirror_y": true }, - "description": "PSI JUNGFRAU 4M (2M ROI)", + "description": "PSI JUNGFRAU 9M (4M ROI)", "module_hostname": [ - "10.10.10.12", - "10.10.10.13", - "10.10.10.14", - "10.10.10.15" + "10.10.10.203", + "10.10.10.204", + "10.10.10.206", + "10.10.10.207", + "10.10.10.209", + "10.10.10.210", + "10.10.10.212", + "10.10.10.213" ], "gain_files": [ - "/opt/jfjoch/gainmaps/gainMaps_M264_2019-07-29.bin", - "/opt/jfjoch/gainmaps/gainMaps_M253_2019-07-29.bin", - "/opt/jfjoch/gainmaps/gainMaps_M351_2020-01-20.bin", - "/opt/jfjoch/gainmaps/gainMaps_M312_2020-01-20.bin" + "/opt/jfjoch/gainmaps/gainMaps_M351_2021-10-29.bin", + "/opt/jfjoch/gainmaps/gainMaps_M548_2023-07-25.bin", + "/opt/jfjoch/gainmaps/gainMaps_M482_2023-07-10.bin", + "/opt/jfjoch/gainmaps/gainMaps_M487_2023-07-10.bin", + "/opt/jfjoch/gainmaps/gainMaps_M417_2023-01-14.bin", + "/opt/jfjoch/gainmaps/gainMaps_M437_2023-05-27.bin", + "/opt/jfjoch/gainmaps/gainMaps_M307_2021-10-29.bin", + "/opt/jfjoch/gainmaps/gainMaps_M421_2023-01-14.bin" ] } ]