From 0ec69b2b37014cda2c26d26c9b4bfe9d7e9f3d2a Mon Sep 17 00:00:00 2001 From: David Hammer <dhammer@mailbox.org> Date: Mon, 1 Nov 2021 14:31:27 +0100 Subject: [PATCH] Flake8, isort, black --- src/calng/AgipdCorrection.py | 6 +++--- src/calng/DsscCorrection.py | 2 +- src/calng/ModuleStacker.py | 2 +- src/calng/ShmemToZMQ.py | 2 -- src/calng/base_correction.py | 1 - src/calng/scenes.py | 6 +++--- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/calng/AgipdCorrection.py b/src/calng/AgipdCorrection.py index 10da69ce..adf8866e 100644 --- a/src/calng/AgipdCorrection.py +++ b/src/calng/AgipdCorrection.py @@ -5,20 +5,20 @@ from karabo.bound import ( BOOL_ELEMENT, FLOAT_ELEMENT, KARABO_CLASSINFO, + NDARRAY_ELEMENT, NODE_ELEMENT, + OUTPUT_CHANNEL, STRING_ELEMENT, VECTOR_STRING_ELEMENT, Schema, - NDARRAY_ELEMENT, - OUTPUT_CHANNEL, ) from karabo.common.states import State +from . import shmem_utils from ._version import version as deviceVersion from .agipd_gpu import AgipdGainMode, AgipdGpuRunner, BadPixelValues, CorrectionFlags from .base_correction import BaseCorrection, add_correction_step_schema from .calcat_utils import AgipdCalcatFriend, AgipdConstants -from . import shmem_utils @KARABO_CLASSINFO("AgipdCorrection", deviceVersion) diff --git a/src/calng/DsscCorrection.py b/src/calng/DsscCorrection.py index ae9f4f33..7bd0b665 100644 --- a/src/calng/DsscCorrection.py +++ b/src/calng/DsscCorrection.py @@ -7,7 +7,7 @@ from karabo.common.states import State from ._version import version as deviceVersion from .base_correction import BaseCorrection, add_correction_step_schema from .calcat_utils import DsscCalcatFriend, DsscConstants -from .dssc_gpu import DsscGpuRunner, CorrectionFlags +from .dssc_gpu import CorrectionFlags, DsscGpuRunner @KARABO_CLASSINFO("DsscCorrection", deviceVersion) diff --git a/src/calng/ModuleStacker.py b/src/calng/ModuleStacker.py index 967e080d..3490a705 100644 --- a/src/calng/ModuleStacker.py +++ b/src/calng/ModuleStacker.py @@ -1,10 +1,10 @@ import numpy as np from karabo.bound import ( - ChannelMetaData, FLOAT_ELEMENT, KARABO_CLASSINFO, NODE_ELEMENT, STRING_ELEMENT, + ChannelMetaData, Epochstamp, Hash, MetricPrefix, diff --git a/src/calng/ShmemToZMQ.py b/src/calng/ShmemToZMQ.py index 1fcdaa4f..b31cbccd 100644 --- a/src/calng/ShmemToZMQ.py +++ b/src/calng/ShmemToZMQ.py @@ -1,11 +1,9 @@ -import threading from time import time from karabo.bound import KARABO_CLASSINFO from PipeToZeroMQ import PipeToZeroMQ, conversion, device_schema from . import shmem_utils - from ._version import version as deviceVersion diff --git a/src/calng/base_correction.py b/src/calng/base_correction.py index 40f633f2..2b072927 100644 --- a/src/calng/base_correction.py +++ b/src/calng/base_correction.py @@ -36,7 +36,6 @@ from karabo.common.states import State from . import scenes, shmem_utils, utils from ._version import version as deviceVersion - PROCESSING_STATE_TIMEOUT = 10 diff --git a/src/calng/scenes.py b/src/calng/scenes.py index 8f6f3aab..efc14e04 100644 --- a/src/calng/scenes.py +++ b/src/calng/scenes.py @@ -12,11 +12,11 @@ from karabo.common.scenemodel.api import ( DoubleLineEditModel, EvaluatorModel, IntLineEditModel, - LineEditModel, LabelModel, + LineEditModel, + RectangleModel, SceneModel, write_scene, - RectangleModel, ) BASE_INC = 30 @@ -439,7 +439,7 @@ class CompactCorrectionDeviceOverview: keys=[f"{device_id}.availableScenes"], target="overview", width=5 * BASE_INC, - height=BASE_INC + height=BASE_INC, ) self.status = DisplayStateColorModel( show_string=True, -- GitLab