diff --git a/broker/gen/model/Rugnux_live_stills.h b/broker/gen/model/Rugnux_live_stills.h index 46f2378f8..7df8f7fcb 100644 --- a/broker/gen/model/Rugnux_live_stills.h +++ b/broker/gen/model/Rugnux_live_stills.h @@ -12,7 +12,7 @@ /* * Rugnux_live_stills.h * - * Serial frames converted by the FPGA and analysed on the GPU: the pre-pass on the first images (the beam centre, distance and mask the whole collection is analysed with), and the analysis since. + * Serial frames analysed on the GPU: the pre-pass on the first images (the beam centre, distance and mask the whole collection is analysed with), and the analysis since. */ #ifndef Rugnux_live_stills_H_ @@ -26,7 +26,7 @@ namespace org::openapitools::server::model { /// -/// Serial frames converted by the FPGA and analysed on the GPU: the pre-pass on the first images (the beam centre, distance and mask the whole collection is analysed with), and the analysis since. +/// Serial frames analysed on the GPU: the pre-pass on the first images (the beam centre, distance and mask the whole collection is analysed with), and the analysis since. /// class Rugnux_live_stills { diff --git a/broker/gen/model/Rugnux_settings.h b/broker/gen/model/Rugnux_settings.h index 77d4c26eb..4edaf41e1 100644 --- a/broker/gen/model/Rugnux_settings.h +++ b/broker/gen/model/Rugnux_settings.h @@ -12,7 +12,7 @@ /* * Rugnux_settings.h * - * Rugnux live mode: rotation collections from a DECTRIS detector are processed by rugnux inside the broker while they arrive, and the merged result is sent to the writer. Serial collections converted by the FPGA (JUNGFRAU) are analysed on the GPU after a pre-pass on their first images that decides the beam centre, distance and mask (`stills` in `/rugnux/status`). + * Rugnux live mode, for collections from a DECTRIS detector: rotation collections are processed by rugnux inside the broker while they arrive, and the merged result is sent to the writer. Serial collections are analysed on the GPU after a pre-pass on their first images that decides the beam centre, distance and mask (`stills` in `/rugnux/status`), and merged as they go. Collections in the FPGA workflow (JUNGFRAU, PSI EIGER) are not affected. */ #ifndef Rugnux_settings_H_ @@ -25,7 +25,7 @@ namespace org::openapitools::server::model { /// -/// Rugnux live mode: rotation collections from a DECTRIS detector are processed by rugnux inside the broker while they arrive, and the merged result is sent to the writer. Serial collections converted by the FPGA (JUNGFRAU) are analysed on the GPU after a pre-pass on their first images that decides the beam centre, distance and mask (`stills` in `/rugnux/status`). +/// Rugnux live mode, for collections from a DECTRIS detector: rotation collections are processed by rugnux inside the broker while they arrive, and the merged result is sent to the writer. Serial collections are analysed on the GPU after a pre-pass on their first images that decides the beam centre, distance and mask (`stills` in `/rugnux/status`), and merged as they go. Collections in the FPGA workflow (JUNGFRAU, PSI EIGER) are not affected. /// class Rugnux_settings { @@ -58,7 +58,7 @@ public: /// Rugnux_settings members /// - /// Process DECTRIS rotation collections with rugnux live, and FPGA serial collections on the GPU after a pre-pass + /// Process DECTRIS collections with rugnux live; rotation by rugnux, serial on the GPU after a pre-pass /// bool isEnable() const; void setEnable(bool const value); diff --git a/broker/jfjoch_api.yaml b/broker/jfjoch_api.yaml index 9801f49d3..f524a45b8 100644 --- a/broker/jfjoch_api.yaml +++ b/broker/jfjoch_api.yaml @@ -2775,15 +2775,16 @@ components: rugnux_settings: type: object description: | - Rugnux live mode: rotation collections from a DECTRIS detector are processed by rugnux - inside the broker while they arrive, and the merged result is sent to the writer. Serial - collections converted by the FPGA (JUNGFRAU) are analysed on the GPU after a pre-pass on their - first images that decides the beam centre, distance and mask (`stills` in `/rugnux/status`). + Rugnux live mode, for collections from a DECTRIS detector: rotation collections are processed by + rugnux inside the broker while they arrive, and the merged result is sent to the writer. Serial + collections are analysed on the GPU after a pre-pass on their first images that decides the beam + centre, distance and mask (`stills` in `/rugnux/status`), and merged as they go. Collections in the + FPGA workflow (JUNGFRAU, PSI EIGER) are not affected. properties: enable: type: boolean default: false - description: Process DECTRIS rotation collections with rugnux live, and FPGA serial collections on the GPU after a pre-pass + description: Process DECTRIS collections with rugnux live; rotation by rugnux, serial on the GPU after a pre-pass reserved_cpus: type: integer format: int64 @@ -3044,7 +3045,7 @@ components: rugnux_live_stills: type: object description: | - Serial frames converted by the FPGA and analysed on the GPU: the pre-pass on the first images (the beam + Serial frames analysed on the GPU: the pre-pass on the first images (the beam centre, distance and mask the whole collection is analysed with), and the analysis since. required: - prepass diff --git a/broker/redoc-static.html b/broker/redoc-static.html index 2730b100d..223b9ccd3 100644 --- a/broker/redoc-static.html +++ b/broker/redoc-static.html @@ -844,7 +844,7 @@ Changing detector will set detector to Inactive state and will requ

Responses

Response samples

Content type
application/json
{
  • "detectors": [
    ],
  • "current_id": 0
}

Change rugnux live mode settings

This can only be done when detector is Idle, Error or Inactive states.

-
Request Body schema: application/json
enable
boolean
Default: false

Process DECTRIS rotation collections with rugnux live, and FPGA serial collections on the GPU after a pre-pass

+
Request Body schema: application/json
enable
boolean
Default: false

Process DECTRIS collections with rugnux live; rotation by rugnux, serial on the GPU after a pre-pass

reserved_cpus
integer <int64> >= 0
Default: 4

CPU threads left to the receiver and the image pusher while rugnux runs

deadline_s
number <double> >= 0
Default: 60

Fixed cutoff: this long after the last image the analysis is cut, and the collection ends with what it has established (as POST /cancel after the last image does). 0 means no cutoff.

@@ -1131,7 +1131,7 @@ then image might be replaced in the buffer between calling /images and /image.cb