Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add R3-5 version plugins #1181

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
169 changes: 168 additions & 1 deletion ophyd/areadetector/plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -1117,7 +1117,11 @@ class PluginBase_V34(PluginBase_V33, version=(3, 4), version_of=PluginBase):
max_array_rate = Cpt(SignalWithRBV, "MaxArrayRate")
max_array_rate_cout = Cpt(EpicsSignal, "MaxArrayRate_COUT")
max_byte_rate = Cpt(SignalWithRBV, "MaxByteRate")
min_callback_time = Cpt(SignalWithRBV, "MinCallbackTime")


class PluginBase_V35(PluginBase_V34, version=(3, 5), version_of=PluginBase):
codec = Cpt(EpicsSignalRO, "Codec_RBV", string=True)
compressed_size = Cpt(EpicsSignalRO, "CompressedSize_RBV")


# --- NDFile ---
Expand Down Expand Up @@ -1171,6 +1175,12 @@ class FilePlugin_V34(
...


class FilePlugin_V35(
PluginBase_V35, FilePlugin_V34, version=(3, 5), version_of=FilePlugin
):
...


# --- ColorConvPlugin ---


Expand Down Expand Up @@ -1216,6 +1226,12 @@ class ColorConvPlugin_V34(
...


class ColorConvPlugin_V35(
PluginBase_V35, ColorConvPlugin_V34, version=(3, 5), version_of=ColorConvPlugin
):
...


# --- NDFileHDF5 ---


Expand Down Expand Up @@ -1370,6 +1386,16 @@ class HDF5Plugin_V34(
...


class HDF5Plugin_V35(
FilePlugin_V35, HDF5Plugin_V34, version=(3, 5), version_of=HDF5Plugin
):
flush_now = Cpt(
EpicsSignal,
"FlushNow",
string=True,
doc="0=Done 1=Flush")


# --- NDStdArrays ---


Expand Down Expand Up @@ -1415,6 +1441,12 @@ class ImagePlugin_V34(
...


class ImagePlugin_V35(
PluginBase_V35, ImagePlugin_V34, version=(3, 5), version_of=ImagePlugin
):
...


# --- NDFileJPEG ---


Expand Down Expand Up @@ -1464,6 +1496,12 @@ class JPEGPlugin_V34(
...


class JPEGPlugin_V35(
FilePlugin_V35, JPEGPlugin_V34, version=(3, 5), version_of=JPEGPlugin
):
...


# --- Kafka Plugin ---


Expand Down Expand Up @@ -1509,6 +1547,12 @@ class KafkaPlugin_V34(
...


class KafkaPlugin_V35(
PluginBase_V35, KafkaPlugin_V34, version=(3, 5), version_of=KafkaPlugin
):
...


# --- NDFileMagick ---


Expand Down Expand Up @@ -1560,6 +1604,12 @@ class MagickPlugin_V34(
...


class MagickPlugin_V35(
FilePlugin_V35, MagickPlugin_V34, version=(3, 5), version_of=MagickPlugin
):
...


# --- NDFileNetCDF ---


Expand Down Expand Up @@ -1611,6 +1661,12 @@ class NetCDFPlugin_V34(
...


class NetCDFPlugin_V35(
FilePlugin_V35, NetCDFPlugin_V34, version=(3, 5), version_of=NetCDFPlugin
):
...


# --- NDFileNexus ---


Expand Down Expand Up @@ -1662,6 +1718,12 @@ class NexusPlugin_V34(
...


class NexusPlugin_V35(
FilePlugin_V35, NexusPlugin_V34, version=(3, 5), version_of=NexusPlugin
):
...


# --- NDOverlayN ---


Expand Down Expand Up @@ -1744,6 +1806,12 @@ class OverlayPlugin_V34(
...


class OverlayPlugin_V35(
PluginBase_V35, OverlayPlugin_V34, version=(3, 5), version_of=OverlayPlugin
):
...


# --- NDProcess ---


Expand Down Expand Up @@ -1791,6 +1859,12 @@ class ProcessPlugin_V34(
...


class ProcessPlugin_V35(
PluginBase_V35, ProcessPlugin_V34, version=(3, 5), version_of=ProcessPlugin
):
...


# --- NDROI ---


Expand Down Expand Up @@ -1845,6 +1919,12 @@ class ROIPlugin_V34(
...


class ROIPlugin_V35(
PluginBase_V35, ROIPlugin_V34, version=(3, 5), version_of=ROIPlugin
):
...


# --- NDROIStat ---


Expand Down Expand Up @@ -1904,6 +1984,12 @@ class ROIStatPlugin_V34(
...


class ROIStatPlugin_V35(
PluginBase_V35, ROIStatPlugin_V34, version=(3, 5), version_of=ROIStatPlugin
):
...


# --- NDROIStatN ---


Expand Down Expand Up @@ -2031,6 +2117,12 @@ class StatsPlugin_V34(
...


class StatsPlugin_V35(
PluginBase_V35, StatsPlugin_V34, version=(3, 5), version_of=StatsPlugin
):
...


# --- NDFileTIFF ---


Expand Down Expand Up @@ -2080,6 +2172,12 @@ class TIFFPlugin_V34(
...


class TIFFPlugin_V35(
FilePlugin_V35, TIFFPlugin_V34, version=(3, 5), version_of=TIFFPlugin
):
...


# --- NDTransform ---


Expand Down Expand Up @@ -2157,6 +2255,12 @@ class TransformPlugin_V34(
...


class TransformPlugin_V35(
PluginBase_V35, TransformPlugin_V34, version=(3, 5), version_of=TransformPlugin
):
...


# --- NDPva ---


Expand Down Expand Up @@ -2196,6 +2300,12 @@ class PvaPlugin_V34(
...


class PvaPlugin_V35(
PluginBase_V35, PvaPlugin_V34, version=(3, 5), version_of=PvaPlugin
):
...


# --- NDFFT ---


Expand Down Expand Up @@ -2258,6 +2368,12 @@ class FFTPlugin_V34(
...


class FFTPlugin_V35(
PluginBase_V35, FFTPlugin_V34, version=(3, 5), version_of=FFTPlugin
):
...


# --- NDScatter ---


Expand Down Expand Up @@ -2293,6 +2409,12 @@ class ScatterPlugin_V34(
...


class ScatterPlugin_V35(
PluginBase_V35, ScatterPlugin_V34, version=(3, 5), version_of=ScatterPlugin
):
...


# --- NDPosPlugin ---


Expand Down Expand Up @@ -2348,6 +2470,12 @@ class PosPluginPlugin_V34(
...


class PosPluginPlugin_V35(
PluginBase_V35, PosPluginPlugin_V34, version=(3, 5), version_of=PosPlugin
):
...


# --- NDCircularBuff ---


Expand Down Expand Up @@ -2435,6 +2563,15 @@ class CircularBuffPlugin_V34(
)


class CircularBuffPlugin_V35(
PluginBase_V35,
CircularBuffPlugin_V34,
version=(3, 5),
version_of=CircularBuffPlugin
):
...


# --- NDAttributeN ---


Expand Down Expand Up @@ -2485,6 +2622,12 @@ class AttrPlotPlugin_V34(
...


class AttrPlotPlugin_V35(
PluginBase_V35, AttrPlotPlugin_V34, version=(3, 5), version_of=AttrPlotPlugin
):
...


# --- NDTimeSeriesN ---


Expand Down Expand Up @@ -2558,6 +2701,12 @@ class TimeSeriesPlugin_V34(
...


class TimeSeriesPlugin_V35(
PluginBase_V35, TimeSeriesPlugin_V34, version=(3, 5), version_of=TimeSeriesPlugin
):
...


# --- NDCodec ---


Expand Down Expand Up @@ -2593,6 +2742,14 @@ class CodecPlugin_V34(
mode = Cpt(SignalWithRBV, "Mode", string=True, doc="0=Compress 1=Decompress")


class CodecPlugin_V35(
PluginBase_V35, CodecPlugin_V34, version=(3, 5), version_of=CodecPlugin
):
blosc_shuffle = Cpt(
SignalWithRBV, "BloscShuffle", string=True, doc="0=None 1=Byte 2=Bit"
)


@register_plugin
class AttributePlugin(Device, version_type="ADCore"):
"Serves as a base class for other versions"
Expand Down Expand Up @@ -2692,6 +2849,16 @@ class AttributePlugin_V34(
...


class AttributePlugin_V35(
PluginBase_V35, AttributePlugin_V34, version=(3, 5), version_of=AttributePlugin
):
ts_acquiring = None
ts_control = None
ts_current_point = None
ts_num_points = None
ts_read = None


# --- NDGather / NDGatherN ---


Expand Down
Loading