Fix merge + isort

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

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

cal_tools/cal_tools/dssclib.py

 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)."""

cal_tools/cal_tools/pnccdlib.py

@@ -5,7 +5,6 @@ from typing import Tuple
 
 import h5py
 
-
 VALID_GAINS = {
     "a" : 1.0,
     "b" : 4.0,