From 0174e7e47d33418191f35394f54a1daac8e26734 Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Wed, 21 Feb 2024 16:17:25 +0100
Subject: [PATCH] avoid using run_metadata for checking run or proposal number
---
notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb | 2 +-
notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb | 4 ++--
notebooks/Timepix/Compute_Timepix_Event_Centroids.ipynb | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
index a6a826ddb..bc519599e 100644
--- a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
+++ b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
@@ -443,7 +443,7 @@
" if np.any(unique_cell_ids > mem_cells):\n",
" raise ValueError(\n",
" f\"Invalid cells found {unique_cell_ids} \"\n",
- " f\"for run: {run_dc.run_metadata()['runNumber']}.\")\n",
+ " f\"for run: {run}.\")\n",
"\n",
" context.map(process_cell, unique_cell_ids)\n",
"\n",
diff --git a/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb b/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb
index 885d30e9f..07f3ee0d6 100644
--- a/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb
+++ b/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb
@@ -133,8 +133,8 @@
"outputs": [],
"source": [
"run_dc = RunDirectory(in_folder / f\"r{run_nums[0]:04d}\")\n",
- "file_loc = raw_data_location_string(\n",
- " f\"p{run_dc.run_metadata()['proposalNumber']}\", run_nums)\n",
+ "proposal = list(filter(None, str(in_folder).strip('/').split('/')))[-2]\n",
+ "file_loc = raw_data_location_string(proposal, run_nums)\n",
"receiver_names = [f\"*{receiver_template.format(x)}*\" for x in receiver_affixes]\n",
"data_sources = sorted(list(run_dc.select(receiver_names).all_sources))"
]
diff --git a/notebooks/Timepix/Compute_Timepix_Event_Centroids.ipynb b/notebooks/Timepix/Compute_Timepix_Event_Centroids.ipynb
index 036bb35f7..ac689b362 100755
--- a/notebooks/Timepix/Compute_Timepix_Event_Centroids.ipynb
+++ b/notebooks/Timepix/Compute_Timepix_Event_Centroids.ipynb
@@ -316,8 +316,8 @@
"outputs": [],
"source": [
"dc = RunDirectory(Path(in_folder) / f'r{run:04d}', inc_suspect_trains=True)\n",
- "\n",
- "base_path=find_proposal(\"p%06i\" % int(dc.run_metadata()['proposalNumber']))\n",
+ "proposal = list(filter(None, in_folder.strip('/').split('/')))[-2]\n",
+ "base_path=find_proposal(proposal)\n",
"\n",
"if raw_timewalk_lut_filepath:\n",
" raw_timewalk_lut_filepath_full = (Path(base_path) / Path(raw_timewalk_lut_filepath)).resolve()\n",
--
GitLab