From f6c2b52ea0c99a0d5a67936e7ac0b34228cc8c6f Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Tue, 20 Feb 2007 15:00:57 +0000
Subject: [PATCH] BugID: 810 Added datapoints for Cabinet and SubRack.
---
MAC/Deployment/data/PVSS/Cabinet.dpdef | 6 ++++++
MAC/Deployment/data/PVSS/PVSSDataPoints.base | 4 ++--
MAC/Deployment/data/PVSS/SubRack.dpdef | 11 +++++++++++
MAC/Deployment/data/PVSS/create_db_files | 2 +-
4 files changed, 20 insertions(+), 3 deletions(-)
create mode 100644 MAC/Deployment/data/PVSS/Cabinet.dpdef
create mode 100644 MAC/Deployment/data/PVSS/SubRack.dpdef
diff --git a/MAC/Deployment/data/PVSS/Cabinet.dpdef b/MAC/Deployment/data/PVSS/Cabinet.dpdef
new file mode 100644
index 00000000000..34f5fcc9569
--- /dev/null
+++ b/MAC/Deployment/data/PVSS/Cabinet.dpdef
@@ -0,0 +1,6 @@
+front.door bool
+front.fan bool
+front.temperature float
+back.door bool
+back.fan bool
+back.temperature float
diff --git a/MAC/Deployment/data/PVSS/PVSSDataPoints.base b/MAC/Deployment/data/PVSS/PVSSDataPoints.base
index 52417e7cfdc..439eca92367 100644
--- a/MAC/Deployment/data/PVSS/PVSSDataPoints.base
+++ b/MAC/Deployment/data/PVSS/PVSSDataPoints.base
@@ -35,8 +35,8 @@ Station - C O LOFAR_ObsSW_@observation@_@ring@_@station@
#
StnLOFAR - S P LOFAR
StnPIC - S P LOFAR_PIC
-Cabinet - S P LOFAR_PIC_@cabinet@
-SubRack - S P LOFAR_PIC_@cabinet@_@subrack@
+Cabinet CAB S P LOFAR_PIC_@cabinet@
+SubRack SRCK S P LOFAR_PIC_@cabinet@_@subrack@
RSPBoard RSP S P LOFAR_PIC_@cabinet@_@subrack@_@RSPBoard@
RCU RCU S P LOFAR_PIC_@cabinet@_@subrack@_@RSPBoard@_@rcu@
StationClock SCK S P LOFAR_PIC_StationClock
diff --git a/MAC/Deployment/data/PVSS/SubRack.dpdef b/MAC/Deployment/data/PVSS/SubRack.dpdef
new file mode 100644
index 00000000000..613e43744c9
--- /dev/null
+++ b/MAC/Deployment/data/PVSS/SubRack.dpdef
@@ -0,0 +1,11 @@
+SPU.Vhba float
+SPU.Vlba float
+SPU.Vdig float
+SPU.temperature float
+clock.Vfsp float
+clock.Vclock float
+clock.version string
+clock.freq int
+clock.lock160 bool
+clock.lock200 bool
+clock.temperature float
diff --git a/MAC/Deployment/data/PVSS/create_db_files b/MAC/Deployment/data/PVSS/create_db_files
index 14c0707acfd..45e9bb6ba10 100755
--- a/MAC/Deployment/data/PVSS/create_db_files
+++ b/MAC/Deployment/data/PVSS/create_db_files
@@ -210,7 +210,7 @@ substitute_Cabinet_SubRack_RSPBoard_RCU()
board=int(rcu/8)
cabinet=int(board/8)
subrack=int(board/4)
- sub("@cabinet@_@subrack@_@RSPBoard@_@rcu@", "Cabinet"cabinet"_Subrack"subrack"_RSPBoard"board"_rcu"rcu, dpname)
+ sub("@cabinet@_@subrack@_@RSPBoard@_@rcu@", "Cabinet"cabinet"_Subrack"subrack"_RSPBoard"board"_RCU"rcu, dpname)
print dpname" "$2;
}
}
--
GitLab