From 71968083f07f3d60f337cc84d834e46848b84c82 Mon Sep 17 00:00:00 2001
From: Egor Sobolev <egor.sobolev@xfel.eu>
Date: Sat, 27 Aug 2022 20:15:45 +0200
Subject: [PATCH] Update EXtra-redu version, fix exception name
---
notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb | 4 ++--
setup.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
index 2048c87e6..f8e99656a 100644
--- a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
+++ b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
@@ -452,7 +452,7 @@
"outputs": [],
"source": [
"if use_litframe_finder != 'off':\n",
- " from extra_redu import make_litframe_finder, SourceNotFound as RequiredSourceNotFound\n",
+ " from extra_redu import make_litframe_finder, LitFrameFinderError\n",
" from extra_redu.litfrm.utils import litfrm_run_report\n",
"\n",
" if use_litframe_finder not in ['auto', 'offline', 'online']:\n",
@@ -482,7 +482,7 @@
" ).format(frmintf=frmintf, trsintf=trsintf, **rec)\n",
" )\n",
" cell_sel = LitFrameSelection(r, train_ids, max_pulses, energy_threshold)\n",
- " except RequiredSourceNotFound as err:\n",
+ " except LitFrameFinderError as err:\n",
" print(\"Cannot use AgipdLitFrameFinder due to:\")\n",
" print(err)\n",
" cell_sel = CellRange(max_pulses, max_cells=mem_cells)\n",
diff --git a/setup.py b/setup.py
index 3f98059d3..aae7823b4 100644
--- a/setup.py
+++ b/setup.py
@@ -102,8 +102,8 @@ install_requires = [
"sphinx==1.8.5",
"tabulate==0.8.6",
"traitlets==4.3.3",
- "xarray==2022.3.0",
- "EXtra-redu==0.0.4",
+ "xarray==2022.3.0",
+ "EXtra-redu==0.0.5",
]
if "readthedocs.org" not in sys.executable:
--
GitLab