Merge pull request #328 from dls-controls/feature/double-buff-seq

Feature/double buff seq

Author: tomtrafford

CHANGELOG.rst

@@ -3,6 +3,29 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to `Semantic Versioning <http://semver.org/>`_ after 2-1.
 
+Unreleased
+----------
+
+Changed:
+
+- Implemented Double Buffering, using both Sequencer tables available on the PandA
+  to be able to scan over the 2000 max number of rows, and to decrease the
+  configuration time for long scans.
+
+  See the updated "template_double_seq_pcomp" for the new reccomended
+  design. It is also reccomended to set repeats on both of the SEQ tables to be
+  '1', although the PandASeqTriggerPart does also set this when it is needed.
+
+  This has a **breaking change** for old PandA designs as seqReset now has to be
+  exported. Otherwise Stack scans where each inner scan is small enough that the
+  points will not fill 2 SEQ tables (<8192 points or 30s per inner scan), but large
+  enough that it will use more than 1 (>4096 points, 15s per inner scan) will fail.
+
+Fixed:
+
+- Fixed bug where, during a 3D scan, the first point of all inner scans after the
+  first previously triggered immediately even if the outer axes was still moving.
+
 `5.2`_ - 2022-01-05
 -------------------
 

malcolm/modules/ADPandABlocks/blocks/panda_runnable_block_designs/template_double_seq_pcomp.json

@@ -75,7 +75,8 @@
     "exports": {
       "SEQ1.table": "seqTableA", 
       "SEQ2.table": "seqTableB", 
-      "SRGATE2.forceSet": "seqSetEnable"
+      "SRGATE2.forceSet": "seqSetEnable",
+      "SRGATE2.forceRst": "seqReset"
     }
   },
   "children": {
@@ -114,9 +115,9 @@
       "inputs": "expanded", 
       "inpa": "SEQ2.ACTIVE", 
       "inpaDelay": 0, 
-      "inpb": "PCAP.ACTIVE", 
+      "inpb": "SRGATE2.OUT", 
       "inpbDelay": 0, 
-      "inpc": "SRGATE2.OUT", 
+      "inpc": "ZERO", 
       "inpcDelay": 0, 
       "inpd": "ZERO", 
       "inpdDelay": 0, 
@@ -128,18 +129,18 @@
       "typec": "Input-Level", 
       "typed": "Input-Level", 
       "typee": "Input-Level", 
-      "func": "~A&B&C", 
+      "func": "~A&B", 
       "outputs": "expanded"
     }, 
     "LUT3": {
       "label": "SeqB Enable", 
       "inputs": "expanded", 
       "inpa": "SEQ1.ACTIVE", 
       "inpaDelay": 0, 
-      "inpb": "PCAP.ACTIVE", 
+      "inpb": "SRGATE2.OUT", 
       "inpbDelay": 8, 
-      "inpc": "SRGATE2.OUT", 
-      "inpcDelay": 8, 
+      "inpc": "ZERO", 
+      "inpcDelay": 0, 
       "inpd": "ZERO", 
       "inpdDelay": 0, 
       "inpe": "ZERO", 
@@ -150,7 +151,7 @@
       "typec": "Input-Level", 
       "typed": "Input-Level", 
       "typee": "Input-Level", 
-      "func": "~A&B&C", 
+      "func": "~A&B", 
       "outputs": "expanded"
     }, 
     "LUT4": {
@@ -214,7 +215,6 @@
       "tsEndCapture": "No", 
       "tsTrigCapture": "No", 
       "samplesCapture": "Value", 
-      "readbacks": "expanded", 
       "attributesFile": "", 
       "triggerMode": "Internal"
     }, 
@@ -255,7 +255,7 @@
       },
       "prescale": 0.0, 
       "prescaleUnits": "s", 
-      "repeats": 0, 
+      "repeats": 1,
       "outputs": "expanded", 
       "readbacks": "expanded"
     }, 
@@ -296,7 +296,7 @@
       }, 
       "prescale": 0.0, 
       "prescaleUnits": "s", 
-      "repeats": 0, 
+      "repeats": 1,
       "outputs": "expanded", 
       "readbacks": "expanded"
     }, 
@@ -322,7 +322,7 @@
       "enableDelay": 0, 
       "set": "ZERO", 
       "setDelay": 0, 
-      "rst": "PCAP.ACTIVE", 
+      "rst": "ZERO", 
       "rstDelay": 0, 
       "parameters": "expanded", 
       "whenDisabled": "Set output low",