diff --git a/src/calng/AgipdCorrection.py b/src/calng/AgipdCorrection.py index 10da69ce2a7794094edbc804f77b472f27e324d6..adf8866e7d8e28198ad99711d400d23b61ce70b5 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 ae9f4f33c8ea4a73af96183dbe8ceb29a1103ef8..7bd0b665becdfb3eda6e12391810b3162818e6a2 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 967e080d42989835cf682fc8e202753bcf0af869..3490a705de34c17381670977295b0eb1baa4356d 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 1fcdaa4f09ea414c77ba37a0c7553db768dfbed6..b31cbccde2d94a8d97e4bd1218945e8250283a18 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 40f633f29db28348c3586227e189973591d5e162..2b072927a58f924b889f2c601a4d3c394da63d1e 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 8f6f3aabd500a4072de78de8fa279e0579310a5c..efc14e04756497d0f73d5ad79a5279961dc384ab 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,