From 58534153f393bc3f838dcec41cdd8319a1dbf810 Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Fri, 18 Apr 2008 22:14:53 +0000
Subject: [PATCH] Changed image to array in many places

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7087 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/Db/NDFile.template | 93 +++++++++++-----------------------------
 1 file changed, 25 insertions(+), 68 deletions(-)

diff --git a/ADApp/Db/NDFile.template b/ADApp/Db/NDFile.template
index 4a6ed08..8992dcd 100644
--- a/ADApp/Db/NDFile.template
+++ b/ADApp/Db/NDFile.template
@@ -1,37 +1,37 @@
-# Database for ADFile driver, which saves files for area detector data.
+# Database for NDFile driver, which saves files for NDArray data.
 # Mark Rivers
 # April 7, 2008
 
 ###################################################################
 #  These records control the connection of the server to          #
-#  an image port and address                                      #
+#  an NDArray port and address                                      #
 ###################################################################
-# Image port name
-record(stringout, "$(P)$(F)ImagePort")
+# NDArray port name
+record(stringout, "$(P)$(F)NDArrayPort")
 {
     field(DTYP, "asynOctetWrite")
-    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))IMAGE_PORT")
+    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))NDARRAY_PORT")
 }
 
-record(stringin, "$(P)$(F)ImagePort_RBV")
+record(stringin, "$(P)$(F)NDArrayPort_RBV")
 {
     field(PINI, "1")
     field(DTYP, "asynOctetRead")
-    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))IMAGE_PORT")
+    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))NDARRAY_PORT")
     field(SCAN, "I/O Intr")
 }
 
-record(longout, "$(P)$(F)ImageAddress")
+record(longout, "$(P)$(F)NDArrayAddress")
 {
     field(DTYP, "asynInt32")
-    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))IMAGE_ADDR")
+    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))NDArray_ADDR")
 }
 
-record(longin, "$(P)$(F)ImageAddress_RBV")
+record(longin, "$(P)$(F)NDArrayAddress_RBV")
 {
     field(PINI, "1")
     field(DTYP, "asynInt32")
-    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))IMAGE_ADDR")
+    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))NDArray_ADDR")
     field(SCAN, "I/O Intr")
 }
 
@@ -74,7 +74,7 @@ record(mbbo, "$(P)$(F)BlockingCallbacks")
     field(ONVL, "1")
 }
 
-# Image posting flag
+# Array posting flag
 record(mbbi, "$(P)$(F)BlockingCallbacks_RBV")
 {
     field(PINI, "1")
@@ -89,88 +89,45 @@ record(mbbi, "$(P)$(F)BlockingCallbacks_RBV")
 
 
 ###################################################################
-#  These records are the image size and data type                 #
+#  These records provide statistics on array callbacks and        #
+#  array callback rates                                           # 
 ###################################################################
-record(longin, "$(P)$(F)ImageSizeX_RBV")
-{
-   field(PINI, "1")
-   field(DTYP, "asynInt32")
-   field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))IMAGE_SIZE_X")
-   field(SCAN, "I/O Intr")
-}
-
-record(longin, "$(P)$(F)ImageSizeY_RBV")
-{
-   field(PINI, "1")
-   field(DTYP, "asynInt32")
-   field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))IMAGE_SIZE_Y")
-   field(SCAN, "I/O Intr")
-}
-
-record(mbbi, "$(P)$(F)DataType_RBV")
-{
-   field(PINI, "1")
-   field(DTYP, "asynInt32")
-   field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))DATA_TYPE")
-   field(ZRST, "Int8")
-   field(ZRVL, "0")
-   field(ONST, "UInt8")
-   field(ONVL, "1")
-   field(TWST, "Int16")
-   field(TWVL, "2")
-   field(THST, "UInt16")
-   field(THVL, "3")
-   field(FRST, "Int32")
-   field(FRVL, "4")
-   field(FVST, "UInt32")
-   field(FVVL, "5")
-   field(SXST, "Float32")
-   field(SXVL, "6")
-   field(SVST, "Float64")
-   field(SVVL, "7")
-   field(SCAN, "I/O Intr")
-}
-
-###################################################################
-#  These records provide statistics on image callbacks and        #
-#  image callback rates                                           # 
-###################################################################
-record(longout, "$(P)$(F)ImageCounter")
+record(longout, "$(P)$(F)ArrayCounter")
 {
     field(DTYP, "asynInt32")
-    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))IMAGE_COUNTER")
+    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))ARRAY_COUNTER")
 }
 
-record(longin, "$(P)$(F)ImageCounter_RBV")
+record(longin, "$(P)$(F)ArrayCounter_RBV")
 {
     field(PINI, "1")
     field(DTYP, "asynInt32")
-    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))IMAGE_COUNTER")
+    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))ARRAY_COUNTER")
     field(SCAN, "I/O Intr")
 }
 
 # This record needs work, because B should reflect the time since last processed
-record(calc, "$(P)$(F)ImageRate_RBV")
+record(calc, "$(P)$(F)ArrayRate_RBV")
 {
-    field(INPA, "$(P)$(F)ImageRate_RBV.B NPP NMS")  # Previous counter value
-    field(INPB, "$(P)$(F)ImageCounter_RBV NPP NMS") # Current counter value
+    field(INPA, "$(P)$(F)ArrayRate_RBV.B NPP NMS")  # Previous counter value
+    field(INPB, "$(P)$(F)ArrayCounter_RBV NPP NMS") # Current counter value
     field(INPC, "1.0")                              # Delta time, needs work
     field(CALC, "(B-A)/C")
     field(PREC, "1")
     field(SCAN, "1 second")
 }
 
-record(longout, "$(P)$(F)DroppedImages")
+record(longout, "$(P)$(F)DroppedArrays")
 {
     field(DTYP, "asynInt32")
-    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))DROPPED_IMAGES")
+    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))DROPPED_ARRAYS")
 }
 
-record(longin, "$(P)$(F)DroppedImages_RBV")
+record(longin, "$(P)$(F)DroppedArrays_RBV")
 {
     field(PINI, "1")
     field(DTYP, "asynInt32")
-    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))DROPPED_IMAGES")
+    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))DROPPED_ARRAYS")
     field(SCAN, "I/O Intr")
 }