Merge pull request #259 from European-XFEL/fix/adq-single-pulse-data

Fix pulse slicing code to advance to next train on same pulse ID
European-XFEL · Nov 20, 2024 · e058209 · e058209
2 parents f7cceac + 7ad2850
commit e058209
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -26,6 +26,7 @@ Fixed:
 - [`Scan.plot_bin_by_steps()`][extra.components.Scan.plot_bin_by_steps] would
   previously ignore the `title`/`xlabel`/`ylabel` arguments, now it actually
   uses them (!237).
+- [`AdqRawChannel.pulse_data()`][extra.components.AdqRawChannel.pulse_data] no longer erroneously reads in the same train data for every pulse if there is only a single pulse per train (!259).
 
 Changed:
 - [`gaussian()`][extra.utils.gaussian] has a new `norm` parameter to allow

diff --git a/src/extra/components/_adq.pyx b/src/extra/components/_adq.pyx
@@ -24,8 +24,8 @@ def _reshape_flat_pulses(
     for i in range(pulse_ids.shape[0]):
         cur_pid = pulse_ids[i]
 
-        if cur_pid < prev_pid:
-            # Pulse ID decreasing means a new train started.
+        if cur_pid <= prev_pid:
+            # Pulse ID not increasing means a new train started.
             pid_offset = cur_pid
             j += 1