From a1d2ae3d9abaf7363e747600b245dc97f493dc37 Mon Sep 17 00:00:00 2001
From: "Sode, Adedamola (DLSLtd,RAL,LSCI)" <adedamola.sode@diamond.ac.uk>
Date: Fri, 9 Feb 2024 14:32:56 +0000
Subject: [PATCH] readout time and frequency accuracy additions

---
 .../blocks/merlin_runnable_block.yaml         | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/malcolm/modules/ADMerlin/blocks/merlin_runnable_block.yaml b/malcolm/modules/ADMerlin/blocks/merlin_runnable_block.yaml
index 01bc93e3c..9c8fc34b6 100644
--- a/malcolm/modules/ADMerlin/blocks/merlin_runnable_block.yaml
+++ b/malcolm/modules/ADMerlin/blocks/merlin_runnable_block.yaml
@@ -10,11 +10,26 @@
     name: config_dir
     description: Where to store saved configs
 
+- builtin.parameters.string:
+    name: drv_suffix
+    description: PV suffix for detector driver
+    default: DET
+
 - builtin.parameters.string:
     name: label
     description: Beamline specific label for the detector
     default: Merlin
 
+- builtin.parameters.string:
+    name: readout_time
+    description: Readout time of the detector
+    default: 1e-3
+
+- builtin.parameters.string:
+    name: frequency_accuracy
+    description: Frequency accuracy of the detector
+    default: 50
+
 - builtin.defines.docstring:
     value: |
       Device block corresponding to Merlin + stat + pos + hdf writer.
@@ -35,7 +50,7 @@
 
 - ADMerlin.blocks.merlin_driver_block:
     mri: $(mri_prefix):DRV
-    prefix: $(pv_prefix):DET
+    prefix: $(pv_prefix):$(drv_suffix)
 
 - ADCore.parts.DetectorDriverPart:
     name: DRV
@@ -43,7 +58,8 @@
 
 - scanning.parts.ExposureDeadtimePart:
     name: DEADTIME
-    readout_time: 1e-3
+    readout_time: $(readout_time)
+    frequency_accuracy: $(frequency_accuracy)
 
 - ADCore.blocks.stats_plugin_block:
     mri: $(mri_prefix):STAT