From be89d5639f4164df8919be124a7e205a97c50892 Mon Sep 17 00:00:00 2001
From: Philipp Schmidt <philipp.schmidt@xfel.eu>
Date: Tue, 1 Nov 2022 09:45:57 +0100
Subject: [PATCH] Fix unconditional access to timestamps for old data format
version files
---
.../Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb | 6 +-----
notebooks/LPD/LPD_Correct_Fast.ipynb | 8 +-------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb b/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
index 3cff265cb..ac2d2e460 100644
--- a/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
+++ b/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
@@ -562,15 +562,11 @@
" step_timer.start()\n",
"\n",
" # Create CORR files and add corrected data sections.\n",
- " sel_trains = np.isin(all_train_ids, seq_dc.train_ids)\n",
" image_counts = seq_dc[instrument_src_kda, \"data.adc\"].data_counts(labelled=False)\n",
"\n",
" with DataFile(out_file, 'w') as outp_file:\n",
" # Create INDEX datasets.\n",
- " outp_file.create_index(\n",
- " train_ids=seq_dc.train_ids,\n",
- " timestamps=seq_dc.files[0].file[\"INDEX/timestamp\"][sel_trains],\n",
- " flags=seq_dc.files[0].validity_flag[sel_trains])\n",
+ " outp_file.create_index(seq_dc.train_ids, from_file=seq_dc.files[0])\n",
"\n",
" # Create Instrument section to later add corrected datasets.\n",
" outp_source = outp_file.create_instrument_source(instrument_src_kda)\n",
diff --git a/notebooks/LPD/LPD_Correct_Fast.ipynb b/notebooks/LPD/LPD_Correct_Fast.ipynb
index 73906ff03..fe517d8dc 100644
--- a/notebooks/LPD/LPD_Correct_Fast.ipynb
+++ b/notebooks/LPD/LPD_Correct_Fast.ipynb
@@ -442,16 +442,10 @@
" \n",
" start = perf_counter()\n",
" if (not outp_path.exists() or overwrite) and image_counts.sum() > 0:\n",
- " fa = dc.files[0]\n",
- " sel_trains = np.isin(fa.train_ids, dc.train_ids)\n",
- " \n",
" outp_source_name = output_source.format(karabo_id=karabo_id, module_index=module_index)\n",
"\n",
" with DataFile(outp_path, 'w') as outp_file: \n",
- " outp_file.create_index(\n",
- " train_ids=dc.train_ids,\n",
- " timestamps=fa.file['INDEX/timestamp'][sel_trains],\n",
- " flags=fa.validity_flag[sel_trains])\n",
+ " outp_file.create_index(dc.train_ids, from_file=dc.files[0])\n",
" outp_file.create_metadata(like=dc, instrument_channels=(f'{outp_source_name}/image',))\n",
" \n",
" outp_source = outp_file.create_instrument_source(outp_source_name)\n",
--
GitLab