diff --git a/cal_tools/cal_tools/agipdlib.py b/cal_tools/cal_tools/agipdlib.py index 8575e4d0860e2ef7a339d66a6b5941648db7f656..e797a3bdea662b5ef7fa47c01dbf9f824f52073d 100644 --- a/cal_tools/cal_tools/agipdlib.py +++ b/cal_tools/cal_tools/agipdlib.py @@ -5,6 +5,8 @@ from typing import Any, Dict, Optional, Tuple import h5py import numpy as np import sharedmem +from iCalibrationDB import Conditions, Constants + from cal_tools.agipdutils import (assemble_constant_dict, baseline_correct_via_noise, baseline_correct_via_stripe, @@ -12,11 +14,6 @@ from cal_tools.agipdutils import (assemble_constant_dict, correct_baseline_via_hist_asic, make_noisy_adc_mask, match_asic_borders, melt_snowy_pixels) -from cal_tools.enums import BadPixels, SnowResolution -from cal_tools.tools import get_constant_from_db_and_time -from iCalibrationDB import Conditions, Constants - -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 diff --git a/cal_tools/cal_tools/agipdutils.py b/cal_tools/cal_tools/agipdutils.py index 6ed7130528650c553b8643a2d4b5f08419f7d8c6..ae06e49bf9d661a6cc90265b445c93860bfee030 100644 --- a/cal_tools/cal_tools/agipdutils.py +++ b/cal_tools/cal_tools/agipdutils.py @@ -2,7 +2,6 @@ import copy from typing import Tuple import numpy as np -from cal_tools.enums import BadPixels, SnowResolution from scipy.signal import cwt, ricker from sklearn.mixture import GaussianMixture from sklearn.preprocessing import StandardScaler diff --git a/cal_tools/cal_tools/dssclib.py b/cal_tools/cal_tools/dssclib.py index 7e17f2011471f185e39f38fedcfcfab0cb25523d..8eabb3f42e4b3ae7be67ea39941ee38c5c408186 100644 --- a/cal_tools/cal_tools/dssclib.py +++ b/cal_tools/cal_tools/dssclib.py @@ -1,12 +1,13 @@ import binascii -import h5py -from hashlib import blake2b -import numpy as np import os import re import struct +from hashlib import blake2b from typing import Dict, Tuple +import h5py +import numpy as np + def get_pulseid_checksum(fname, h5path, h5path_idx): """generates hash value from pulse pattern (veto defined).""" diff --git a/cal_tools/cal_tools/pnccdlib.py b/cal_tools/cal_tools/pnccdlib.py index ec8b92e7f65dfb21a09fa099df3a749d55833fc7..785d289c359ffe6d3e62aa15bb6e41de56d4145d 100644 --- a/cal_tools/cal_tools/pnccdlib.py +++ b/cal_tools/cal_tools/pnccdlib.py @@ -5,7 +5,6 @@ from typing import Tuple import h5py - VALID_GAINS = { "a" : 1.0, "b" : 4.0,