From 1118c6e419cf3f1016755f0a54e67cfaa8dfabc6 Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Sat, 26 Apr 2008 03:24:05 +0000
Subject: [PATCH] Removed records belonging to NDPluginBase; changed macro from
 F to R for consistency

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7136 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/Db/NDFile.template     | 195 +++++------------------------------
 ADApp/Db/NDFile_settings.req |  19 ++--
 2 files changed, 36 insertions(+), 178 deletions(-)

diff --git a/ADApp/Db/NDFile.template b/ADApp/Db/NDFile.template
index 7845bcb..a9b70a8 100644
--- a/ADApp/Db/NDFile.template
+++ b/ADApp/Db/NDFile.template
@@ -2,153 +2,12 @@
 # Mark Rivers
 # April 7, 2008
 
-###################################################################
-#  These records control the connection of the server to          #
-#  an NDArray port and address                                    #
-###################################################################
-# NDArray port name
-record(stringout, "$(P)$(F)NDArrayPort")
-{
-    field(DTYP, "asynOctetWrite")
-    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))NDARRAY_PORT")
-}
-
-record(stringin, "$(P)$(F)NDArrayPort_RBV")
-{
-    field(PINI, "1")
-    field(DTYP, "asynOctetRead")
-    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))NDARRAY_PORT")
-    field(SCAN, "I/O Intr")
-}
-
-record(longout, "$(P)$(F)NDArrayAddress")
-{
-    field(DTYP, "asynInt32")
-    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))NDArray_ADDR")
-}
-
-record(longin, "$(P)$(F)NDArrayAddress_RBV")
-{
-    field(PINI, "1")
-    field(DTYP, "asynInt32")
-    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))NDArray_ADDR")
-    field(SCAN, "I/O Intr")
-}
-
-###################################################################
-#  These records control the minimum time between file writes     #
-###################################################################
-
-record(ao, "$(P)$(F)MinWriteTime")
-{
-    field(PINI, "1")
-    field(DTYP, "asynFloat64")
-    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))FILE_MIN_TIME")
-    field(VAL,  "0.0")
-    field(EGU,  "s")
-    field(PREC, "3")
-}
-
-record(ai, "$(P)$(F)MinWriteTime_RBV")
-{
-    field(PINI, "1")
-    field(DTYP, "asynFloat64")
-    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))FILE_MIN_TIME")
-    field(VAL,  "1.0")
-    field(EGU,  "s")
-    field(PREC, "3")
-    field(SCAN, "I/O Intr")
-}
-
-###################################################################
-#  These records control whether callbacks block or not           #
-###################################################################
-record(mbbo, "$(P)$(F)BlockingCallbacks")
-{
-    field(PINI, "1")
-    field(DTYP, "asynInt32")
-    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))BLOCKING_CALLBACKS")
-    field(ZRST, "No")
-    field(ZRVL, "0")
-    field(ONST, "Yes")
-    field(ONVL, "1")
-}
-
-# Array posting flag
-record(mbbi, "$(P)$(F)BlockingCallbacks_RBV")
-{
-#    field(PINI, "1")
-    field(DTYP, "asynInt32")
-    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))BLOCKING_CALLBACKS")
-    field(ZRST, "No")
-    field(ZRVL, "0")
-    field(ONST, "Yes")
-    field(ONVL, "1")
-    field(SCAN, "I/O Intr")
-}
-
-
-###################################################################
-#  These records provide statistics on array callbacks and        #
-#  array callback rates                                           # 
-###################################################################
-record(longout, "$(P)$(F)ArrayCounter")
-{
-    field(DTYP, "asynInt32")
-    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))ARRAY_COUNTER")
-}
-
-record(longin, "$(P)$(F)ArrayCounter_RBV")
-{
-    field(PINI, "1")
-    field(DTYP, "asynInt32")
-    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)ArrayRate_RBV")
-{
-    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)DroppedArrays")
-{
-    field(DTYP, "asynInt32")
-    field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))DROPPED_ARRAYS")
-}
-
-record(longin, "$(P)$(F)DroppedArrays_RBV")
-{
-    field(PINI, "1")
-    field(DTYP, "asynInt32")
-    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))DROPPED_ARRAYS")
-    field(SCAN, "I/O Intr")
-}
-
-
-###################################################################
-#  The asynRecord is used for mainly for trace mask               # 
-###################################################################
- 
-# Set ASYN_TRACEIO_HEX bit by default
-record(asyn,"$(P)$(F)AsynIO")
-{
-    field(PORT, $(PORT))
-    field(TIB2,"1")
-}
-
 ###################################################################
 #  These records control file I/O                                 # 
 ###################################################################
 
 # File path.
-record(waveform, "$(P)$(F)FilePath")
+record(waveform, "$(P)$(R)FilePath")
 {
     field(PINI, "1")
     field(DTYP, "asynOctetWrite")
@@ -157,7 +16,7 @@ record(waveform, "$(P)$(F)FilePath")
     field(NELM, "256")
 }
 
-record(waveform, "$(P)$(F)FilePath_RBV")
+record(waveform, "$(P)$(R)FilePath_RBV")
 {
 #    field(PINI, "1")
     field(DTYP, "asynOctetRead")
@@ -168,7 +27,7 @@ record(waveform, "$(P)$(F)FilePath_RBV")
 }
 
 # Filename
-record(waveform, "$(P)$(F)FileName")
+record(waveform, "$(P)$(R)FileName")
 {
     field(PINI, "1")
     field(DTYP, "asynOctetWrite")
@@ -177,7 +36,7 @@ record(waveform, "$(P)$(F)FileName")
     field(NELM, "256")
 }
 
-record(waveform, "$(P)$(F)FileName_RBV")
+record(waveform, "$(P)$(R)FileName_RBV")
 {
 #    field(PINI, "1")
     field(DTYP, "asynOctetRead")
@@ -188,7 +47,7 @@ record(waveform, "$(P)$(F)FileName_RBV")
 }
 
 # File number
-record(longout, "$(P)$(F)FileNumber")
+record(longout, "$(P)$(R)FileNumber")
 {
     field(PINI, "1")
     field(VAL,  "1")
@@ -196,7 +55,7 @@ record(longout, "$(P)$(F)FileNumber")
     field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))FILE_NUMBER")
 }
 
-record(longin, "$(P)$(F)FileNumber_RBV")
+record(longin, "$(P)$(R)FileNumber_RBV")
 {
 #    field(PINI, "1")
     field(DTYP, "asynInt32")
@@ -204,15 +63,15 @@ record(longin, "$(P)$(F)FileNumber_RBV")
     field(SCAN, "I/O Intr")
 }
 
-record(calcout, "$(P)$(F)FileNumber_Sync")
+record(calcout, "$(P)$(R)FileNumber_Sync")
 {
-    field(INPA, "$(P)$(F)FileNumber_RBV CP")
+    field(INPA, "$(P)$(R)FileNumber_RBV CP")
     field(CALC, "A")
-    field(OUT,  "$(P)$(F)FileNumber PP")
+    field(OUT,  "$(P)$(R)FileNumber PP")
 }
 
 # Autoincrement flag
-record(mbbo, "$(P)$(F)AutoIncrement")
+record(mbbo, "$(P)$(R)AutoIncrement")
 {
     field(PINI, "1")
     field(DTYP, "asynInt32")
@@ -223,7 +82,7 @@ record(mbbo, "$(P)$(F)AutoIncrement")
     field(ONVL, "1")
 }
 
-record(mbbo, "$(P)$(F)AutoIncrement_RBV")
+record(mbbo, "$(P)$(R)AutoIncrement_RBV")
 {
     field(DTYP, "asynInt32")
     field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))AUTO_INCREMENT")
@@ -235,7 +94,7 @@ record(mbbo, "$(P)$(F)AutoIncrement_RBV")
 }
 
 # File template
-record(waveform, "$(P)$(F)FileTemplate")
+record(waveform, "$(P)$(R)FileTemplate")
 {
     field(PINI,  "1")
     field(DTYP, "asynOctetWrite")
@@ -244,7 +103,7 @@ record(waveform, "$(P)$(F)FileTemplate")
     field(NELM, "256")
 }
 
-record(waveform, "$(P)$(F)FileTemplate_RBV")
+record(waveform, "$(P)$(R)FileTemplate_RBV")
 {
     field(PINI,  "1")
     field(DTYP, "asynOctetRead")
@@ -255,7 +114,7 @@ record(waveform, "$(P)$(F)FileTemplate_RBV")
 }
 
 # Full filename, including path
-record(waveform, "$(P)$(F)FullFileName_RBV")
+record(waveform, "$(P)$(R)FullFileName_RBV")
 {
     field(PINI,  "1")
     field(DTYP, "asynOctetRead")
@@ -266,7 +125,7 @@ record(waveform, "$(P)$(F)FullFileName_RBV")
 }
 
 # Autosave flag
-record(mbbo, "$(P)$(F)AutoSave")
+record(mbbo, "$(P)$(R)AutoSave")
 {
     field(PINI, "1")
     field(DTYP, "asynInt32")
@@ -277,7 +136,7 @@ record(mbbo, "$(P)$(F)AutoSave")
     field(ONVL, "1")
 }
 
-record(mbbi, "$(P)$(F)AutoSave_RBV")
+record(mbbi, "$(P)$(R)AutoSave_RBV")
 {
 #    field(PINI, "1")
     field(DTYP, "asynInt32")
@@ -291,21 +150,21 @@ record(mbbi, "$(P)$(F)AutoSave_RBV")
 
 # NOTE: These should be busy records, but wait till we get asynBusy record
 # Write file
-record(longout, "$(P)$(F)WriteFile")
+record(longout, "$(P)$(R)WriteFile")
 {
     field(DTYP, "asynInt32")
     field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))WRITE_FILE")
 }
 
 # Read file
-record(longout, "$(P)$(F)ReadFile")
+record(longout, "$(P)$(R)ReadFile")
 {
     field(DTYP, "asynInt32")
     field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))READ_FILE")
 }
 
 # File data format 
-record(mbbo, "$(P)$(F)FileFormat")
+record(mbbo, "$(P)$(R)FileFormat")
 {
     field(PINI, "1")
     field(DTYP, "asynInt32")
@@ -316,7 +175,7 @@ record(mbbo, "$(P)$(F)FileFormat")
     field(ONVL, "1")
 }
 
-record(mbbi, "$(P)$(F)FileFormat_RBV")
+record(mbbi, "$(P)$(R)FileFormat_RBV")
 {
 #    field(PINI, "1")
     field(DTYP, "asynInt32")
@@ -329,7 +188,7 @@ record(mbbi, "$(P)$(F)FileFormat_RBV")
 }
 
 # File save mode 
-record(mbbo, "$(P)$(F)FileWriteMode")
+record(mbbo, "$(P)$(R)FileWriteMode")
 {
     field(PINI, "1")
     field(DTYP, "asynInt32")
@@ -342,7 +201,7 @@ record(mbbo, "$(P)$(F)FileWriteMode")
     field(TWVL, "2")
 }
 
-record(mbbi, "$(P)$(F)FileWriteMode_RBV")
+record(mbbi, "$(P)$(R)FileWriteMode_RBV")
 {
 #    field(PINI, "1")
     field(DTYP, "asynInt32")
@@ -358,13 +217,13 @@ record(mbbi, "$(P)$(F)FileWriteMode_RBV")
 
 # NOTE: These should be busy records, and no RBV, but wait till we get asynBusy record
 # Capture data
-record(longout, "$(P)$(F)Capture")
+record(longout, "$(P)$(R)Capture")
 {
     field(DTYP, "asynInt32")
     field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))CAPTURE")
 }
 
-record(longin, "$(P)$(F)Capture_RBV")
+record(longin, "$(P)$(R)Capture_RBV")
 {
     field(PINI, "1")
     field(DTYP, "asynInt32")
@@ -372,7 +231,7 @@ record(longin, "$(P)$(F)Capture_RBV")
     field(SCAN, "I/O Intr")
 }
 
-record(longout, "$(P)$(F)NumCapture")
+record(longout, "$(P)$(R)NumCapture")
 {
     field(PINI, "1")
     field(VAL,  "1")
@@ -380,7 +239,7 @@ record(longout, "$(P)$(F)NumCapture")
     field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))NUM_CAPTURE")
 }
 
-record(longin, "$(P)$(F)NumCapture_RBV")
+record(longin, "$(P)$(R)NumCapture_RBV")
 {
 #    field(PINI, "1")
     field(DTYP, "asynInt32")
@@ -388,7 +247,7 @@ record(longin, "$(P)$(F)NumCapture_RBV")
     field(SCAN, "I/O Intr")
 }
 
-record(longin, "$(P)$(F)NumCaptured_RBV")
+record(longin, "$(P)$(R)NumCaptured_RBV")
 {
     field(PINI, "1")
     field(DTYP, "asynInt32")
diff --git a/ADApp/Db/NDFile_settings.req b/ADApp/Db/NDFile_settings.req
index 108c61a..ec5181f 100644
--- a/ADApp/Db/NDFile_settings.req
+++ b/ADApp/Db/NDFile_settings.req
@@ -1,10 +1,9 @@
-$(P)$(F)BlockingCallbacks
-$(P)$(F)FilePath
-$(P)$(F)FileName
-$(P)$(F)FileNumber
-$(P)$(F)AutoIncrement
-$(P)$(F)FileTemplate
-#$(P)$(F)AutoSave
-$(P)$(F)FileFormat
-$(P)$(F)FileWriteMode
-$(P)$(F)NumCapture
+$(P)$(R)FilePath
+$(P)$(R)FileName
+$(P)$(R)FileNumber
+$(P)$(R)AutoIncrement
+$(P)$(R)FileTemplate
+#$(P)$(R)AutoSave
+$(P)$(R)FileFormat
+$(P)$(R)FileWriteMode
+$(P)$(R)NumCapture