Refactor assemblies into blocks and includes

dls-controls · Nov 1, 2016 · a19643d · a19643d
1 parent 63b3fa1
commit a19643d
Show file tree

Hide file tree

Showing 47 changed files with 533 additions and 412 deletions.
diff --git a/malcolm/assemblies/ADCore/DetectorManager.yaml b/malcolm/assemblies/ADCore/DetectorManager.yaml
diff --git a/malcolm/assemblies/pmac/PMACManager.yaml b/malcolm/assemblies/pmac/PMACManager.yaml
diff --git a/malcolm/assemblies/xspress3/Xspress3DetectorDriver.yaml b/malcolm/assemblies/xspress3/Xspress3DetectorDriver.yaml
diff --git a/malcolm/assemblies/ADCore/HDFWriter.yaml → malcolm/blocks/ADCore/HDFWriter.yaml b/malcolm/assemblies/ADCore/HDFWriter.yaml → malcolm/blocks/ADCore/HDFWriter.yaml
@@ -1,21 +1,17 @@
+- parameters.string:
+    name: mri
+    description: Malcolm resource id of the Block
+
 - parameters.string:
     name: prefix
     description: The root PV for the all records
 
-- parts.ca.CAStringPart:
-    name: inp
-    description: Array inport name
-    pv: $(prefix):NDArrayPort
-    rbvSuff: _RBV
-    widget: textinput
-    inportType: NDArray
+- controllers.DefaultController:
+    mri: $(mri)
 
-- parts.ca.CABooleanPart:
-    name: enableCallbacks
-    description: Enable plugin to run when we get a new frame
-    pv: $(prefix):EnableCallbacks
-    rbvSuff: _RBV
-    widget: checkbox
+# This includes the input port
+- includes.ADCore.ndpluginbase_parts:
+    prefix: $(prefix)
 
 - parts.ca.CAChoicePart:
     name: fileWriteMode
@@ -258,19 +254,6 @@
     rbv: $(prefix):Capture_RBV
     widget: led
 
-- parts.ca.CALongPart:
-    name: arrayCounter
-    description: Current unique id number for frame
-    pv: $(prefix):ArrayCounter
-    rbvSuff: _RBV
-    widget: textupdate
-
-- parts.ca.CALongPart:
-    name: uniqueId
-    description: Current unique id number for frame
-    rbv: $(prefix):UniqueId_RBV
-    widget: textupdate
-
 - parts.ca.CACharArrayPart:
     name: writeMessage
     description: Error message if in error

diff --git a/...m/assemblies/ADCore/PositionLabeller.yaml → malcolm/blocks/ADCore/PositionLabeller.yaml b/...m/assemblies/ADCore/PositionLabeller.yaml → malcolm/blocks/ADCore/PositionLabeller.yaml
@@ -1,27 +1,21 @@
+- parameters.string:
+    name: mri
+    description: Malcolm resource id of the Block
+
 - parameters.string:
     name: prefix
     description: The root PV for the all records
 
-- parts.asyn.AsynOutportPart:
-    name: out
-    description: Array outport name
-    rbv: $(prefix):PortName_RBV
-    outportType: NDArray
+- controllers.DefaultController:
+    mri: $(mri)
 
-- parts.ca.CAStringPart:
-    name: inp
-    description: Array inport name
-    pv: $(prefix):NDArrayPort
-    rbvSuff: _RBV
-    widget: textinput
-    inportType: NDArray
+# This includes the output port
+- includes.ADCore.ndarray_parts:
+    prefix: $(prefix)
 
-- parts.ca.CABooleanPart:
-    name: enableCallbacks
-    description: Enable plugin to run when we get a new frame
-    pv: $(prefix):EnableCallbacks
-    rbvSuff: _RBV
-    widget: checkbox
+# This includes the input port
+- includes.ADCore.ndpluginbase_parts:
+    prefix: $(prefix)
 
 - parts.ca.CAActionPart:
     name: delete

diff --git a/malcolm/blocks/ADCore/SimDetectorDriver.yaml b/malcolm/blocks/ADCore/SimDetectorDriver.yaml
@@ -0,0 +1,13 @@
+- parameters.string:
+    name: mri
+    description: Malcolm resource id of the Block
+
+- parameters.string:
+    name: prefix
+    description: The root PV for the all records
+
+- controllers.DefaultController:
+    mri: $(mri)
+
+- includes.ADCore.adbase_parts:
+    prefix: $(prefix)
diff --git a/malcolm/blocks/ADCore/SimDetectorManager.yaml b/malcolm/blocks/ADCore/SimDetectorManager.yaml
@@ -0,0 +1,22 @@
+- parameters.string:
+    name: mriPrefix
+    description: Malcolm resource id of the Block and prefix for children
+
+- parameters.string:
+    name: pvPrefix
+    description: PV prefix for driver and all plugins
+
+- controllers.RunnableController:
+    mri: $(mriPrefix)
+
+- blocks.ADCore.SimDetectorDriver:
+    mri: $(mriPrefix)-DRV
+    prefix: $(pvPrefix):DET
+
+- parts.ADCore.DetectorDriverPart:
+    name: DRV
+    mri: $(mriPrefix)-DRV
+
+- includes.ADCore.filewriting_collection:
+    pvPrefix: $(pvPrefix)
+    mriPrefix: $(mriPrefix)
diff --git a/malcolm/blocks/ADCore/StatsPlugin.yaml b/malcolm/blocks/ADCore/StatsPlugin.yaml
@@ -0,0 +1,25 @@
+- parameters.string:
+    name: mri
+    description: Malcolm resource id of the Block
+
+- parameters.string:
+    name: prefix
+    description: The root PV for the all records
+
+- controllers.DefaultController:
+    mri: $(mri)
+
+# This includes the output port
+- includes.ADCore.ndarray_parts:
+    prefix: $(prefix)
+
+# This includes the input port
+- includes.ADCore.ndpluginbase_parts:
+    prefix: $(prefix)
+
+- parts.ca.CABooleanPart:
+    name: computeStatistics
+    description: Compute min, max, mean, tot, sigma, net
+    pv: $(prefix):ComputeStatistics
+    rbvSuff: _RBV
+    widget: checkbox
diff --git a/malcolm/assemblies/ADCore/__init__.py → malcolm/blocks/ADCore/__init__.py b/malcolm/assemblies/ADCore/__init__.py → malcolm/blocks/ADCore/__init__.py
diff --git a/malcolm/assemblies/__init__.py → malcolm/blocks/__init__.py b/malcolm/assemblies/__init__.py → malcolm/blocks/__init__.py
diff --git a/malcolm/assemblies/demo/Counter.yaml → malcolm/blocks/demo/Counter.yaml b/malcolm/assemblies/demo/Counter.yaml → malcolm/blocks/demo/Counter.yaml
@@ -1,6 +1,6 @@
 - parameters.string:
     name: mri
-    description: Malcolm resource id of the Counter Block
+    description: Malcolm resource id of the Block
 
 - controllers.DefaultController:
     mri: $(mri)

diff --git a/malcolm/assemblies/demo/Hello.yaml → malcolm/blocks/demo/Hello.yaml b/malcolm/assemblies/demo/Hello.yaml → malcolm/blocks/demo/Hello.yaml
@@ -1,6 +1,6 @@
 - parameters.string:
     name: mri
-    description: Malcolm resource id of the Hello Block
+    description: Malcolm resource id of the Block
 
 - controllers.DefaultController:
     mri: $(mri)

diff --git a/malcolm/assemblies/demo/TestRigManager.yaml → malcolm/blocks/demo/TestRigManager.yaml b/malcolm/assemblies/demo/TestRigManager.yaml → malcolm/blocks/demo/TestRigManager.yaml
@@ -1,20 +1,26 @@
+- parameters.string:
+    name: mri
+    description: MRI for created block
+
 - parameters.string:
     name: mic
     description: MRI for microscope DetectorManager object
 
 - parameters.string:
     name: brick
-    description: MRI for brick DetectorManager object
+    description: MRI for brick PMACManager object
 
 - controllers.RunnableController:
+    mri: $(mri)
+    axesToMove: [stagex, stagey]
 
 - parts.ADCore.DatasetTablePart:
     name: DSET
 
 - parts.builtin.RunnableChildPart:
     name: MIC
-    child: $(mic)
+    mri: $(mic)
 
 - parts.builtin.RunnableChildPart:
     name: BRICK
-    child: $(brick)
+    mri: $(brick)
diff --git a/malcolm/blocks/demo/TestRigPMACManager.yaml b/malcolm/blocks/demo/TestRigPMACManager.yaml
@@ -0,0 +1,24 @@
+- controllers.RunnableController:
+    mri: P45-BRICK01
+
+- includes.pmac.rawmotor_collection:
+    mri: P45-STAGE-X
+    motorPrefix: LAB-MO-MAP-01:STAGE:X
+    prefix: LAB-MO-MAP-01:STAGEGB1:M1
+    scannable: stagex
+
+- includes.pmac.rawmotor_collection:
+    name: P45-STAGE-Y
+    motorPrefix: LAB-MO-MAP-01:STAGE:Y
+    prefix: LAB-MO-MAP-01:STAGEGB1:M2
+    scannable: stagey
+
+- includes.pmac.rawmotor_collection:
+    name: P45-STAGE-Z
+    motorPrefix: LAB-MO-MAP-01:STAGE:Z
+    prefix: LAB-MO-MAP-01:STAGEGB1:M3
+    scannable: stagez
+
+- includes.pmac.trajectory_collection:
+    name: P45-BRICK01-TRAJ
+    prefix: LAB-MO-MAP-01:STAGEGB1
diff --git a/malcolm/assemblies/demo/__init__.py → malcolm/blocks/demo/__init__.py b/malcolm/assemblies/demo/__init__.py → malcolm/blocks/demo/__init__.py
diff --git a/malcolm/assemblies/pandabox/__init__.py → malcolm/blocks/pandabox/__init__.py b/malcolm/assemblies/pandabox/__init__.py → malcolm/blocks/pandabox/__init__.py
diff --git a/malcolm/assemblies/pandabox/pandabox.py → malcolm/blocks/pandabox/pandabox.py b/malcolm/assemblies/pandabox/pandabox.py → malcolm/blocks/pandabox/pandabox.py
@@ -39,7 +39,7 @@ def PandABox(process, params):
             malcolm_name = "%s:%s" % (params.name, bn)
             ret.append(poller.make_panda_block(malcolm_name, bn, block_data))
             part_params = ChildPart.MethodMeta.prepare_input_map(
-                dict(name=bn, child=malcolm_name))
+                dict(name=bn, mri=malcolm_name))
             parts[bn] = ChildPart(process, part_params)
 
     # Make a controller