From 7c83d0a76b19113cbacbdc279ff867f4d929b071 Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Wed, 30 Nov 2011 17:01:53 +0000
Subject: [PATCH] Improved support for offset and gain corrections; made
 AcquireGain and AcquireOffset be busy records so clients can wait; added
 currentOffsetFrame and currentGainFrame for progress indicator

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14168 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/Db/PerkinElmer.template | 45 +++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/ADApp/Db/PerkinElmer.template b/ADApp/Db/PerkinElmer.template
index 8deb594..44e2eb5 100755
--- a/ADApp/Db/PerkinElmer.template
+++ b/ADApp/Db/PerkinElmer.template
@@ -45,10 +45,16 @@ record(mbbi, "$(P)$(R)PEStatus_RBV")
    field(TWSV, "MAJOR")
 }
 
-record(longout, "$(P)$(R)PEAcquireOffset")
+record(busy, "$(P)$(R)PEAcquireOffset")
 {
    field(DTYP, "asynInt32")
    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))PE_ACQUIRE_OFFSET")
+   field(ZNAM, "Done")
+   field(ONAM, "Acquire")
+   field(ZNAM, "Done")
+   field(ZSV,  "NO_ALARM")
+   field(ONAM, "Acquire")
+   field(OSV,  "MINOR")
 }
 
 record(longout, "$(P)$(R)PENumOffsetFrames")
@@ -60,6 +66,13 @@ record(longout, "$(P)$(R)PENumOffsetFrames")
    field(HOPR, "500")
 }
 
+record(longin, "$(P)$(R)PECurrentOffsetFrame")
+{
+   field(DTYP, "asynInt32")
+   field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))PE_CURRENT_OFFSET_FRAME")
+   field(SCAN, "I/O Intr")
+}
+
 record(mbbi, "$(P)$(R)PEOffsetAvailable")
 {
    field(SCAN, "I/O Intr")
@@ -73,21 +86,23 @@ record(mbbi, "$(P)$(R)PEOffsetAvailable")
    field(ONSV, "NO_ALARM")
 }
 
-record(mbbo, "$(P)$(R)PEUseOffset")
+record(bo, "$(P)$(R)PEUseOffset")
 {
    field(PINI, "YES")
    field(DTYP, "asynInt32")
    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))PE_USE_OFFSET")
-   field(ZRST, "Off")
-   field(ZRVL, "0")
-   field(ONST, "On")
-   field(ONVL, "1")
+   field(ZNAM, "Disable")
+   field(ONAM, "Enable")
 }
 
-record(longout, "$(P)$(R)PEAcquireGain")
+record(busy, "$(P)$(R)PEAcquireGain")
 {
    field(DTYP, "asynInt32")
    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))PE_ACQUIRE_GAIN")
+   field(ZNAM, "Done")
+   field(ZSV,  "NO_ALARM")
+   field(ONAM, "Acquire")
+   field(OSV,  "MINOR")
 }
 
 record(mbbi, "$(P)$(R)PEGainAvailable")
@@ -125,15 +140,21 @@ record(longout, "$(P)$(R)PENumGainFrames")
    field(HOPR, "500")
 }
 
-record(mbbo, "$(P)$(R)PEUseGain")
+record(longin, "$(P)$(R)PECurrentGainFrame")
+{
+   field(DTYP, "asynInt32")
+   field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))PE_CURRENT_GAIN_FRAME")
+   field(SCAN, "I/O Intr")
+}
+
+
+record(bo, "$(P)$(R)PEUseGain")
 {
    field(PINI, "YES")
    field(DTYP, "asynInt32")
    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))PE_USE_GAIN")
-   field(ZRST, "Off")
-   field(ZRVL, "0")
-   field(ONST, "On")
-   field(ONVL, "1")
+   field(ZNAM, "Disable")
+   field(ONAM, "Enable")
 }