diff --git a/cal_tools/cal_tools/agipdlib.py b/cal_tools/cal_tools/agipdlib.py index e65d4952f21b66c143006f910b46ac17bf25db56..c239d5730cf5e8b3c90ee7cde3f89f51e3f825ee 100644 --- a/cal_tools/cal_tools/agipdlib.py +++ b/cal_tools/cal_tools/agipdlib.py @@ -5,12 +5,12 @@ from typing import Any, Dict, Optional, Tuple import h5py import numpy as np import sharedmem -from cal_tools.agipdutils import * -from cal_tools.enums import BadPixels, SnowResolution -from cal_tools.tools import get_constant_from_db_and_time from iCalibrationDB import Conditions, Constants, Detectors +from cal_tools.agipdutils import * from cal_tools.cython import agipdalgs as calgs +from cal_tools.enums import BadPixels, SnowResolution +from cal_tools.tools import get_constant_from_db_and_time def get_num_cells(fname, loc, module): diff --git a/cal_tools/cal_tools/agipdutils.py b/cal_tools/cal_tools/agipdutils.py index d1ff0755f75bcebe94e03e96e2cf3dc2542f0ad0..7ae00abbe9ce44caa1e862e68369e7d68358c780 100644 --- a/cal_tools/cal_tools/agipdutils.py +++ b/cal_tools/cal_tools/agipdutils.py @@ -1,11 +1,12 @@ import copy import numpy as np -from cal_tools.enums import BadPixels, SnowResolution from scipy.signal import cwt, find_peaks_cwt, ricker from sklearn.mixture import GaussianMixture from sklearn.preprocessing import StandardScaler +from cal_tools.enums import BadPixels, SnowResolution + def assemble_constant_dict(corr_bools, pc_bools, memory_cells, bias_voltage, gain_setting, acquisition_rate, diff --git a/cal_tools/cal_tools/agipdutils_ff.py b/cal_tools/cal_tools/agipdutils_ff.py index 4cae853275d5683c9760ca5565472d019ea56763..6774e5a0e85a619796e8d1c510e3a5a8b52852bf 100644 --- a/cal_tools/cal_tools/agipdutils_ff.py +++ b/cal_tools/cal_tools/agipdutils_ff.py @@ -1,9 +1,10 @@ from typing import Any, Dict, List, Optional, Tuple import numpy as np -from cal_tools.enums import BadPixelsFF from iminuit import Minuit +from cal_tools.enums import BadPixelsFF + def any_in(mask: np.ndarray, bits: int) -> bool: return mask.astype(np.uint) & bits > 0 diff --git a/cal_tools/cal_tools/lpdlib.py b/cal_tools/cal_tools/lpdlib.py index 34193b6ef96787f7d971d722ab26fd2f8289da03..217c769fcc6faef919697b2b671a1c9e3a65c488 100644 --- a/cal_tools/cal_tools/lpdlib.py +++ b/cal_tools/cal_tools/lpdlib.py @@ -3,11 +3,10 @@ from typing import Optional, Tuple import h5py import numpy as np +from iCalibrationDB import Conditions, Constants, Detectors from cal_tools.enums import BadPixels -from cal_tools.tools import (get_constant_from_db, - get_constant_from_db_and_time) -from iCalibrationDB import Conditions, Constants, Detectors +from cal_tools.tools import get_constant_from_db, get_constant_from_db_and_time class LpdCorrections: