From cf468e992e96549df31ff83d58080bd4b45800e3 Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Tue, 18 Jul 2023 16:21:31 +0200
Subject: [PATCH] Remove more functions and parameters that are not used
anywhere
---
src/cal_tools/agipdlib.py | 3 +-
src/cal_tools/agipdutils.py | 75 +------------------------------------
tests/test_cal_tools.py | 4 --
3 files changed, 2 insertions(+), 80 deletions(-)
diff --git a/src/cal_tools/agipdlib.py b/src/cal_tools/agipdlib.py
index 42ba25db4..2e50df04d 100644
--- a/src/cal_tools/agipdlib.py
+++ b/src/cal_tools/agipdlib.py
@@ -2,10 +2,9 @@ import os
import posixpath
import zlib
from datetime import datetime
-from logging import warning
from multiprocessing import Manager
from multiprocessing.pool import ThreadPool
-from typing import Any, Dict, List, Optional
+from typing import List, Optional
import h5py
import numpy as np
diff --git a/src/cal_tools/agipdutils.py b/src/cal_tools/agipdutils.py
index 6d859edbe..a7ee52de1 100644
--- a/src/cal_tools/agipdutils.py
+++ b/src/cal_tools/agipdutils.py
@@ -6,80 +6,7 @@ from scipy.signal import cwt, find_peaks_cwt, ricker
from sklearn.mixture import GaussianMixture
from sklearn.preprocessing import StandardScaler
-from cal_tools.enums import AgipdGainMode, BadPixels, SnowResolution
-
-
-def assemble_constant_dict(
- corr_bools,
- pc_bools,
- memory_cells,
- bias_voltage,
- gain_setting,
- acquisition_rate,
- photon_energy,
- beam_energy=None,
- only_dark=False,
- gain_mode=AgipdGainMode.ADAPTIVE_GAIN,
- integration_time=None
-):
- """
- Assemble a dictionary with the iCalibrationDB constant names and
- the operating conditions for retrieving the required constants
- for correction.
-
- :param corr_bools: (Dict) A dict of booleans for applying
- specific corrections
- :param pc_bools: (List) A list of booleans to enable SlopesPC retrieval
- :param memory_cells: (Int) Number of memory cells
- :param bias_voltage: (Int) Bias Voltage
- :param gain_setting: (Float) Gain setting
- :param acquisition_rate: (Float) Acquisition rate
- :param photon_energy: (Float) Photon energy
- :param integration_time: (Float) Integration time
- :param beam_energy: (Float) Beam Energy
- :param only_dark: (Bool) Indicating a retrieval for dark constants only from db
- :param gain_mode: Operation mode of the detector (default to adaptive gain)
- :return: const_dict: (Dict) An assembled dictionary that can be used
- to retrieve the required constants
- """
-
- darkcond = [
- "Dark",
- {
- "memory_cells": memory_cells,
- "bias_voltage": bias_voltage,
- "acquisition_rate": acquisition_rate,
- "gain_setting": gain_setting,
- "gain_mode": gain_mode,
- "integration_time": integration_time,
- "pixels_x": 512,
- "pixels_y": 128,
- },
- ]
- const_dict = {
- "Offset": ["zeros", (128, 512, memory_cells, 3), darkcond],
- "Noise": ["zeros", (128, 512, memory_cells, 3), darkcond],
- "ThresholdsDark": ["ones", (128, 512, memory_cells, 5), darkcond],
- "BadPixelsDark": ["zeros", (128, 512, memory_cells, 3), darkcond],
- }
-
- if not (corr_bools.get("only_offset") or only_dark):
- if any(pc_bools):
- const_dict["BadPixelsPC"] = ["zeros", (memory_cells, 128, 512), darkcond]
- const_dict["SlopesPC"] = ["ones", (128, 512, memory_cells, 10), darkcond]
-
- if corr_bools.get("xray_corr"):
- # Add illuminated conditions
- illumcond = [
- "Illuminated",
- {"beam_energy": beam_energy, "photon_energy": photon_energy},
- ]
- illumcond[1].update(darkcond[1])
-
- const_dict["BadPixelsFF"] = ["zeros", (128, 512, memory_cells), illumcond]
- const_dict["SlopesFF"] = ["ones", (128, 512, memory_cells, 2), illumcond]
-
- return const_dict
+from cal_tools.enums import BadPixels, SnowResolution
# contiguous_regions() by Joe Kington on Stackoverflow
diff --git a/tests/test_cal_tools.py b/tests/test_cal_tools.py
index 0c24cc4f8..3eb962b0e 100644
--- a/tests/test_cal_tools.py
+++ b/tests/test_cal_tools.py
@@ -9,7 +9,6 @@ import zmq
from extra_data import open_run
from iCalibrationDB import Conditions, ConstantMetaData, Constants
-from cal_tools.agipdlib import AgipdCorrections, CellRange
from cal_tools.plotting import show_processed_modules
from cal_tools.tools import (
creation_date_file_metadata,
@@ -29,10 +28,7 @@ from cal_tools.tools import (
ACQ_RATE = 1.1
BIAS_VOLTAGE = 300
GAIN_SETTING = 0
-GAIN_MODE = 0
-INTEGRATION_TIME = 12
MEM_CELLS = 352
-PHOTON_ENERGY = 9.2
AGIPD_KARABO_ID = "SPB_DET_AGIPD1M-1"
WRONG_AGIPD_MODULE = "AGIPD_**"
--
GitLab