From 1e1ddcd384faeb8797c50bfb5058edccee354dcf Mon Sep 17 00:00:00 2001
From: hadaq <hadaq>
Date: Wed, 22 Feb 2012 10:09:48 +0000
Subject: [PATCH] - Makefile: cleanup - totalevtstat.db: added alias names -
cleanup
---
ebctrl/ioc/ebctrlApp/Db/Makefile | 6 ++----
ebctrl/ioc/ebctrlApp/Db/totalevtstat.db | 9 +++++++++
ebctrl/ioc/ebctrlApp/Db/user.substitutions | 12 ------------
ebctrl/ioc/ebctrlApp/Db/userHost.substitutions | 12 ------------
4 files changed, 11 insertions(+), 28 deletions(-)
delete mode 100644 ebctrl/ioc/ebctrlApp/Db/user.substitutions
delete mode 100644 ebctrl/ioc/ebctrlApp/Db/userHost.substitutions
diff --git a/ebctrl/ioc/ebctrlApp/Db/Makefile b/ebctrl/ioc/ebctrlApp/Db/Makefile
index 521404e..bcbed38 100644
--- a/ebctrl/ioc/ebctrlApp/Db/Makefile
+++ b/ebctrl/ioc/ebctrlApp/Db/Makefile
@@ -11,8 +11,8 @@ include $(TOP)/configure/CONFIG
# Create and install (or just install)
# databases, templates, substitutions like this
DB += evtbuild.db
-DB += evtbuild_master.db
-DB += evtbuild_slave.db
+#DB += evtbuild_master.db
+#DB += evtbuild_slave.db
DB += netmem.db
DB += genrunid.db
DB += errbit1.db
@@ -26,8 +26,6 @@ DB += trigtype.db
DB += cpu.db
DB += totalevtstat.db
DB += daqmon.db
-DB += user.substitutions
-DB += userHost.substitutions
#----------------------------------------------------
# If <anyname>.db template is not named <anyname>*.template add
diff --git a/ebctrl/ioc/ebctrlApp/Db/totalevtstat.db b/ebctrl/ioc/ebctrlApp/Db/totalevtstat.db
index c4dfd9d..dd6f43a 100644
--- a/ebctrl/ioc/ebctrlApp/Db/totalevtstat.db
+++ b/ebctrl/ioc/ebctrlApp/Db/totalevtstat.db
@@ -70,6 +70,7 @@ record(genSub,"HAD:eb:totalEvtsCompASub") {
record(longout, "HAD:eb:totalEvtsComp")
{
+ alias("HAD:eb:evtComp")
field(DESC, "Addr")
field(SCAN,"Passive")
field(OUT, "0")
@@ -147,6 +148,7 @@ record(genSub,"HAD:eb:totalErrBitStatASub") {
record(longout, "HAD:eb:totalErrBitStat")
{
+ alias("HAD:eb:errBitStat")
field(DESC, "Addr")
field(SCAN,"Passive")
field(OUT, "0")
@@ -224,6 +226,7 @@ record(genSub,"HAD:eb:totalEvtCRateASub") {
record(longout, "HAD:eb:totalEvtCRate")
{
+ alias("HAD:eb:evtCRate")
field(DESC, "Addr")
field(SCAN,"Passive")
field(OUT, "0")
@@ -301,6 +304,7 @@ record(genSub,"HAD:eb:totalByteWritASub") {
record(longout, "HAD:eb:totalByteWrit")
{
+ alias("HAD:eb:byteWrit")
field(DESC, "Addr")
field(SCAN,"Passive")
field(OUT, "0")
@@ -378,6 +382,7 @@ record(genSub,"HAD:eb:totalByteWRateASub") {
record(longout, "HAD:eb:totalByteWRate")
{
+ alias("HAD:eb:byteWRate")
field(DESC, "Addr")
field(SCAN,"Passive")
field(OUT, "0")
@@ -455,6 +460,7 @@ record(genSub,"HAD:eb:totalEvtDiscASub") {
record(longout, "HAD:eb:totalEvtDisc")
{
+ alias("HAD:eb:evtDisc")
field(DESC, "Addr")
field(SCAN,"Passive")
field(OUT, "0")
@@ -532,6 +538,7 @@ record(genSub,"HAD:eb:totalEvtDRateASub") {
record(longout, "HAD:eb:totalEvtDRate")
{
+ alias("HAD:eb:evtDRate")
field(DESC, "Addr")
field(SCAN,"Passive")
field(OUT, "0")
@@ -609,6 +616,7 @@ record(genSub,"HAD:eb:totalEvtTagErrASub") {
record(longout, "HAD:eb:totalEvtTagErr")
{
+ alias("HAD:eb:evtTagErr")
field(DESC, "Addr")
field(SCAN,"Passive")
field(OUT, "0")
@@ -686,6 +694,7 @@ record(genSub,"HAD:eb:totalEvtDataErrASub") {
record(longout, "HAD:eb:totalEvtDataErr")
{
+ alias("HAD:eb:evtDataErr")
field(DESC, "Addr")
field(SCAN,"Passive")
field(OUT, "0")
diff --git a/ebctrl/ioc/ebctrlApp/Db/user.substitutions b/ebctrl/ioc/ebctrlApp/Db/user.substitutions
deleted file mode 100644
index aea0cbf..0000000
--- a/ebctrl/ioc/ebctrlApp/Db/user.substitutions
+++ /dev/null
@@ -1,12 +0,0 @@
-# Example substitutions file
-
-file "db/dbExample1.db" {
- { user = "scs" }
-}
-
-file db/dbExample2.db {
- pattern { user, no, scan }
- { "scs", 1, "1 second" }
- { "scs", 2, "2 second" }
- { "scs", 3, "5 second" }
-}
diff --git a/ebctrl/ioc/ebctrlApp/Db/userHost.substitutions b/ebctrl/ioc/ebctrlApp/Db/userHost.substitutions
deleted file mode 100644
index b0e3006..0000000
--- a/ebctrl/ioc/ebctrlApp/Db/userHost.substitutions
+++ /dev/null
@@ -1,12 +0,0 @@
-# Example substitutions file
-
-file "db/dbExample1.db" {
- { user = "scsHost" }
-}
-
-file db/dbExample2.db {
- pattern { user, no, scan }
- { "scsHost", 1, "1 second" }
- { "scsHost", 2, "2 second" }
- { "scsHost", 3, "5 second" }
-}
--
2.43.0