From 667dd8808873e10037f8cfb6ea284cb3db45aaa1 Mon Sep 17 00:00:00 2001
From: Philipp Schmidt <philipp.schmidt@xfel.eu>
Date: Wed, 19 Oct 2022 08:15:51 +0200
Subject: [PATCH] Move in-kernel warning for different pulse lengths and check
after separation
---
.../REMI/REMI_Digitize_and_Transform.ipynb | 42 +++++++++++++------
1 file changed, 30 insertions(+), 12 deletions(-)
diff --git a/notebooks/REMI/REMI_Digitize_and_Transform.ipynb b/notebooks/REMI/REMI_Digitize_and_Transform.ipynb
index 57b80daaa..68c04c16c 100644
--- a/notebooks/REMI/REMI_Digitize_and_Transform.ipynb
+++ b/notebooks/REMI/REMI_Digitize_and_Transform.ipynb
@@ -158,12 +158,11 @@
" # Combine FEL and PPL positions.\n",
"\n",
" fel_pos = indices_at_sase(ppt, sase)\n",
+ " ppl_pos = indices_at_laser(ppt, laser)\n",
"\n",
" if len(fel_pos) > 0:\n",
- " ppl_pos = indices_at_laser(ppt, laser) + fel_pos[0] + ppl_offset\n",
- " else:\n",
- " # Just take them as they are\n",
- " ppl_pos = indices_at_laser(ppt, laser)\n",
+ " # Move PPL up to the FEL position.\n",
+ " ppl_pos += fel_pos[0] + ppl_offset\n",
"\n",
" return np.union1d(fel_pos, ppl_pos), fel_pos, ppl_pos\n",
"\n",
@@ -262,13 +261,7 @@
" rel_pos = all_pos - all_pos[0]\n",
"\n",
" if num_pulses > 1:\n",
- " pulse_lengths = np.unique(rel_pos[1:] - rel_pos[:-1])\n",
- "\n",
- " if len(pulse_lengths) > 1:\n",
- " print('WARNING: Differing pulse lengths encountered, minimum is used!')\n",
- "\n",
- " pulse_len = pulse_lengths.min()\n",
- "\n",
+ " pulse_len = np.unique(rel_pos[1:] - rel_pos[:-1]).min()\n",
" elif num_pulses == 1:\n",
" pulse_len = single_pulse_length\n",
"\n",
@@ -287,7 +280,32 @@
" train_triggers['ppl'] = [pos in ppl_pos for pos in all_pos]\n",
"\n",
"with timing('find_triggers'):\n",
- " psh.map(trigger_by_ppt, ppt_data)"
+ " psh.map(trigger_by_ppt, ppt_data)\n",
+ " \n",
+ "if (np.unique(triggers['pulse'][1:] - triggers['pulse'][:-1]) > 0).sum() > 1:\n",
+ " # There is more than one delta between pulse entries across all pulses. This is not\n",
+ " # necessarily a problem, as the pattern could simply have changed in between trains\n",
+ " # with each train being split properly.\n",
+ " # If there's more than one delta in a single train, this likely points to a mismatch\n",
+ " # of FEL and PPL repetition rate. This is most likely not intended.\n",
+ " \n",
+ " one = np.uint64(1) # Because np.uint64 + int = np.float64\n",
+ " pulse_deltas = set()\n",
+ "\n",
+ " for pulse_id, (offset, count) in enumerate(zip(pulse_offsets, pulse_counts)):\n",
+ " deltas = triggers['pulse'][offset+one:offset+count] - triggers['pulse'][offset:offset+count-one]\n",
+ "\n",
+ " if len(np.unique(deltas)) > 1:\n",
+ " for delta in deltas:\n",
+ " pulse_deltas.add(delta)\n",
+ " \n",
+ " \n",
+ " if len(pulse_deltas) > 1:\n",
+ " delta_str = ', '.join([str(x) for x in sorted(pulse_deltas)])\n",
+ " print(f'WARNING: Different pulse lengths (PPT: {delta_str}) encountered within single trains, '\n",
+ " f'separated pulse spectra may split up signals!')\n",
+ " else:\n",
+ " print('WARNING: Different pulse lengths encountered across trains, separation may be unstable!')"
]
},
{
--
GitLab