From 79a57f4def7426eb8929fa0600545a03e4f907d4 Mon Sep 17 00:00:00 2001
From: Nuno Duarte <duarten@max-exfl014.desy.de>
Date: Fri, 21 Apr 2023 10:36:22 +0200
Subject: [PATCH] solve merge conflicts after !835
---
notebooks/ePix100/Correction_ePix100_NBC.ipynb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/notebooks/ePix100/Correction_ePix100_NBC.ipynb b/notebooks/ePix100/Correction_ePix100_NBC.ipynb
index 21f28be44..46c667e41 100644
--- a/notebooks/ePix100/Correction_ePix100_NBC.ipynb
+++ b/notebooks/ePix100/Correction_ePix100_NBC.ipynb
@@ -101,6 +101,7 @@
"from cal_tools.calcat_interface import EPIX100_CalibrationData\n",
"from cal_tools.epix100 import epix100lib\n",
"from cal_tools.files import DataFile\n",
+ "from cal_tools.restful_config import restful_config\n",
"from cal_tools.tools import (\n",
" calcat_creation_time,\n",
" write_constants_fragment,\n",
@@ -254,13 +255,12 @@
]
},
{
- "attachments": {},
"cell_type": "markdown",
"metadata": {},
"source": [
"## Retrieving calibration constants\n",
"\n",
- "As a first step, calibration constants have to be loaded."
+ "As a first step, dark maps have to be loaded."
]
},
{
--
GitLab