From 2fb5231ad56b4eb2807c7237e06d7f5392eadde2 Mon Sep 17 00:00:00 2001
From: Nuno Duarte <duarten@max-exfl001.desy.de>
Date: Wed, 28 Sep 2022 11:23:15 +0200
Subject: [PATCH] Solve merge conflicts
---
notebooks/ePix100/Characterize_Darks_ePix100_NBC.ipynb | 1 +
1 file changed, 1 insertion(+)
diff --git a/notebooks/ePix100/Characterize_Darks_ePix100_NBC.ipynb b/notebooks/ePix100/Characterize_Darks_ePix100_NBC.ipynb
index a4573a687..40b1bf12a 100644
--- a/notebooks/ePix100/Characterize_Darks_ePix100_NBC.ipynb
+++ b/notebooks/ePix100/Characterize_Darks_ePix100_NBC.ipynb
@@ -88,6 +88,7 @@
"from XFELDetAna.plotting.util import prettyPlotting\n",
"from cal_tools.enums import BadPixels\n",
"from cal_tools.step_timing import StepTimer\n",
+ "from cal_tools.epix100 import epix100lib\n",
"from cal_tools.tools import (\n",
" get_dir_creation_date,\n",
" get_pdu_from_db,\n",
--
GitLab