BugID: 810

Added datapoints for Cabinet and SubRack.

MAC/Deployment/data/PVSS/Cabinet.dpdef

+front.door			bool
+front.fan			bool
+front.temperature	float
+back.door			bool
+back.fan			bool
+back.temperature	float

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

MAC/Deployment/data/PVSS/SubRack.dpdef

+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

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;
 			}
 		}