diff --git a/notebooks/pnCCD/Correct_pnCCD_NBC.ipynb b/notebooks/pnCCD/Correct_pnCCD_NBC.ipynb index 6fa624889de54e2fc0d38eea0be38b2dec189de7..f9639abf1929db561e40dbd5a8c3429bded0a772 100644 --- a/notebooks/pnCCD/Correct_pnCCD_NBC.ipynb +++ b/notebooks/pnCCD/Correct_pnCCD_NBC.ipynb @@ -49,6 +49,7 @@ "cal_db_interface = \"tcp://max-exfl016:8015\" # calibration DB interface to use\n", "cal_db_timeout = 300000 # timeout on caldb requests\n", "creation_time = \"\" # The timestamp to use with Calibration DB. Required Format: \"YYYY-MM-DD hh:mm:ss\" e.g. 2019-07-04 11:02:41\n", + "remove_bias_voltage_if_zero = True # This flag enables removing bias voltage from the conditions if a 0 value is read from RAW data. This is useful when the corresponding constants for old RAW had no bias voltage because of a mistake in control data. e.g. p002857\n", "\n", "# Booleans for selecting corrections to apply.\n", "only_offset = False # Only, apply offset.\n", @@ -97,7 +98,6 @@ "from pathlib import Path\n", "warnings.filterwarnings('ignore')\n", "\n", - "import h5py\n", "import matplotlib.pyplot as plt\n", "import numpy as np\n", "import pasha as psh\n", @@ -172,7 +172,6 @@ "\n", "# extract control data\n", "step_timer.start()\n", - "\n", "ctrl_data = pnccdlib.PnccdCtrl(run_dc, karabo_id)\n", "if bias_voltage == 0.:\n", " bias_voltage = ctrl_data.get_bias_voltage()\n", @@ -313,6 +312,14 @@ "if relgain:\n", " constant_names += [\"RelativeGainCCD\"]\n", "\n", + "# In the case of an older proposal (e.g., proposal 002857),\n", + "# it is possible that the bias voltage was 0\n", + "# resulting in the absence of bias voltage values in\n", + "# the previously injected dark constants. This situation can be\n", + "# attributed to a feature that is currently not available in iCalibrationDB.\n", + "if bias_voltage == 0 and remove_bias_voltage_if_zero:\n", + " bias_voltage = None\n", + "\n", "pnccd_cal = PNCCD_CalibrationData(\n", " detector_name=karabo_id,\n", " sensor_bias_voltage=bias_voltage,\n", diff --git a/setup.py b/setup.py index 7e6451b63e9cd592f3be048e7e28f5f552502785..9d2db821165c9533c7189eb7a13f7ddcfe5067af 100644 --- a/setup.py +++ b/setup.py @@ -108,7 +108,7 @@ install_requires = [ if "readthedocs.org" not in sys.executable: install_requires += [ - "iCalibrationDB @ git+ssh://git@git.xfel.eu:10022/detectors/cal_db_interactive.git@2.4.0", # noqa + "iCalibrationDB @ git+ssh://git@git.xfel.eu:10022/detectors/cal_db_interactive.git@2.4.1", # noqa "XFELDetectorAnalysis @ git+ssh://git@git.xfel.eu:10022/karaboDevices/pyDetLib.git@2.7.0", # noqa "CalParrot @ git+ssh://git@git.xfel.eu:10022/calibration/calparrot.git@0.1", # noqa ]