diff --git a/cal_tools/cal_tools/agipdlib.py b/cal_tools/cal_tools/agipdlib.py
index 9501c28fe1e013d7e3dde639ab28c742f09df650..09c09d95d740cd41c9bc21be1f81eca6c5d6a6a3 100644
--- a/cal_tools/cal_tools/agipdlib.py
+++ b/cal_tools/cal_tools/agipdlib.py
@@ -6,7 +6,7 @@ import h5py
from cal_tools.enums import BadPixels
from iCalibrationDB import ConstantMetaData, Constants, Conditions, Detectors, Versions
-from cal_tools.cal_tools import get_constant_from_db
+from cal_tools.tools import get_constant_from_db
class AgipdCorrections:
"""
@@ -546,4 +546,4 @@ class AgipdCorrections:
-
\ No newline at end of file
+
diff --git a/cal_tools/cal_tools/lpdlib.py b/cal_tools/cal_tools/lpdlib.py
index c8936c448a9db421cc7981fd06640801107f8f26..db5834370c36f19f336bff5deffbc64e0b2dc4b9 100644
--- a/cal_tools/cal_tools/lpdlib.py
+++ b/cal_tools/cal_tools/lpdlib.py
@@ -6,7 +6,7 @@ import h5py
from cal_tools.enums import BadPixels
from iCalibrationDB import ConstantMetaData, Constants, Conditions, Detectors, Versions
-from cal_tools.cal_tools import get_constant_from_db
+from cal_tools.tools import get_constant_from_db
class LpdCorrections:
"""
@@ -464,4 +464,4 @@ class LpdCorrections:
self.initialize(offsets, rel_gains, rel_gains_b, bpixels, noises, flat_fields)
-
\ No newline at end of file
+
diff --git a/docs/source/workflow.rst b/docs/source/workflow.rst
index ab3bc6172e8cfda7b87d1bb7154d40f0d2644aa4..6ba8c5eee591c6023cb1c08a7d813b80b97c4da2 100644
--- a/docs/source/workflow.rst
+++ b/docs/source/workflow.rst
@@ -268,7 +268,7 @@ The final step in notebook development should be to inject performance parameter
InfluxDB_ installation tracking these. This can be done relatively easy via the interfaces
provided in the `cal_tools` subpackage::
- from cal_tools.cal_tools import get_notebook_name
+ from cal_tools.tools import get_notebook_name
from cal_tools.influx import InfluxLogger
from datetime import datetime
@@ -327,4 +327,4 @@ documentation.
.. _numpy: http://www.numpy.org/
.. _h5py: https://www.h5py.org/
.. _iCalibrationDB: https://in.xfel.eu/readthedocs/docs/icalibrationdb/en/latest/
-.. _InfluxDB: https://www.influxdata.com/
\ No newline at end of file
+.. _InfluxDB: https://www.influxdata.com/
diff --git a/notebooks/AGIPD/AGIPD_Characterize_Gain_Combine_NBC.ipynb b/notebooks/AGIPD/AGIPD_Characterize_Gain_Combine_NBC.ipynb
index f7b087efaaf111db1a295c29f5df79910289bb46..2e07bbd4cd5a2ac0e8b99ceafcfaa5863cd38311 100644
Binary files a/notebooks/AGIPD/AGIPD_Characterize_Gain_Combine_NBC.ipynb and b/notebooks/AGIPD/AGIPD_Characterize_Gain_Combine_NBC.ipynb differ
diff --git a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
index 734ee6a77f47bf0332e621f698715167198b0931..41803263552e593525cfa786652dc52bba879b10 100644
--- a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
+++ b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
@@ -100,7 +100,7 @@
"view.use_dill()\n",
"\n",
"from iCalibrationDB import ConstantMetaData, Constants, Conditions, Detectors, Versions\n",
- "from cal_tools.cal_tools import (gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name,\n",
+ "from cal_tools.tools import (gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name,\n",
" get_dir_creation_date, get_constant_from_db)\n",
"\n",
"il_mode = interlaced\n",
diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
index 9005bf56f0286b70dec0803074baf065bc36d684..70ac84df8964ecd8191fad39d8b5d2fb1561969c 100644
--- a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
+++ b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
@@ -70,7 +70,7 @@
"import matplotlib.pyplot as plt\n",
"%matplotlib inline\n",
"\n",
- "from cal_tools.cal_tools import gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name\n",
+ "from cal_tools.tools import gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name\n",
"from cal_tools.influx import InfluxLogger\n",
"from cal_tools.enums import BadPixels\n",
"from cal_tools.plotting import show_overview, plot_badpix_3d, create_constant_overview\n",
diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_NBC.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_NBC.ipynb
index 65e12185a76541c6ad132a61c720a275c6816ea3..d7dfd90525f24cd8bb7057bfcf9ba3f36149f205 100644
--- a/notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_NBC.ipynb
+++ b/notebooks/AGIPD/Characterize_AGIPD_Gain_FlatFields_NBC.ipynb
@@ -88,7 +88,7 @@
"profile = cluster_profile\n",
"\n",
"from iCalibrationDB import ConstantMetaData, Constants, Conditions, Detectors, Versions\n",
- "from cal_tools.cal_tools import gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name\n",
+ "from cal_tools.tools import gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name\n",
"from cal_tools.influx import InfluxLogger\n",
"from cal_tools.enums import BadPixels\n",
"from cal_tools.plotting import show_overview, plot_badpix_3d\n",
diff --git a/notebooks/AGIPD/Chracterize_AGIPD_Gain_PC_NBC.ipynb b/notebooks/AGIPD/Chracterize_AGIPD_Gain_PC_NBC.ipynb
index a47f1399bfcc05f1e01ec771d895636a67fe4444..c30142e347dde9d364ad1e5d5362ada1c776718b 100644
--- a/notebooks/AGIPD/Chracterize_AGIPD_Gain_PC_NBC.ipynb
+++ b/notebooks/AGIPD/Chracterize_AGIPD_Gain_PC_NBC.ipynb
@@ -95,7 +95,7 @@
"\n",
"from iCalibrationDB import ConstantMetaData, Constants, Conditions, Detectors, Versions\n",
"\n",
- "from cal_tools.cal_tools import gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name\n",
+ "from cal_tools.tools import gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name\n",
"from cal_tools.influx import InfluxLogger\n",
"from cal_tools.enums import BadPixels\n",
"from cal_tools.plotting import show_overview, plot_badpix_3d\n",
diff --git a/notebooks/LPD/Characterize_LPD_GAIN_CI_per_pixel_NBC.ipynb b/notebooks/LPD/Characterize_LPD_GAIN_CI_per_pixel_NBC.ipynb
index 19eb0fc341196331cd809ce22218119709f6707b..ab55628c50c6b278525f013c43254d15c4aca585 100644
--- a/notebooks/LPD/Characterize_LPD_GAIN_CI_per_pixel_NBC.ipynb
+++ b/notebooks/LPD/Characterize_LPD_GAIN_CI_per_pixel_NBC.ipynb
@@ -91,7 +91,7 @@
"from datetime import datetime\n",
"\n",
"from iCalibrationDB import ConstantMetaData, Constants, Conditions, Detectors, Versions\n",
- "from cal_tools.cal_tools import gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name, get_dir_creation_date\n",
+ "from cal_tools.tools import gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name, get_dir_creation_date\n",
"from cal_tools.influx import InfluxLogger\n",
"from cal_tools.enums import BadPixels\n",
"from cal_tools.plotting import show_overview, plot_badpix_3d, create_constant_overview\n",
diff --git a/notebooks/LPD/LPDChar_Darks_NBC.ipynb b/notebooks/LPD/LPDChar_Darks_NBC.ipynb
index 155c7878eb2c4c68c4f7244b239084936e1668ee..fa288100f5c6dee210d907d8c72c2b48d9a0eb4a 100644
--- a/notebooks/LPD/LPDChar_Darks_NBC.ipynb
+++ b/notebooks/LPD/LPDChar_Darks_NBC.ipynb
@@ -88,7 +88,7 @@
"from ipyparallel import Client\n",
"\n",
"from iCalibrationDB import ConstantMetaData, Constants, Conditions, Detectors, Versions\n",
- "from cal_tools.cal_tools import gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name, get_dir_creation_date\n",
+ "from cal_tools.tools import gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name, get_dir_creation_date\n",
"from cal_tools.influx import InfluxLogger\n",
"from cal_tools.enums import BadPixels\n",
"from cal_tools.plotting import show_overview, plot_badpix_3d, create_constant_overview\n",
diff --git a/notebooks/LPD/LPD_Correct_and_Verify.ipynb b/notebooks/LPD/LPD_Correct_and_Verify.ipynb
index 6351abb2de2514c0ccbabfd6788c899c8512e890..50e33e9d07e6e279b8f072855107e35cb625b922 100644
--- a/notebooks/LPD/LPD_Correct_and_Verify.ipynb
+++ b/notebooks/LPD/LPD_Correct_and_Verify.ipynb
@@ -107,7 +107,7 @@
"from ipyparallel import Client\n",
"\n",
"from iCalibrationDB import ConstantMetaData, Constants, Conditions, Detectors, Versions\n",
- "from cal_tools.cal_tools import gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name, get_dir_creation_date, get_constant_from_db\n",
+ "from cal_tools.tools import gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name, get_dir_creation_date, get_constant_from_db\n",
"from cal_tools.influx import InfluxLogger\n",
"from cal_tools.enums import BadPixels\n",
"from cal_tools.plotting import show_overview, plot_badpix_3d, create_constant_overview\n",
diff --git a/notebooks/LPD/LPD_FlatField_Radial_per_pixel_CI_NBC.ipynb b/notebooks/LPD/LPD_FlatField_Radial_per_pixel_CI_NBC.ipynb
index 867f524efabd172171e1673f6bb0c5cecb7e1e9a..70dc201edecfe1e13d2c44593f7f6954a4ba36fc 100644
--- a/notebooks/LPD/LPD_FlatField_Radial_per_pixel_CI_NBC.ipynb
+++ b/notebooks/LPD/LPD_FlatField_Radial_per_pixel_CI_NBC.ipynb
@@ -84,7 +84,7 @@
"from datetime import datetime\n",
"\n",
"from iCalibrationDB import ConstantMetaData, Constants, Conditions, Detectors, Versions\n",
- "from cal_tools.cal_tools import (gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name,\n",
+ "from cal_tools.tools import (gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name,\n",
" get_dir_creation_date, get_constant_from_db)\n",
"from cal_tools.influx import InfluxLogger\n",
"from cal_tools.enums import BadPixels\n",
diff --git a/notebooks/LPD/Mine_RadIntensity_vs_XGM_NBC.ipynb b/notebooks/LPD/Mine_RadIntensity_vs_XGM_NBC.ipynb
index 005f92bd6cc2e2c9e362c815eae61965d1a4ccc6..12cef56122dbaa67505e2c09c1be02a2c08d8821 100644
--- a/notebooks/LPD/Mine_RadIntensity_vs_XGM_NBC.ipynb
+++ b/notebooks/LPD/Mine_RadIntensity_vs_XGM_NBC.ipynb
@@ -51,7 +51,7 @@
"outputs": [],
"source": [
"def create_run_list(proposal_folder, file_prefix, xgm_folder, xgm_prefix, runs):\n",
- " from cal_tools.cal_tools import parse_runs\n",
+ " from cal_tools.tools import parse_runs\n",
" import glob\n",
" in_runs = parse_runs(runs, return_type=int)\n",
" runs_to_process = []\n",
diff --git a/notebooks/LPD/PlotFromCalDB.ipynb b/notebooks/LPD/PlotFromCalDB.ipynb
index 963fc7d39233b2e3913906b5ca707ab9575ef8f9..50736b580c7cd9f215e704dd675e0c5873ccc77c 100644
--- a/notebooks/LPD/PlotFromCalDB.ipynb
+++ b/notebooks/LPD/PlotFromCalDB.ipynb
@@ -59,7 +59,7 @@
"\n",
"\n",
"from iCalibrationDB import ConstantMetaData, Constants, Conditions, Detectors, Versions\n",
- "from cal_tools.cal_tools import gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name, get_dir_creation_date, get_constant_from_db\n",
+ "from cal_tools.tools import gain_map_files, parse_runs, run_prop_seq_from_path, get_notebook_name, get_dir_creation_date, get_constant_from_db\n",
"from cal_tools.influx import InfluxLogger\n",
"from cal_tools.enums import BadPixels\n",
"from cal_tools.plotting import show_overview, plot_badpix_3d, create_constant_overview\n",
diff --git a/notebooks/LPD/Untitled.ipynb b/notebooks/LPD/Untitled.ipynb
index 766b792b9f240e9956a3e2b53ffec65ec90a3432..3ca208e046b2c26be7733cddfdec7152d1e4c38b 100644
--- a/notebooks/LPD/Untitled.ipynb
+++ b/notebooks/LPD/Untitled.ipynb
@@ -12,7 +12,7 @@
"import matplotlib.pyplot as plt\n",
"%matplotlib inline\n",
"from iCalibrationDB import ConstantMetaData, Constants, Conditions, Detectors, Versions\n",
- "from cal_tools.cal_tools import get_constant_from_db\n",
+ "from cal_tools.tools import get_constant_from_db\n",
"from datetime import datetime"
]
},
diff --git a/xfel_calibrate/calibrate.py b/xfel_calibrate/calibrate.py
index 96860b64069c1e7fe9cd868a602635b9564e7457..1b7600e853895853567ab56df8867c0946c4d1dd 100755
--- a/xfel_calibrate/calibrate.py
+++ b/xfel_calibrate/calibrate.py
@@ -482,7 +482,7 @@ def run():
print("No 'out_folder' defined as argument, outputting to '{}' instead.".format(out_path))
else:
os.makedirs(out_path)
- cmd = ('"from cal_tools.cal_tools import finalize; ' +
+ cmd = ('"from cal_tools.tools import finalize; ' +
'finalize({{joblist}}, \'{run_path}\', \'{out_path}\', '+
'\'{project}\', \'{calibration}\', \'{author}\', \'{version}\')"')