From f4b844e74763cb3a5fe9edc48d2348bffc3ad534 Mon Sep 17 00:00:00 2001
From: Philipp Schmidt <philipp.schmidt@xfel.eu>
Date: Mon, 6 Dec 2021 11:16:07 +0100
Subject: [PATCH] Fix edge trigger and add compatibility for old DAQ files in
REMI reconstruct notebook
---
notebooks/REMI/REMI_Digitize_and_Transform.ipynb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/notebooks/REMI/REMI_Digitize_and_Transform.ipynb b/notebooks/REMI/REMI_Digitize_and_Transform.ipynb
index 1c78263ce..3805f6199 100644
--- a/notebooks/REMI/REMI_Digitize_and_Transform.ipynb
+++ b/notebooks/REMI/REMI_Digitize_and_Transform.ipynb
@@ -500,7 +500,7 @@
" \n",
" pulse_trace = corr_trace[np.s_[trigger['start']:trigger['stop']]]\n",
" \n",
- " x_time = remi.get_time_calibration() * (np.arange(len(pulse_trace) + trigger['offset']))\n",
+ " x_time = remi.get_time_calibration() * (np.arange(len(pulse_trace)) + trigger['offset'])\n",
" \n",
" ax.plot(x_time, pulse_trace, lw=1)\n",
" ax.set_xlim(x_time[0], x_time[-1])\n",
@@ -895,9 +895,9 @@
"dataset_kwargs = {k[8:]: v for k, v in locals().items() if k.startswith('dataset_compression')}\n",
"\n",
"metadata = dc.run_metadata()\n",
- "daq_library_bytes = metadata['daqLibrary'].encode('ascii')\n",
- "karabo_framework_bytes = metadata['karaboFramework'].encode('ascii')\n",
- "proposal_number = int(proposal) if proposal else metadata['proposalNumber']\n",
+ "daq_library_bytes = metadata.get('daqLibrary', '0.0').encode('ascii')\n",
+ "karabo_framework_bytes = metadata.get('karaboFramework', '0.0').encode('ascii')\n",
+ "proposal_number = int(proposal) if proposal else metadata.get('proposalNumber', -1)\n",
"\n",
"print('Writing sequence files', flush=True, end='')\n",
"\n",
--
GitLab