From c1f5ec6faa0ee783826b54fddd95301f1500e337 Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Wed, 31 Jul 2024 07:20:29 +0200
Subject: [PATCH] refactor: remove unused parameter from 1st nbcell and rename
full_path method to file_path
---
.../Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb | 3 +--
src/cal_tools/calcat_interface2.py | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb b/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb
index d13297b82..14358ef6f 100644
--- a/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb
+++ b/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb
@@ -33,7 +33,6 @@
"ctrl_source_template = '{}/DET/CONTROL' # template for control source name (filled with karabo_id_control)\n",
"\n",
"# Parameters for calibration database and storing constants.\n",
- "use_dir_creation_date = True # use dir creation date\n",
"cal_db_interface = 'tcp://max-exfl-cal001:8016#8045' # calibrate db interface to connect to\n",
"cal_db_timeout = 300000 # timeout on caldb requests\n",
"local_output = True # output constants locally\n",
@@ -696,7 +695,7 @@
" old_const[mod][cname] = cmdata[mod].ndarray()\n",
" old_mdata[mod][cname] = {\n",
" \"timestamp\": cmdata[mod].metadata(\"begin_validity_at\"),\n",
- " \"filepath\": str(cmdata[mod].full_path()),\n",
+ " \"filepath\": str(cmdata[mod].file_path()),\n",
" \"dataset\": cmdata[mod].dataset,\n",
" }\n",
" else:\n",
diff --git a/src/cal_tools/calcat_interface2.py b/src/cal_tools/calcat_interface2.py
index c35b36deb..a26af505e 100644
--- a/src/cal_tools/calcat_interface2.py
+++ b/src/cal_tools/calcat_interface2.py
@@ -258,7 +258,7 @@ class SingleConstant:
_have_calcat_metadata=True,
)
- def full_path(self, caldb_root=None):
+ def file_path(self, caldb_root=None) -> Path:
if caldb_root is not None:
caldb_root = Path(caldb_root)
else:
@@ -266,7 +266,7 @@ class SingleConstant:
return caldb_root / self.path
def dataset_obj(self, caldb_root=None) -> h5py.Dataset:
- f = h5py.File(self.full_path(caldb_root), "r")
+ f = h5py.File(self.file_path(caldb_root), "r")
return f[self.dataset]["data"]
def ndarray(self, caldb_root=None):
--
GitLab