diff --git a/broker/JFJochStateMachine.cpp b/broker/JFJochStateMachine.cpp
index d9b07cbb..6c755c9f 100644
--- a/broker/JFJochStateMachine.cpp
+++ b/broker/JFJochStateMachine.cpp
@@ -158,8 +158,9 @@ void JFJochStateMachine::TakePedestalInternalG0(std::unique_lock &ul
state = JFJochState::Pedestal;
services.ConfigureDetector(local_experiment);
services.Start(local_experiment, *calibration);
- if (!experiment.IsPulsedSource())
- services.Trigger();
+
+ services.Trigger();
+
ul.unlock();
// Allow to cancel/abort during the pedestal data collection
// Must ensure that while state is Pedestal, nothing can take lock for longer time, to avoid deadlock
@@ -196,8 +197,9 @@ void JFJochStateMachine::TakePedestalInternalG1(std::unique_lock &ul
state = JFJochState::Pedestal;
services.ConfigureDetector(local_experiment);
services.Start(local_experiment, *calibration);
- if (!experiment.IsPulsedSource())
- services.Trigger();
+
+ services.Trigger();
+
ul.unlock();
// Allow to cancel/abort during the pedestal data collection
// Must ensure that while state is Pedestal, nothing can take lock for longer time, to avoid deadlock
@@ -234,8 +236,9 @@ void JFJochStateMachine::TakePedestalInternalG2(std::unique_lock &ul
state = JFJochState::Pedestal;
services.ConfigureDetector(local_experiment);
services.Start(local_experiment, *calibration);
- if (!experiment.IsPulsedSource())
- services.Trigger();
+
+ services.Trigger();
+
ul.unlock();
// Allow to cancel/abort during the pedestal data collection
// Must ensure that while state is Pedestal, nothing can take lock for longer time, to avoid deadlock
diff --git a/broker/jfjoch_api.yaml b/broker/jfjoch_api.yaml
index cbf0022a..36a270d4 100644
--- a/broker/jfjoch_api.yaml
+++ b/broker/jfjoch_api.yaml
@@ -47,7 +47,7 @@ components:
default: 1
description: |
For standard synchrotron data collection - this is number of images collected per one TTL trigger
- For XFEL mode - this number is ignored and set to 1
+ For XFEL (pulsed source) - this number is ignored and set to 1
For storage cell mode - this number is ignored and set to number of storage cells
ntrigger:
type: integer
@@ -62,8 +62,11 @@ components:
minimum: 1
maximum: 256
default: 1
- description:
+ description: |
FPGA frame summation. For summation above two 32-bit pixel format will be used, unless explicitly specified.
+ Frame summation factor applies only to conversion mode (assumed as 1 for raw data).
+ In XFEL mode: summation happens for frames collected with multiple triggers.
+ Ignored for storage cells (assumed as 1).
beam_x_pxl:
type: number
format: float
diff --git a/broker/redoc-static.html b/broker/redoc-static.html
index 4b8cb46c..d71d84f8 100644
--- a/broker/redoc-static.html
+++ b/broker/redoc-static.html
@@ -404,15 +404,21 @@ Detector must be in Idle state.
Doesn't run calibration procedure.
This is async function - one needs to use POST /wait_till_done to ensure operation is done.
Request Body schema: application/json
images_per_trigger
integer <int64> >= 1
Default: 1
For standard synchrotron data collection - this is number of images collected per one TTL trigger
-For XFEL mode - this number is ignored and set to 1
+For XFEL (pulsed source) - this number is ignored and set to 1
For storage cell mode - this number is ignored and set to number of storage cells
ntrigger
integer <int64> >= 1
Default: 1
Number of TTL trigger that the detector is expected to receive during data collection
-
summation
integer <int64> [ 1 .. 256 ]
Default: 1
FPGA frame summation. For summation above two 32-bit pixel format will be used, unless explicitly specified.
+
summation
integer <int64> [ 1 .. 256 ]
Default: 1
FPGA frame summation. For summation above two 32-bit pixel format will be used, unless explicitly specified.
+Frame summation factor applies only to conversion mode (assumed as 1 for raw data).
+In XFEL mode: summation happens for frames collected with multiple triggers.
+Ignored for storage cells (assumed as 1).
beam_x_pxl
required
number <float>
/entry/detector/beam_center_x in NXmx
@@ -751,7 +757,7 @@ Changing detector will set detector to Inactive state and will requ
" class="sc-iKOmoZ sc-cCzLxZ WVNwY VEBGS sc-ckdEwu LxEPk">