NDPluginStats time series now uses NDPluginTimeSeries

ADApp/Db/NDStats.template

@@ -390,64 +390,10 @@ record(ai, "$(P)$(R)Orientation_RBV")
 ###################################################################
 #  These records control time series                              #
 ###################################################################
-record(mbbo, "$(P)$(R)TSControl")
-{
-   field(DTYP, "asynInt32")
-   field(OUT,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_CONTROL")
-   field(ZRVL, "0")
-   field(ZRST, "Erase/Start")
-   field(ONVL, "1")
-   field(ONST, "Start")
-   field(TWVL, "2")
-   field(TWST, "Stop")
-   field(THVL, "3")
-   field(THST, "Read") 
-}
-
-# This record periodically pokes the TSControl record with 3 to read the time series
-# but only when TSAcquiring = Acquiring
-record(longout, "$(P)$(R)TSRead")
-{
-   field(SDIS, "$(P)$(R)TSAcquiring NPP NMS")
-   field(DISV, "0")
-   field(OUT,  "$(P)$(R)TSControl PP MS")
-   field(VAL,  "3")
-   field(SCAN, "1 second")
-   info(autosaveFields, "SCAN")
-}
-
-record(longout, "$(P)$(R)TSNumPoints")
-{
-   field(PINI, "YES")
-   field(DTYP, "asynInt32")
-   field(OUT,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_NUM_POINTS")
-   field(VAL,  "$(NCHANS)")
-   field(DRVH, "$(NCHANS)")
-   info(autosaveFields, "VAL")
-}
-
-record(longin, "$(P)$(R)TSCurrentPoint")
-{
-   field(DTYP, "asynInt32")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_CURRENT_POINT")
-   field(SCAN, "I/O Intr")
-}
-
-record(bi, "$(P)$(R)TSAcquiring")
-{
-   field(DTYP, "asynInt32")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_ACQUIRING")
-   field(ZNAM, "Done")
-   field(ONAM, "Acquiring")
-   field(ZSV,  "NO_ALARM")
-   field(OSV,  "MINOR")
-   field(SCAN, "I/O Intr")
-}
-
 record(waveform, "$(P)$(R)TSMinValue")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_MIN_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),0,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -456,7 +402,7 @@ record(waveform, "$(P)$(R)TSMinValue")
 record(waveform, "$(P)$(R)TSMinX")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_MIN_X")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),1,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -465,7 +411,7 @@ record(waveform, "$(P)$(R)TSMinX")
 record(waveform, "$(P)$(R)TSMinY")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_MIN_Y")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),2,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -474,7 +420,7 @@ record(waveform, "$(P)$(R)TSMinY")
 record(waveform, "$(P)$(R)TSMaxValue")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_MAX_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),3,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -483,7 +429,7 @@ record(waveform, "$(P)$(R)TSMaxValue")
 record(waveform, "$(P)$(R)TSMaxX")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_MAX_X")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),4,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -492,7 +438,7 @@ record(waveform, "$(P)$(R)TSMaxX")
 record(waveform, "$(P)$(R)TSMaxY")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_MAX_Y")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),5,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -501,7 +447,7 @@ record(waveform, "$(P)$(R)TSMaxY")
 record(waveform, "$(P)$(R)TSMeanValue")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_MEAN_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),6,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -510,7 +456,7 @@ record(waveform, "$(P)$(R)TSMeanValue")
 record(waveform, "$(P)$(R)TSSigma")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_SIGMA_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),7,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -519,7 +465,7 @@ record(waveform, "$(P)$(R)TSSigma")
 record(waveform, "$(P)$(R)TSTotal")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_TOTAL")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),8,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -528,7 +474,7 @@ record(waveform, "$(P)$(R)TSTotal")
 record(waveform, "$(P)$(R)TSNet")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_NET")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),9,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -537,7 +483,7 @@ record(waveform, "$(P)$(R)TSNet")
 record(waveform, "$(P)$(R)TSCentroidTotal")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_CENTROIDTOTAL_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),10,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -546,7 +492,7 @@ record(waveform, "$(P)$(R)TSCentroidTotal")
 record(waveform, "$(P)$(R)TSCentroidX")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_CENTROIDX_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),11,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -555,7 +501,7 @@ record(waveform, "$(P)$(R)TSCentroidX")
 record(waveform, "$(P)$(R)TSCentroidY")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_CENTROIDY_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),12,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -564,7 +510,7 @@ record(waveform, "$(P)$(R)TSCentroidY")
 record(waveform, "$(P)$(R)TSSigmaX")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_SIGMAX_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),13,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -573,7 +519,7 @@ record(waveform, "$(P)$(R)TSSigmaX")
 record(waveform, "$(P)$(R)TSSigmaY")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_SIGMAY_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),14,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -582,7 +528,7 @@ record(waveform, "$(P)$(R)TSSigmaY")
 record(waveform, "$(P)$(R)TSSigmaXY")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_SIGMAXY_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),15,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -591,7 +537,7 @@ record(waveform, "$(P)$(R)TSSigmaXY")
 record(waveform, "$(P)$(R)TSSkewX")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_SKEWX_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),16,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -600,7 +546,7 @@ record(waveform, "$(P)$(R)TSSkewX")
 record(waveform, "$(P)$(R)TSSkewY")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_SKEWY_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),17,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -609,7 +555,7 @@ record(waveform, "$(P)$(R)TSSkewY")
 record(waveform, "$(P)$(R)TSKurtosisX")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_KURTOSISX_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),18,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -618,7 +564,7 @@ record(waveform, "$(P)$(R)TSKurtosisX")
 record(waveform, "$(P)$(R)TSKurtosisY")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_KURTOSISY_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),19,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -627,7 +573,7 @@ record(waveform, "$(P)$(R)TSKurtosisY")
 record(waveform, "$(P)$(R)TSEccentricity")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_ECCENTRICITY_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),20,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -636,7 +582,7 @@ record(waveform, "$(P)$(R)TSEccentricity")
 record(waveform, "$(P)$(R)TSOrientation")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_ORIENTATION_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),21,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")
@@ -645,7 +591,7 @@ record(waveform, "$(P)$(R)TSOrientation")
 record(waveform, "$(P)$(R)TSTimestamp")
 {
    field(DTYP, "asynFloat64ArrayIn")
-   field(INP,  "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))TS_TIMESTAMP_VALUE")
+   field(INP,  "@asyn($(TS_PORT=$(PORT)_TS),22,$(TIMEOUT=1))TS_TIME_SERIES")
    field(NELM, "$(NCHANS)")
    field(FTVL, "DOUBLE")
    field(SCAN, "I/O Intr")

ADApp/Db/NDStats_settings.req

@@ -11,6 +11,7 @@ $(P)$(R)HistMin
 $(P)$(R)HistMax
 $(P)$(R)TSNumPoints
 $(P)$(R)TSRead.SCAN
+file "NDTimeSeries_settings.req", P=$(P), R=$(R)TS:
 file "NDPluginBase_settings.req", P=$(P), R=$(R)
 file "sseq_settings.req", P=$(P), S=$(R)Reset
 file "sseq_settings.req", P=$(P), S=$(R)Reset1