Internal enable fix

RELEASE.md

@@ -9,7 +9,7 @@ https://github.com/areaDetector/ADEiger/tags
 
 Release Notes
 =============
-R3-6 (June XXX, 2025)
+R3-6 (January XXX, 2026)
 ----
 * Added support for the Stream2 interface.  Stream2 supports multiple thresholds.
   - Added new StreamVersion record to select the Stream or Stream2 interface.
@@ -38,9 +38,15 @@ R3-6 (June XXX, 2025)
         For 16-bit data this would be a problem when there are over 32K counts per pixel.
         Since the maximum count rate is about 2e6 counts/s there should never be more than 20K counts in 0.01 seconds,
         and there should thus be no problem.
-* BEFORE RELEASE. Check the function of InternalEnable mode to see if it works now.
-  The documentation said it was flaky in firmware 1.5.0, so it probably works now and the
-  documentation should be fixed in several places.
+* Fixed issues with Internal Enable trigger mode.
+  - This mode was broken completely starting with R3-4 in June 2022.
+    It was always sending 0 as the TriggerExposure value due to a bug introduced in the driver.
+  - The TriggerExposure value was only used in Internal Enable mode.
+    This is confusing, since AcquireTime is used for all other modes.
+  - The TriggerExposure record was eliminated, and AcquireTime is now used in Internal Enable mode.
+    - This breaks backwards compatibility, but since Internal Enable mode has not worked at all
+      for 3.5 years, it is likely to have a small impact.
+    - eigerBase.template, the OPI screens, and the Sphinx documentation have been modified to remove this record.
 
 R3-5 (May 14, 2025)
 ----

docs/ADEiger/eiger.rst

@@ -27,9 +27,6 @@ so no library from Dectris is required. The images can pulled from the detector
 as HDF5 files, as a ZeroMQ stream or both.
 The files can be both saved to disk and passed to the areaDetector pipeline at the same time.
 
-All trigger modes are supported, although Internal Enable mode seems
-to not be working properly. See Known Issues.
-
 This driver inherits from `ADDriver`_. It implements many of the
 parameters in `asynNDArrayDriver`_ and in `ADDriver`_. It
 also implements a number of parameters that are specific to the Eiger
@@ -121,9 +118,8 @@ NumImages is set to 1 temporarily during the acquisition.
 
 Triggers for **Internal Enable** mode are sent by processing the
 Trigger PV. The exposure for each individual image is given by the
-TriggerExposure PV and can change between triggers in the same
-acquisition. This mode is experimental as of firmware 1.5.0. See Known
-Issues.  CHECK THIS.
+AcquireTime PV and can change between triggers in the same
+acquisition.
 
 Manual Trigger
 --------------
@@ -132,9 +128,7 @@ On **Internal Series** and **Internal Enable** modes, if the
 ManualTrigger PV is set to **Yes**, the triggers are not auto generated by
 the driver. Instead, they are sent by processing the Trigger PV. On
 **Internal Enable** mode the trigger carries an exposure value that
-can change for each trigger, which is set by the TriggerExposure PV.
-Note that the **Internal Enable** mode is experimental as of firmware
-1.5.0, see Known Issues.  CHECK THIS.
+can change for each trigger, which is set by the AcquireTime PV.
 
 Data Acquisition
 ----------------
@@ -524,10 +518,6 @@ Trigger Setup
     - Software trigger to be used on modes Internal Series and Internal Enable when ManualTrigger is set
     - Trigger
     - ao
-  * - N.A.
-    - Exposure to be used with the triggers on the Internal Enable trigger mode
-    - TriggerExposure, TriggerExposure_RBV
-    - ao, ai
   * - detector/config/ntrigger
     - Number of triggers for the acquisition
     - NumTriggers, NumTriggers_RBV
@@ -995,10 +985,3 @@ A few status parameters are read every time the ReadStatus PV is
 processed. A high rate polling causes issues, sometimes causing the
 detector to hang when, in conjunction, a parameter is set to an
 invalid value.
-
-Internal Enable Mode
-~~~~~~~~~~~~~~~~~~~~
-
-The Internal Enable mode is marked as experimental by Dectris. At the
-moment it is very flaky (firmware 1.5.0) and often doesn't generate
-all the files it is supposed to.

eigerApp/Db/eigerBase.template

@@ -243,27 +243,6 @@ record(bi,"$(P)$(R)ManualTrigger_RBV") {
     field(SCAN, "I/O Intr")
 }
 
-# Exposure for triggers on INTE mode
-record(ao, "$(P)$(R)TriggerExposure")
-{
-    field(PINI, "YES")
-    field(DTYP, "asynFloat64")
-    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))TRIGGER_EXPOSURE")
-    field(DESC, "Trigger Exposure for INTE mode")
-    field(EGU,  "s")
-    field(PREC, "3")
-}
-
-record(ai, "$(P)$(R)TriggerExposure_RBV")
-{
-    field(DTYP, "asynFloat64")
-    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))TRIGGER_EXPOSURE")
-    field(DESC, "Trigger Exposure for INTE mode")
-    field(EGU,  "s")
-    field(PREC, "3")
-    field(SCAN, "I/O Intr")
-}
-
 # Trigger the detector
 record(ao, "$(P)$(R)Trigger") {
     field(DTYP, "asynInt32")

eigerApp/Db/eigerBase_settings.req

@@ -12,7 +12,6 @@ $(P)$(R)ThresholdEnergy
 #################
 $(P)$(R)NumTriggers
 $(P)$(R)ManualTrigger
-$(P)$(R)TriggerExposure
 
 #################
 # Readout Setup #

eigerApp/op/adl/eiger1Trigger.adl

@@ -1,14 +1,14 @@
 
 file {
-	name="/home/epics/devel/areaDetector/ADEiger/eigerApp/op/adl/eiger1Trigger.adl"
-	version=030109
+	name="/home/epics/support/areaDetector-3-13/ADEiger/eigerApp/op/adl/eiger1Trigger.adl"
+	version=030117
 }
 display {
 	object {
 		x=1151
 		y=186
 		width=350
-		height=155
+		height=130
 	}
 	clr=14
 	bclr=4
@@ -92,7 +92,7 @@ rectangle {
 		x=0
 		y=0
 		width=350
-		height=155
+		height=130
 	}
 	"basic attribute" {
 		clr=14
@@ -165,55 +165,10 @@ menu {
 	limits {
 	}
 }
-text {
-	object {
-		x=10
-		y=55
-		width=140
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Trig. Exposure"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=155
-		y=55
-		width=100
-		height=20
-	}
-	control {
-		chan="$(P)$(R)TriggerExposure"
-		clr=14
-		bclr=51
-	}
-	format="exponential"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=260
-		y=56
-		width=80
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)TriggerExposure_RBV"
-		clr=54
-		bclr=4
-	}
-	format="exponential"
-	limits {
-	}
-}
 text {
 	object {
 		x=30
-		y=80
+		y=55
 		width=120
 		height=20
 	}
@@ -226,7 +181,7 @@ text {
 menu {
 	object {
 		x=155
-		y=80
+		y=55
 		width=100
 		height=20
 	}
@@ -239,7 +194,7 @@ menu {
 "text update" {
 	object {
 		x=260
-		y=81
+		y=56
 		width=80
 		height=18
 	}
@@ -256,7 +211,7 @@ menu {
 text {
 	object {
 		x=50
-		y=130
+		y=105
 		width=100
 		height=20
 	}
@@ -269,7 +224,7 @@ text {
 "text update" {
 	object {
 		x=260
-		y=131
+		y=106
 		width=80
 		height=18
 	}
@@ -284,7 +239,7 @@ text {
 "text entry" {
 	object {
 		x=155
-		y=130
+		y=105
 		width=100
 		height=20
 	}
@@ -299,7 +254,7 @@ text {
 "message button" {
 	object {
 		x=155
-		y=105
+		y=80
 		width=100
 		height=20
 	}
@@ -314,7 +269,7 @@ text {
 text {
 	object {
 		x=10
-		y=105
+		y=80
 		width=140
 		height=20
 	}

eigerApp/op/adl/eiger2Detector.adl

@@ -1,6 +1,6 @@
 
 file {
-	name="/home/epics/devel/areaDetector/ADEiger/eigerApp/op/adl/eiger2Detector.adl"
+	name="/home/epics/support/areaDetector/ADEiger/eigerApp/op/adl/eiger2Detector.adl"
 	version=030117
 }
 display {
@@ -234,7 +234,7 @@ composite {
 composite {
 	object {
 		x=360
-		y=585
+		y=560
 		width=350
 		height=380
 	}
@@ -246,7 +246,7 @@ composite {
 		x=360
 		y=375
 		width=350
-		height=205
+		height=180
 	}
 	"composite name"=""
 	"composite file"="eiger2Trigger.adl"