From ba65058a5d16ef91c27843968e856e66b969cc96 Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Wed, 24 Sep 2008 21:05:35 +0000
Subject: [PATCH] Database changes from Tim M. to fix problems with busy record
 hanging

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7676 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/Db/ADBase.template | 62 ++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 41 deletions(-)

diff --git a/ADApp/Db/ADBase.template b/ADApp/Db/ADBase.template
index d99f5a3..296b649 100644
--- a/ADApp/Db/ADBase.template
+++ b/ADApp/Db/ADBase.template
@@ -414,59 +414,39 @@ record(longin, "$(P)$(R)NumImages_RBV")
 #  and stop                                                       #
 ###################################################################
 
-record(bo, "$(P)$(R)Acquire")
-{
+record(bo, "$(P)$(R)Acquire") {
    field(ZNAM, "Done")
    field(ONAM, "Acquire")
-   field(OUT,  "$(P)$(R)AcquireFanout PP MS")
+   field(OUT, "$(P)$(R)DoAcquire PP")
 }
 
-record(dfanout, "$(P)$(R)AcquireFanout")
-{
-   field(OUTA, "$(P)$(R)StartAcquireCalc.PROC PP MS")
-   field(OUTB, "$(P)$(R)DoAcquire PP MS")
+record(calcout, "$(P)$(R)StartAcquireCalc") {
+   field(INPA, "$(P)$(R)Acquire")
+   field(CALC, "A")
+   field(OUT, "$(P)$(R)AcquireBusy PP MS")
+   field(OOPT, "Every Time")
 }
 
-record(calcout, "$(P)$(R)StartAcquireCalc")
-{
-    field(INPA, "$(P)$(R)Acquire")
-    field(CALC, "A")
-    field(OUT,  "$(P)$(R)AcquireBusy PP MS")
-    field(OOPT, "Transition To Non-zero")
+record(busy, "$(P)$(R)AcquireBusy") {
 }
 
-record(busy, "$(P)$(R)AcquireBusy")
-{
-}
-
-record(longout, "$(P)$(R)DoAcquire")
-{
+record(longout, "$(P)$(R)DoAcquire") {
    field(DTYP, "asynInt32")
-   field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))ACQUIRE")
-}
+   field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))ACQUIRE")
+   field(FLNK, "$(P)$(R)StartAcquireCalc") }
 
-record(longin, "$(P)$(R)Acquire_RBV")
-{
+record(longin, "$(P)$(R)Acquire_RBV") {
    field(PINI, "1")
-    field(DTYP, "asynInt32")
-    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))ACQUIRE")
-    field(SCAN, "I/O Intr")
-    field(FLNK, "$(P)$(R)AcquireDoneCalc")
-}
+   field(DTYP, "asynInt32")
+   field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))ACQUIRE")
+   field(SCAN, "I/O Intr")
+   field(FLNK, "$(P)$(R)AcquireDoneCalc") }
 
-record(calcout, "$(P)$(R)AcquireDoneCalc")
-{
-    field(INPA, "$(P)$(R)Acquire_RBV")
-    field(CALC, "A")
-    field(OUT,  "$(P)$(R)AcquireDoneFanout PP MS")
-    field(OOPT, "Transition To Zero")
-}
-
-record(dfanout, "$(P)$(R)AcquireDoneFanout")
-{
-   field(VAL, "0")
-   field(OUTA, "$(P)$(R)Acquire CA MS")
-   field(OUTB, "$(P)$(R)AcquireBusy CA MS")
+record(calcout, "$(P)$(R)AcquireDoneCalc") {
+   field(INPA, "$(P)$(R)Acquire_RBV")
+   field(CALC, "A")
+   field(OUT, "$(P)$(R)Acquire CA")
+   field(OOPT, "Transition To Zero")
 }
 
 ###################################################################