diff --git a/.gitattributes b/.gitattributes
index 0fa00212d1d9160eeec576beec42eea6b3bdd463..f495d712d6b2a20ba2d04e4e70448c1563de8704 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -395,9 +395,7 @@ MAC/Deployment/data/OTDB/loadPICtree_sas001 -text
 MAC/Deployment/data/OTDB/load_components_sas001 -text
 MAC/Deployment/data/PVSS/Antenna.dpdef -text
 MAC/Deployment/data/PVSS/BGPAppl.dpdef -text
-MAC/Deployment/data/PVSS/CEPDatapointtypes.dpl -text
 MAC/Deployment/data/PVSS/CEPObservation.dpdef -text
-MAC/Deployment/data/PVSS/CEPPermDatapoints.dpl -text
 MAC/Deployment/data/PVSS/MCUbase.dpdef -text
 MAC/Deployment/data/PVSS/Makefile.am -text
 MAC/Deployment/data/PVSS/OSRack.dpdef -text
@@ -410,7 +408,6 @@ MAC/Deployment/data/PVSS/StnObservation.dpdef -text
 MAC/Deployment/data/PVSS/TBBControl.dpdef -text
 MAC/Deployment/data/PVSS/TBBoard.dpdef -text
 MAC/Deployment/data/PVSS/TempControl.dpdef -text
-MAC/Deployment/data/PVSS/create_db_CEP -text
 MAC/Deployment/data/PVSS/create_db_station -text
 MAC/Deployment/data/StaticMetaData/ControlInfo.dat -text
 MAC/Deployment/data/StaticMetaData/MAC+IP.dat -text
diff --git a/MAC/Deployment/data/PVSS/CEPDatapointtypes.dpl b/MAC/Deployment/data/PVSS/CEPDatapointtypes.dpl
deleted file mode 100644
index 3317ed2053e23655e53f8b5dc96b08e7f63b6dfc..0000000000000000000000000000000000000000
--- a/MAC/Deployment/data/PVSS/CEPDatapointtypes.dpl
+++ /dev/null
@@ -1,460 +0,0 @@
-# This file was generated by create_db_CEP v1.0 on Fri Apr 10 15:08:48 CEST 2009
-
-# Common types in Station and MainCU PVSS Database
-# Definition of some basic types
-
-# DpType
-TypeName
-Claim.Claim	1#1
-	claimDate	26#2
-	name	25#3
-
-TypeName
-ClaimManager.ClaimManager	1#1
-	request	1#2
-		typeName	25#3
-		newObjectName	25#4
-	response	1#5
-		typeName	25#6
-		newObjectName	25#7
-		DPName	25#8
-		claimDate	26#9
-	cache	1#10
-		typeNames	9#11
-		newObjectNames	9#12
-		DPNames	9#13
-		claimDates	10#14
-
-TypeName
-LofarSpeedTest.LofarSpeedTest	1#1
-	singleInt	21#2
-	singleString	25#3
-	result	1#4
-		testName	25#5
-		nrWrites	21#6
-		nrReads	21#7
-		passed	23#8
-		writeTime	25#9
-		readTime	25#10
-	IntCollection	1#11
-		val1	21#12
-		val2	21#13
-		val3	21#14
-		val4	21#15
-		val5	21#16
-		val6	21#17
-		val7	21#18
-		val8	21#19
-		val9	21#20
-		val10	21#21
-	StringCollection	1#22
-		val1	25#23
-		val2	25#24
-		val3	25#25
-		val4	25#26
-		val5	25#27
-		val6	25#28
-		val7	25#29
-		val8	25#30
-		val9	25#31
-		val10	25#32
-
-TypeName
-NCFObjectState.NCFObjectState	1#1
-	DPName	25#2
-	stateNr	21#3
-	message	25#4
-	force	23#5
-
-TypeName
-ObjectStatus.ObjectStatus	1#1
-	state	21#2
-	childState	21#3
-	message	25#4
-	leaf	23#5
-
-TypeName
-ProcessStatus.ProcessStatus	1#1
-	processID	21#2
-	startTime	25#3
-	stopTime	25#4
-	logMsg	25#5
-	error	25#6
-	currentAction	25#7
-
-# create mp for ProcessStatus and attach an archive
-DpName	TypeName	ID
-_mp_ProcessStatus	ProcessStatus	0
-_dt_ProcessStatus	_DynamicDatapoints	0
-
-ElementName	TypeName	_original.._value	_original.._status
-_dt_ProcessStatus.Leaf	_DynamicDatapoints	"_mp_ProcessStatus.logMsg:_archive"	0x101
-_dt_ProcessStatus.DynamicAttribute	_DynamicDatapoints	"_da_none"	0x101
-
-StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class
-0	0	_mp_ProcessStatus.logMsg	ProcessStatus		45	1
-0	0	_mp_ProcessStatus.logMsg	ProcessStatus	1	15		_ValueArchive_2
-
-
-# create datapoints for ClaimManager,NCFObjectState and lofarSpeedTest
-DpName	TypeName	ID
-ClaimManager	ClaimManager	0
-__navObjectState	NCFObjectState	0
-__resetObjectState	NCFObjectState	0
-lofarSpeedTest	LofarSpeedTest	0
-
-
-TypeName
-Adder.Adder	1#1
-	status	41#2:ObjectStatus
-	process	41#3:ProcessStatus
-
-TypeName
-BGPAppl.BGPAppl	1#1
-	status	41#2:ObjectStatus
-	process	41#3:ProcessStatus
-
-TypeName
-BGPMidplane.BGPMidplane	1#1
-	status	41#2:ObjectStatus
-
-TypeName
-BGPProc.BGPProc	1#1
-	status	41#2:ObjectStatus
-	process	41#3:ProcessStatus
-
-TypeName
-BGPRack.BGPRack	1#1
-	status	41#2:ObjectStatus
-
-TypeName
-CEPHardwareMonitor.CEPHardwareMonitor	1#1
-	status	41#2:ObjectStatus
-	process	41#3:ProcessStatus
-
-TypeName
-CEPLOFAR.CEPLOFAR	1#1
-	status	41#2:ObjectStatus
-
-TypeName
-CEPObservation.CEPObservation	1#1
-	status	41#2:ObjectStatus
-	name	25#3
-	claim	41#4:Claim
-
-TypeName
-CEPObsSW.CEPObsSW	1#1
-	status	41#2:ObjectStatus
-
-TypeName
-CEPPermSW.CEPPermSW	1#1
-	status	41#2:ObjectStatus
-
-TypeName
-CEPPIC.CEPPIC	1#1
-	status	41#2:ObjectStatus
-
-TypeName
-CTStartDaemon.CTStartDaemon	1#1
-	status	41#2:ObjectStatus
-	process	41#3:ProcessStatus
-
-TypeName
-Daemons.Daemons	1#1
-	status	41#2:ObjectStatus
-	process	41#3:ProcessStatus
-
-TypeName
-InputBufferControl.InputBufferControl	1#1
-	status	41#2:ObjectStatus
-	process	41#3:ProcessStatus
-
-TypeName
-InputBuffer.InputBuffer	1#1
-	status	41#2:ObjectStatus
-	process	41#3:ProcessStatus
-
-TypeName
-IONode.IONode	1#1
-	status	41#2:ObjectStatus
-
-TypeName
-LogProcessor.LogProcessor	1#1
-	status	41#2:ObjectStatus
-	process	41#3:ProcessStatus
-
-TypeName
-OfflineNode.OfflineNode	1#1
-	status	41#2:ObjectStatus
-
-TypeName
-OnlineControl.OnlineControl	1#1
-	status	41#2:ObjectStatus
-	process	41#3:ProcessStatus
-
-TypeName
-OSRack.OSRack	1#1
-	status	41#2:ObjectStatus
-	name	25#3
-
-TypeName
-OSSubcluster.OSSubcluster	1#1
-	status	41#2:ObjectStatus
-
-TypeName
-PVSS00pmon.PVSS00pmon	1#1
-	status	41#2:ObjectStatus
-	process	41#3:ProcessStatus
-
-TypeName
-SASGateway.SASGateway	1#1
-	status	41#2:ObjectStatus
-	process	41#3:ProcessStatus
-
-TypeName
-ServiceBroker.ServiceBroker	1#1
-	status	41#2:ObjectStatus
-	process	41#3:ProcessStatus
-
-TypeName
-SoftwareMonitor.SoftwareMonitor	1#1
-	status	41#2:ObjectStatus
-	process	41#3:ProcessStatus
-
-TypeName
-StorageAppl.StorageAppl	1#1
-	status	41#2:ObjectStatus
-	process	41#3:ProcessStatus
-
-TypeName
-StorageNode.StorageNode	1#1
-	status	41#2:ObjectStatus
-
-DpName	TypeName	ID
-_mp_Adder	Adder	0
-_dt_Adder	_DynamicDatapoints	0
-
-ElementName	TypeName	_original.._value	_original.._status
-_dt_Adder.Leaf	_DynamicDatapoints	"_mp_Adder.logMsg:_archive"	0x101
-_dt_Adder.DynamicAttribute	_DynamicDatapoints	"_da_none"	0x101
-
-StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class
-0	0	_mp_Adder.process.logMsg	Adder		45	1
-0	0	_mp_Adder.process.logMsg	Adder	1	15		_ValueArchive_2
-
-DpName	TypeName	ID
-_mp_BGPAppl	BGPAppl	0
-_dt_BGPAppl	_DynamicDatapoints	0
-
-ElementName	TypeName	_original.._value	_original.._status
-_dt_BGPAppl.Leaf	_DynamicDatapoints	"_mp_BGPAppl.logMsg:_archive"	0x101
-_dt_BGPAppl.DynamicAttribute	_DynamicDatapoints	"_da_none"	0x101
-
-StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class
-0	0	_mp_BGPAppl.process.logMsg	BGPAppl		45	1
-0	0	_mp_BGPAppl.process.logMsg	BGPAppl	1	15		_ValueArchive_2
-
-DpName	TypeName	ID
-_mp_BGPMidplane	BGPMidplane	0
-_dt_BGPMidplane	_DynamicDatapoints	0
-
-DpName	TypeName	ID
-_mp_BGPProc	BGPProc	0
-_dt_BGPProc	_DynamicDatapoints	0
-
-ElementName	TypeName	_original.._value	_original.._status
-_dt_BGPProc.Leaf	_DynamicDatapoints	"_mp_BGPProc.logMsg:_archive"	0x101
-_dt_BGPProc.DynamicAttribute	_DynamicDatapoints	"_da_none"	0x101
-
-StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class
-0	0	_mp_BGPProc.process.logMsg	BGPProc		45	1
-0	0	_mp_BGPProc.process.logMsg	BGPProc	1	15		_ValueArchive_2
-
-DpName	TypeName	ID
-_mp_BGPRack	BGPRack	0
-_dt_BGPRack	_DynamicDatapoints	0
-
-DpName	TypeName	ID
-_mp_CEPHardwareMonitor	CEPHardwareMonitor	0
-_dt_CEPHardwareMonitor	_DynamicDatapoints	0
-
-ElementName	TypeName	_original.._value	_original.._status
-_dt_CEPHardwareMonitor.Leaf	_DynamicDatapoints	"_mp_CEPHardwareMonitor.logMsg:_archive"	0x101
-_dt_CEPHardwareMonitor.DynamicAttribute	_DynamicDatapoints	"_da_none"	0x101
-
-StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class
-0	0	_mp_CEPHardwareMonitor.process.logMsg	CEPHardwareMonitor		45	1
-0	0	_mp_CEPHardwareMonitor.process.logMsg	CEPHardwareMonitor	1	15		_ValueArchive_2
-
-DpName	TypeName	ID
-_mp_CEPLOFAR	CEPLOFAR	0
-_dt_CEPLOFAR	_DynamicDatapoints	0
-
-DpName	TypeName	ID
-_mp_CEPObservation	CEPObservation	0
-_dt_CEPObservation	_DynamicDatapoints	0
-
-DpName	TypeName	ID
-_mp_CEPObsSW	CEPObsSW	0
-_dt_CEPObsSW	_DynamicDatapoints	0
-
-DpName	TypeName	ID
-_mp_CEPPermSW	CEPPermSW	0
-_dt_CEPPermSW	_DynamicDatapoints	0
-
-DpName	TypeName	ID
-_mp_CEPPIC	CEPPIC	0
-_dt_CEPPIC	_DynamicDatapoints	0
-
-DpName	TypeName	ID
-_mp_CTStartDaemon	CTStartDaemon	0
-_dt_CTStartDaemon	_DynamicDatapoints	0
-
-ElementName	TypeName	_original.._value	_original.._status
-_dt_CTStartDaemon.Leaf	_DynamicDatapoints	"_mp_CTStartDaemon.logMsg:_archive"	0x101
-_dt_CTStartDaemon.DynamicAttribute	_DynamicDatapoints	"_da_none"	0x101
-
-StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class
-0	0	_mp_CTStartDaemon.process.logMsg	CTStartDaemon		45	1
-0	0	_mp_CTStartDaemon.process.logMsg	CTStartDaemon	1	15		_ValueArchive_2
-
-DpName	TypeName	ID
-_mp_Daemons	Daemons	0
-_dt_Daemons	_DynamicDatapoints	0
-
-ElementName	TypeName	_original.._value	_original.._status
-_dt_Daemons.Leaf	_DynamicDatapoints	"_mp_Daemons.logMsg:_archive"	0x101
-_dt_Daemons.DynamicAttribute	_DynamicDatapoints	"_da_none"	0x101
-
-StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class
-0	0	_mp_Daemons.process.logMsg	Daemons		45	1
-0	0	_mp_Daemons.process.logMsg	Daemons	1	15		_ValueArchive_2
-
-DpName	TypeName	ID
-_mp_InputBufferControl	InputBufferControl	0
-_dt_InputBufferControl	_DynamicDatapoints	0
-
-ElementName	TypeName	_original.._value	_original.._status
-_dt_InputBufferControl.Leaf	_DynamicDatapoints	"_mp_InputBufferControl.logMsg:_archive"	0x101
-_dt_InputBufferControl.DynamicAttribute	_DynamicDatapoints	"_da_none"	0x101
-
-StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class
-0	0	_mp_InputBufferControl.process.logMsg	InputBufferControl		45	1
-0	0	_mp_InputBufferControl.process.logMsg	InputBufferControl	1	15		_ValueArchive_2
-
-DpName	TypeName	ID
-_mp_InputBuffer	InputBuffer	0
-_dt_InputBuffer	_DynamicDatapoints	0
-
-ElementName	TypeName	_original.._value	_original.._status
-_dt_InputBuffer.Leaf	_DynamicDatapoints	"_mp_InputBuffer.logMsg:_archive"	0x101
-_dt_InputBuffer.DynamicAttribute	_DynamicDatapoints	"_da_none"	0x101
-
-StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class
-0	0	_mp_InputBuffer.process.logMsg	InputBuffer		45	1
-0	0	_mp_InputBuffer.process.logMsg	InputBuffer	1	15		_ValueArchive_2
-
-DpName	TypeName	ID
-_mp_IONode	IONode	0
-_dt_IONode	_DynamicDatapoints	0
-
-DpName	TypeName	ID
-_mp_LogProcessor	LogProcessor	0
-_dt_LogProcessor	_DynamicDatapoints	0
-
-ElementName	TypeName	_original.._value	_original.._status
-_dt_LogProcessor.Leaf	_DynamicDatapoints	"_mp_LogProcessor.logMsg:_archive"	0x101
-_dt_LogProcessor.DynamicAttribute	_DynamicDatapoints	"_da_none"	0x101
-
-StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class
-0	0	_mp_LogProcessor.process.logMsg	LogProcessor		45	1
-0	0	_mp_LogProcessor.process.logMsg	LogProcessor	1	15		_ValueArchive_2
-
-DpName	TypeName	ID
-_mp_OfflineNode	OfflineNode	0
-_dt_OfflineNode	_DynamicDatapoints	0
-
-DpName	TypeName	ID
-_mp_OnlineControl	OnlineControl	0
-_dt_OnlineControl	_DynamicDatapoints	0
-
-ElementName	TypeName	_original.._value	_original.._status
-_dt_OnlineControl.Leaf	_DynamicDatapoints	"_mp_OnlineControl.logMsg:_archive"	0x101
-_dt_OnlineControl.DynamicAttribute	_DynamicDatapoints	"_da_none"	0x101
-
-StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class
-0	0	_mp_OnlineControl.process.logMsg	OnlineControl		45	1
-0	0	_mp_OnlineControl.process.logMsg	OnlineControl	1	15		_ValueArchive_2
-
-DpName	TypeName	ID
-_mp_OSRack	OSRack	0
-_dt_OSRack	_DynamicDatapoints	0
-
-DpName	TypeName	ID
-_mp_OSSubcluster	OSSubcluster	0
-_dt_OSSubcluster	_DynamicDatapoints	0
-
-DpName	TypeName	ID
-_mp_PVSS00pmon	PVSS00pmon	0
-_dt_PVSS00pmon	_DynamicDatapoints	0
-
-ElementName	TypeName	_original.._value	_original.._status
-_dt_PVSS00pmon.Leaf	_DynamicDatapoints	"_mp_PVSS00pmon.logMsg:_archive"	0x101
-_dt_PVSS00pmon.DynamicAttribute	_DynamicDatapoints	"_da_none"	0x101
-
-StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class
-0	0	_mp_PVSS00pmon.process.logMsg	PVSS00pmon		45	1
-0	0	_mp_PVSS00pmon.process.logMsg	PVSS00pmon	1	15		_ValueArchive_2
-
-DpName	TypeName	ID
-_mp_SASGateway	SASGateway	0
-_dt_SASGateway	_DynamicDatapoints	0
-
-ElementName	TypeName	_original.._value	_original.._status
-_dt_SASGateway.Leaf	_DynamicDatapoints	"_mp_SASGateway.logMsg:_archive"	0x101
-_dt_SASGateway.DynamicAttribute	_DynamicDatapoints	"_da_none"	0x101
-
-StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class
-0	0	_mp_SASGateway.process.logMsg	SASGateway		45	1
-0	0	_mp_SASGateway.process.logMsg	SASGateway	1	15		_ValueArchive_2
-
-DpName	TypeName	ID
-_mp_ServiceBroker	ServiceBroker	0
-_dt_ServiceBroker	_DynamicDatapoints	0
-
-ElementName	TypeName	_original.._value	_original.._status
-_dt_ServiceBroker.Leaf	_DynamicDatapoints	"_mp_ServiceBroker.logMsg:_archive"	0x101
-_dt_ServiceBroker.DynamicAttribute	_DynamicDatapoints	"_da_none"	0x101
-
-StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class
-0	0	_mp_ServiceBroker.process.logMsg	ServiceBroker		45	1
-0	0	_mp_ServiceBroker.process.logMsg	ServiceBroker	1	15		_ValueArchive_2
-
-DpName	TypeName	ID
-_mp_SoftwareMonitor	SoftwareMonitor	0
-_dt_SoftwareMonitor	_DynamicDatapoints	0
-
-ElementName	TypeName	_original.._value	_original.._status
-_dt_SoftwareMonitor.Leaf	_DynamicDatapoints	"_mp_SoftwareMonitor.logMsg:_archive"	0x101
-_dt_SoftwareMonitor.DynamicAttribute	_DynamicDatapoints	"_da_none"	0x101
-
-StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class
-0	0	_mp_SoftwareMonitor.process.logMsg	SoftwareMonitor		45	1
-0	0	_mp_SoftwareMonitor.process.logMsg	SoftwareMonitor	1	15		_ValueArchive_2
-
-DpName	TypeName	ID
-_mp_StorageAppl	StorageAppl	0
-_dt_StorageAppl	_DynamicDatapoints	0
-
-ElementName	TypeName	_original.._value	_original.._status
-_dt_StorageAppl.Leaf	_DynamicDatapoints	"_mp_StorageAppl.logMsg:_archive"	0x101
-_dt_StorageAppl.DynamicAttribute	_DynamicDatapoints	"_da_none"	0x101
-
-StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class
-0	0	_mp_StorageAppl.process.logMsg	StorageAppl		45	1
-0	0	_mp_StorageAppl.process.logMsg	StorageAppl	1	15		_ValueArchive_2
-
-DpName	TypeName	ID
-_mp_StorageNode	StorageNode	0
-_dt_StorageNode	_DynamicDatapoints	0
-
diff --git a/MAC/Deployment/data/PVSS/CEPPermDatapoints.dpl b/MAC/Deployment/data/PVSS/CEPPermDatapoints.dpl
deleted file mode 100644
index 8ff1c25cfdb690b5390befd6dc6b22b2771b5906..0000000000000000000000000000000000000000
--- a/MAC/Deployment/data/PVSS/CEPPermDatapoints.dpl
+++ /dev/null
@@ -1,675 +0,0 @@
-#
-# This file was generated by create_db_CEP v1.0 on Fri Apr 10 15:08:48 CEST 2009
-#
-DpName	TypeName	ID
-Adder0	Adder	1000
-Adder1	Adder	1001
-Adder10	Adder	1002
-Adder100	Adder	1003
-Adder101	Adder	1004
-Adder102	Adder	1005
-Adder103	Adder	1006
-Adder104	Adder	1007
-Adder105	Adder	1008
-Adder106	Adder	1009
-Adder107	Adder	1010
-Adder108	Adder	1011
-Adder109	Adder	1012
-Adder11	Adder	1013
-Adder110	Adder	1014
-Adder111	Adder	1015
-Adder112	Adder	1016
-Adder113	Adder	1017
-Adder114	Adder	1018
-Adder115	Adder	1019
-Adder116	Adder	1020
-Adder117	Adder	1021
-Adder118	Adder	1022
-Adder119	Adder	1023
-Adder12	Adder	1024
-Adder120	Adder	1025
-Adder121	Adder	1026
-Adder122	Adder	1027
-Adder123	Adder	1028
-Adder124	Adder	1029
-Adder125	Adder	1030
-Adder126	Adder	1031
-Adder127	Adder	1032
-Adder13	Adder	1033
-Adder14	Adder	1034
-Adder15	Adder	1035
-Adder16	Adder	1036
-Adder17	Adder	1037
-Adder18	Adder	1038
-Adder19	Adder	1039
-Adder2	Adder	1040
-Adder20	Adder	1041
-Adder21	Adder	1042
-Adder22	Adder	1043
-Adder23	Adder	1044
-Adder24	Adder	1045
-Adder25	Adder	1046
-Adder26	Adder	1047
-Adder27	Adder	1048
-Adder28	Adder	1049
-Adder29	Adder	1050
-Adder3	Adder	1051
-Adder30	Adder	1052
-Adder31	Adder	1053
-Adder32	Adder	1054
-Adder33	Adder	1055
-Adder34	Adder	1056
-Adder35	Adder	1057
-Adder36	Adder	1058
-Adder37	Adder	1059
-Adder38	Adder	1060
-Adder39	Adder	1061
-Adder4	Adder	1062
-Adder40	Adder	1063
-Adder41	Adder	1064
-Adder42	Adder	1065
-Adder43	Adder	1066
-Adder44	Adder	1067
-Adder45	Adder	1068
-Adder46	Adder	1069
-Adder47	Adder	1070
-Adder48	Adder	1071
-Adder49	Adder	1072
-Adder5	Adder	1073
-Adder50	Adder	1074
-Adder51	Adder	1075
-Adder52	Adder	1076
-Adder53	Adder	1077
-Adder54	Adder	1078
-Adder55	Adder	1079
-Adder56	Adder	1080
-Adder57	Adder	1081
-Adder58	Adder	1082
-Adder59	Adder	1083
-Adder6	Adder	1084
-Adder60	Adder	1085
-Adder61	Adder	1086
-Adder62	Adder	1087
-Adder63	Adder	1088
-Adder64	Adder	1089
-Adder65	Adder	1090
-Adder66	Adder	1091
-Adder67	Adder	1092
-Adder68	Adder	1093
-Adder69	Adder	1094
-Adder7	Adder	1095
-Adder70	Adder	1096
-Adder71	Adder	1097
-Adder72	Adder	1098
-Adder73	Adder	1099
-Adder74	Adder	1100
-Adder75	Adder	1101
-Adder76	Adder	1102
-Adder77	Adder	1103
-Adder78	Adder	1104
-Adder79	Adder	1105
-Adder8	Adder	1106
-Adder80	Adder	1107
-Adder81	Adder	1108
-Adder82	Adder	1109
-Adder83	Adder	1110
-Adder84	Adder	1111
-Adder85	Adder	1112
-Adder86	Adder	1113
-Adder87	Adder	1114
-Adder88	Adder	1115
-Adder89	Adder	1116
-Adder9	Adder	1117
-Adder90	Adder	1118
-Adder91	Adder	1119
-Adder92	Adder	1120
-Adder93	Adder	1121
-Adder94	Adder	1122
-Adder95	Adder	1123
-Adder96	Adder	1124
-Adder97	Adder	1125
-Adder98	Adder	1126
-Adder99	Adder	1127
-InputBuffer0	InputBuffer	1128
-InputBuffer1	InputBuffer	1129
-InputBuffer10	InputBuffer	1130
-InputBuffer100	InputBuffer	1131
-InputBuffer101	InputBuffer	1132
-InputBuffer102	InputBuffer	1133
-InputBuffer103	InputBuffer	1134
-InputBuffer104	InputBuffer	1135
-InputBuffer105	InputBuffer	1136
-InputBuffer106	InputBuffer	1137
-InputBuffer107	InputBuffer	1138
-InputBuffer108	InputBuffer	1139
-InputBuffer109	InputBuffer	1140
-InputBuffer11	InputBuffer	1141
-InputBuffer110	InputBuffer	1142
-InputBuffer111	InputBuffer	1143
-InputBuffer112	InputBuffer	1144
-InputBuffer113	InputBuffer	1145
-InputBuffer114	InputBuffer	1146
-InputBuffer115	InputBuffer	1147
-InputBuffer116	InputBuffer	1148
-InputBuffer117	InputBuffer	1149
-InputBuffer118	InputBuffer	1150
-InputBuffer119	InputBuffer	1151
-InputBuffer12	InputBuffer	1152
-InputBuffer120	InputBuffer	1153
-InputBuffer121	InputBuffer	1154
-InputBuffer122	InputBuffer	1155
-InputBuffer123	InputBuffer	1156
-InputBuffer124	InputBuffer	1157
-InputBuffer125	InputBuffer	1158
-InputBuffer126	InputBuffer	1159
-InputBuffer127	InputBuffer	1160
-InputBuffer13	InputBuffer	1161
-InputBuffer14	InputBuffer	1162
-InputBuffer15	InputBuffer	1163
-InputBuffer16	InputBuffer	1164
-InputBuffer17	InputBuffer	1165
-InputBuffer18	InputBuffer	1166
-InputBuffer19	InputBuffer	1167
-InputBuffer2	InputBuffer	1168
-InputBuffer20	InputBuffer	1169
-InputBuffer21	InputBuffer	1170
-InputBuffer22	InputBuffer	1171
-InputBuffer23	InputBuffer	1172
-InputBuffer24	InputBuffer	1173
-InputBuffer25	InputBuffer	1174
-InputBuffer26	InputBuffer	1175
-InputBuffer27	InputBuffer	1176
-InputBuffer28	InputBuffer	1177
-InputBuffer29	InputBuffer	1178
-InputBuffer3	InputBuffer	1179
-InputBuffer30	InputBuffer	1180
-InputBuffer31	InputBuffer	1181
-InputBuffer32	InputBuffer	1182
-InputBuffer33	InputBuffer	1183
-InputBuffer34	InputBuffer	1184
-InputBuffer35	InputBuffer	1185
-InputBuffer36	InputBuffer	1186
-InputBuffer37	InputBuffer	1187
-InputBuffer38	InputBuffer	1188
-InputBuffer39	InputBuffer	1189
-InputBuffer4	InputBuffer	1190
-InputBuffer40	InputBuffer	1191
-InputBuffer41	InputBuffer	1192
-InputBuffer42	InputBuffer	1193
-InputBuffer43	InputBuffer	1194
-InputBuffer44	InputBuffer	1195
-InputBuffer45	InputBuffer	1196
-InputBuffer46	InputBuffer	1197
-InputBuffer47	InputBuffer	1198
-InputBuffer48	InputBuffer	1199
-InputBuffer49	InputBuffer	1200
-InputBuffer5	InputBuffer	1201
-InputBuffer50	InputBuffer	1202
-InputBuffer51	InputBuffer	1203
-InputBuffer52	InputBuffer	1204
-InputBuffer53	InputBuffer	1205
-InputBuffer54	InputBuffer	1206
-InputBuffer55	InputBuffer	1207
-InputBuffer56	InputBuffer	1208
-InputBuffer57	InputBuffer	1209
-InputBuffer58	InputBuffer	1210
-InputBuffer59	InputBuffer	1211
-InputBuffer6	InputBuffer	1212
-InputBuffer60	InputBuffer	1213
-InputBuffer61	InputBuffer	1214
-InputBuffer62	InputBuffer	1215
-InputBuffer63	InputBuffer	1216
-InputBuffer64	InputBuffer	1217
-InputBuffer65	InputBuffer	1218
-InputBuffer66	InputBuffer	1219
-InputBuffer67	InputBuffer	1220
-InputBuffer68	InputBuffer	1221
-InputBuffer69	InputBuffer	1222
-InputBuffer7	InputBuffer	1223
-InputBuffer70	InputBuffer	1224
-InputBuffer71	InputBuffer	1225
-InputBuffer72	InputBuffer	1226
-InputBuffer73	InputBuffer	1227
-InputBuffer74	InputBuffer	1228
-InputBuffer75	InputBuffer	1229
-InputBuffer76	InputBuffer	1230
-InputBuffer77	InputBuffer	1231
-InputBuffer78	InputBuffer	1232
-InputBuffer79	InputBuffer	1233
-InputBuffer8	InputBuffer	1234
-InputBuffer80	InputBuffer	1235
-InputBuffer81	InputBuffer	1236
-InputBuffer82	InputBuffer	1237
-InputBuffer83	InputBuffer	1238
-InputBuffer84	InputBuffer	1239
-InputBuffer85	InputBuffer	1240
-InputBuffer86	InputBuffer	1241
-InputBuffer87	InputBuffer	1242
-InputBuffer88	InputBuffer	1243
-InputBuffer89	InputBuffer	1244
-InputBuffer9	InputBuffer	1245
-InputBuffer90	InputBuffer	1246
-InputBuffer91	InputBuffer	1247
-InputBuffer92	InputBuffer	1248
-InputBuffer93	InputBuffer	1249
-InputBuffer94	InputBuffer	1250
-InputBuffer95	InputBuffer	1251
-InputBuffer96	InputBuffer	1252
-InputBuffer97	InputBuffer	1253
-InputBuffer98	InputBuffer	1254
-InputBuffer99	InputBuffer	1255
-LOFAR	CEPLOFAR	1256
-LOFAR_ObsSW	CEPObsSW	1257
-LOFAR_PermSW	CEPPermSW	1258
-LOFAR_PermSW_Daemons	Daemons	1259
-LOFAR_PermSW_Daemons_CTStartDaemon	CTStartDaemon	1260
-LOFAR_PermSW_Daemons_LogProcessor	LogProcessor	1261
-LOFAR_PermSW_Daemons_PVSS00pmon	PVSS00pmon	1262
-LOFAR_PermSW_Daemons_SASGateway	SASGateway	1263
-LOFAR_PermSW_Daemons_ServiceBroker	ServiceBroker	1264
-LOFAR_PermSW_HardwareMonitor	CEPHardwareMonitor	1265
-LOFAR_PermSW_InputBufferControl	InputBufferControl	1266
-LOFAR_PermSW_SoftwareMonitor	SoftwareMonitor	1267
-LOFAR_PIC	CEPPIC	1268
-LOFAR_PIC_BGP0	BGPRack	1269
-LOFAR_PIC_BGP0_Midplane0	BGPMidplane	1270
-LOFAR_PIC_BGP0_Midplane0_IONode0	IONode	1271
-LOFAR_PIC_BGP0_Midplane0_IONode1	IONode	1272
-LOFAR_PIC_BGP0_Midplane0_IONode10	IONode	1273
-LOFAR_PIC_BGP0_Midplane0_IONode11	IONode	1274
-LOFAR_PIC_BGP0_Midplane0_IONode12	IONode	1275
-LOFAR_PIC_BGP0_Midplane0_IONode13	IONode	1276
-LOFAR_PIC_BGP0_Midplane0_IONode14	IONode	1277
-LOFAR_PIC_BGP0_Midplane0_IONode15	IONode	1278
-LOFAR_PIC_BGP0_Midplane0_IONode16	IONode	1279
-LOFAR_PIC_BGP0_Midplane0_IONode17	IONode	1280
-LOFAR_PIC_BGP0_Midplane0_IONode18	IONode	1281
-LOFAR_PIC_BGP0_Midplane0_IONode19	IONode	1282
-LOFAR_PIC_BGP0_Midplane0_IONode2	IONode	1283
-LOFAR_PIC_BGP0_Midplane0_IONode20	IONode	1284
-LOFAR_PIC_BGP0_Midplane0_IONode21	IONode	1285
-LOFAR_PIC_BGP0_Midplane0_IONode22	IONode	1286
-LOFAR_PIC_BGP0_Midplane0_IONode23	IONode	1287
-LOFAR_PIC_BGP0_Midplane0_IONode24	IONode	1288
-LOFAR_PIC_BGP0_Midplane0_IONode25	IONode	1289
-LOFAR_PIC_BGP0_Midplane0_IONode26	IONode	1290
-LOFAR_PIC_BGP0_Midplane0_IONode27	IONode	1291
-LOFAR_PIC_BGP0_Midplane0_IONode28	IONode	1292
-LOFAR_PIC_BGP0_Midplane0_IONode29	IONode	1293
-LOFAR_PIC_BGP0_Midplane0_IONode3	IONode	1294
-LOFAR_PIC_BGP0_Midplane0_IONode30	IONode	1295
-LOFAR_PIC_BGP0_Midplane0_IONode31	IONode	1296
-LOFAR_PIC_BGP0_Midplane0_IONode4	IONode	1297
-LOFAR_PIC_BGP0_Midplane0_IONode5	IONode	1298
-LOFAR_PIC_BGP0_Midplane0_IONode6	IONode	1299
-LOFAR_PIC_BGP0_Midplane0_IONode7	IONode	1300
-LOFAR_PIC_BGP0_Midplane0_IONode8	IONode	1301
-LOFAR_PIC_BGP0_Midplane0_IONode9	IONode	1302
-LOFAR_PIC_BGP0_Midplane1	BGPMidplane	1303
-LOFAR_PIC_BGP0_Midplane1_IONode32	IONode	1304
-LOFAR_PIC_BGP0_Midplane1_IONode33	IONode	1305
-LOFAR_PIC_BGP0_Midplane1_IONode34	IONode	1306
-LOFAR_PIC_BGP0_Midplane1_IONode35	IONode	1307
-LOFAR_PIC_BGP0_Midplane1_IONode36	IONode	1308
-LOFAR_PIC_BGP0_Midplane1_IONode37	IONode	1309
-LOFAR_PIC_BGP0_Midplane1_IONode38	IONode	1310
-LOFAR_PIC_BGP0_Midplane1_IONode39	IONode	1311
-LOFAR_PIC_BGP0_Midplane1_IONode40	IONode	1312
-LOFAR_PIC_BGP0_Midplane1_IONode41	IONode	1313
-LOFAR_PIC_BGP0_Midplane1_IONode42	IONode	1314
-LOFAR_PIC_BGP0_Midplane1_IONode43	IONode	1315
-LOFAR_PIC_BGP0_Midplane1_IONode44	IONode	1316
-LOFAR_PIC_BGP0_Midplane1_IONode45	IONode	1317
-LOFAR_PIC_BGP0_Midplane1_IONode46	IONode	1318
-LOFAR_PIC_BGP0_Midplane1_IONode47	IONode	1319
-LOFAR_PIC_BGP0_Midplane1_IONode48	IONode	1320
-LOFAR_PIC_BGP0_Midplane1_IONode49	IONode	1321
-LOFAR_PIC_BGP0_Midplane1_IONode50	IONode	1322
-LOFAR_PIC_BGP0_Midplane1_IONode51	IONode	1323
-LOFAR_PIC_BGP0_Midplane1_IONode52	IONode	1324
-LOFAR_PIC_BGP0_Midplane1_IONode53	IONode	1325
-LOFAR_PIC_BGP0_Midplane1_IONode54	IONode	1326
-LOFAR_PIC_BGP0_Midplane1_IONode55	IONode	1327
-LOFAR_PIC_BGP0_Midplane1_IONode56	IONode	1328
-LOFAR_PIC_BGP0_Midplane1_IONode57	IONode	1329
-LOFAR_PIC_BGP0_Midplane1_IONode58	IONode	1330
-LOFAR_PIC_BGP0_Midplane1_IONode59	IONode	1331
-LOFAR_PIC_BGP0_Midplane1_IONode60	IONode	1332
-LOFAR_PIC_BGP0_Midplane1_IONode61	IONode	1333
-LOFAR_PIC_BGP0_Midplane1_IONode62	IONode	1334
-LOFAR_PIC_BGP0_Midplane1_IONode63	IONode	1335
-LOFAR_PIC_BGP1	BGPRack	1336
-LOFAR_PIC_BGP1_Midplane2	BGPMidplane	1337
-LOFAR_PIC_BGP1_Midplane2_IONode64	IONode	1338
-LOFAR_PIC_BGP1_Midplane2_IONode65	IONode	1339
-LOFAR_PIC_BGP1_Midplane2_IONode66	IONode	1340
-LOFAR_PIC_BGP1_Midplane2_IONode67	IONode	1341
-LOFAR_PIC_BGP1_Midplane2_IONode68	IONode	1342
-LOFAR_PIC_BGP1_Midplane2_IONode69	IONode	1343
-LOFAR_PIC_BGP1_Midplane2_IONode70	IONode	1344
-LOFAR_PIC_BGP1_Midplane2_IONode71	IONode	1345
-LOFAR_PIC_BGP1_Midplane2_IONode72	IONode	1346
-LOFAR_PIC_BGP1_Midplane2_IONode73	IONode	1347
-LOFAR_PIC_BGP1_Midplane2_IONode74	IONode	1348
-LOFAR_PIC_BGP1_Midplane2_IONode75	IONode	1349
-LOFAR_PIC_BGP1_Midplane2_IONode76	IONode	1350
-LOFAR_PIC_BGP1_Midplane2_IONode77	IONode	1351
-LOFAR_PIC_BGP1_Midplane2_IONode78	IONode	1352
-LOFAR_PIC_BGP1_Midplane2_IONode79	IONode	1353
-LOFAR_PIC_BGP1_Midplane2_IONode80	IONode	1354
-LOFAR_PIC_BGP1_Midplane2_IONode81	IONode	1355
-LOFAR_PIC_BGP1_Midplane2_IONode82	IONode	1356
-LOFAR_PIC_BGP1_Midplane2_IONode83	IONode	1357
-LOFAR_PIC_BGP1_Midplane2_IONode84	IONode	1358
-LOFAR_PIC_BGP1_Midplane2_IONode85	IONode	1359
-LOFAR_PIC_BGP1_Midplane2_IONode86	IONode	1360
-LOFAR_PIC_BGP1_Midplane2_IONode87	IONode	1361
-LOFAR_PIC_BGP1_Midplane2_IONode88	IONode	1362
-LOFAR_PIC_BGP1_Midplane2_IONode89	IONode	1363
-LOFAR_PIC_BGP1_Midplane2_IONode90	IONode	1364
-LOFAR_PIC_BGP1_Midplane2_IONode91	IONode	1365
-LOFAR_PIC_BGP1_Midplane2_IONode92	IONode	1366
-LOFAR_PIC_BGP1_Midplane2_IONode93	IONode	1367
-LOFAR_PIC_BGP1_Midplane2_IONode94	IONode	1368
-LOFAR_PIC_BGP1_Midplane2_IONode95	IONode	1369
-LOFAR_PIC_BGP1_Midplane3	BGPMidplane	1370
-LOFAR_PIC_BGP1_Midplane3_IONode100	IONode	1371
-LOFAR_PIC_BGP1_Midplane3_IONode101	IONode	1372
-LOFAR_PIC_BGP1_Midplane3_IONode102	IONode	1373
-LOFAR_PIC_BGP1_Midplane3_IONode103	IONode	1374
-LOFAR_PIC_BGP1_Midplane3_IONode104	IONode	1375
-LOFAR_PIC_BGP1_Midplane3_IONode105	IONode	1376
-LOFAR_PIC_BGP1_Midplane3_IONode106	IONode	1377
-LOFAR_PIC_BGP1_Midplane3_IONode107	IONode	1378
-LOFAR_PIC_BGP1_Midplane3_IONode108	IONode	1379
-LOFAR_PIC_BGP1_Midplane3_IONode109	IONode	1380
-LOFAR_PIC_BGP1_Midplane3_IONode110	IONode	1381
-LOFAR_PIC_BGP1_Midplane3_IONode111	IONode	1382
-LOFAR_PIC_BGP1_Midplane3_IONode112	IONode	1383
-LOFAR_PIC_BGP1_Midplane3_IONode113	IONode	1384
-LOFAR_PIC_BGP1_Midplane3_IONode114	IONode	1385
-LOFAR_PIC_BGP1_Midplane3_IONode115	IONode	1386
-LOFAR_PIC_BGP1_Midplane3_IONode116	IONode	1387
-LOFAR_PIC_BGP1_Midplane3_IONode117	IONode	1388
-LOFAR_PIC_BGP1_Midplane3_IONode118	IONode	1389
-LOFAR_PIC_BGP1_Midplane3_IONode119	IONode	1390
-LOFAR_PIC_BGP1_Midplane3_IONode120	IONode	1391
-LOFAR_PIC_BGP1_Midplane3_IONode121	IONode	1392
-LOFAR_PIC_BGP1_Midplane3_IONode122	IONode	1393
-LOFAR_PIC_BGP1_Midplane3_IONode123	IONode	1394
-LOFAR_PIC_BGP1_Midplane3_IONode124	IONode	1395
-LOFAR_PIC_BGP1_Midplane3_IONode125	IONode	1396
-LOFAR_PIC_BGP1_Midplane3_IONode126	IONode	1397
-LOFAR_PIC_BGP1_Midplane3_IONode127	IONode	1398
-LOFAR_PIC_BGP1_Midplane3_IONode96	IONode	1399
-LOFAR_PIC_BGP1_Midplane3_IONode97	IONode	1400
-LOFAR_PIC_BGP1_Midplane3_IONode98	IONode	1401
-LOFAR_PIC_BGP1_Midplane3_IONode99	IONode	1402
-LOFAR_PIC_OSRack0	OSRack	1403
-LOFAR_PIC_OSRack0_OSSubcluster0	OSSubcluster	1404
-LOFAR_PIC_OSRack0_OSSubcluster0_OfflineNode0	OfflineNode	1405
-LOFAR_PIC_OSRack0_OSSubcluster0_OfflineNode1	OfflineNode	1406
-LOFAR_PIC_OSRack0_OSSubcluster0_OfflineNode2	OfflineNode	1407
-LOFAR_PIC_OSRack0_OSSubcluster0_OfflineNode3	OfflineNode	1408
-LOFAR_PIC_OSRack0_OSSubcluster0_OfflineNode4	OfflineNode	1409
-LOFAR_PIC_OSRack0_OSSubcluster0_OfflineNode5	OfflineNode	1410
-LOFAR_PIC_OSRack0_OSSubcluster0_OfflineNode6	OfflineNode	1411
-LOFAR_PIC_OSRack0_OSSubcluster0_OfflineNode7	OfflineNode	1412
-LOFAR_PIC_OSRack0_OSSubcluster0_OfflineNode8	OfflineNode	1413
-LOFAR_PIC_OSRack0_OSSubcluster0_StorageNode0	StorageNode	1414
-LOFAR_PIC_OSRack0_OSSubcluster0_StorageNode1	StorageNode	1415
-LOFAR_PIC_OSRack0_OSSubcluster0_StorageNode2	StorageNode	1416
-LOFAR_PIC_OSRack0_OSSubcluster1	OSSubcluster	1417
-LOFAR_PIC_OSRack0_OSSubcluster1_OfflineNode10	OfflineNode	1418
-LOFAR_PIC_OSRack0_OSSubcluster1_OfflineNode11	OfflineNode	1419
-LOFAR_PIC_OSRack0_OSSubcluster1_OfflineNode12	OfflineNode	1420
-LOFAR_PIC_OSRack0_OSSubcluster1_OfflineNode13	OfflineNode	1421
-LOFAR_PIC_OSRack0_OSSubcluster1_OfflineNode14	OfflineNode	1422
-LOFAR_PIC_OSRack0_OSSubcluster1_OfflineNode15	OfflineNode	1423
-LOFAR_PIC_OSRack0_OSSubcluster1_OfflineNode16	OfflineNode	1424
-LOFAR_PIC_OSRack0_OSSubcluster1_OfflineNode17	OfflineNode	1425
-LOFAR_PIC_OSRack0_OSSubcluster1_OfflineNode9	OfflineNode	1426
-LOFAR_PIC_OSRack0_OSSubcluster1_StorageNode3	StorageNode	1427
-LOFAR_PIC_OSRack0_OSSubcluster1_StorageNode4	StorageNode	1428
-LOFAR_PIC_OSRack0_OSSubcluster1_StorageNode5	StorageNode	1429
-LOFAR_PIC_OSRack1	OSRack	1430
-LOFAR_PIC_OSRack10_OSSubcluster20_StorageNode60	StorageNode	1431
-LOFAR_PIC_OSRack10_OSSubcluster20_StorageNode61	StorageNode	1432
-LOFAR_PIC_OSRack10_OSSubcluster20_StorageNode62	StorageNode	1433
-LOFAR_PIC_OSRack10_OSSubcluster21_StorageNode63	StorageNode	1434
-LOFAR_PIC_OSRack10_OSSubcluster21_StorageNode64	StorageNode	1435
-LOFAR_PIC_OSRack10_OSSubcluster21_StorageNode65	StorageNode	1436
-LOFAR_PIC_OSRack11_OSSubcluster22_StorageNode66	StorageNode	1437
-LOFAR_PIC_OSRack11_OSSubcluster22_StorageNode67	StorageNode	1438
-LOFAR_PIC_OSRack11_OSSubcluster22_StorageNode68	StorageNode	1439
-LOFAR_PIC_OSRack11_OSSubcluster23_StorageNode69	StorageNode	1440
-LOFAR_PIC_OSRack11_OSSubcluster23_StorageNode70	StorageNode	1441
-LOFAR_PIC_OSRack11_OSSubcluster23_StorageNode71	StorageNode	1442
-LOFAR_PIC_OSRack12_OSSubcluster24_StorageNode72	StorageNode	1443
-LOFAR_PIC_OSRack12_OSSubcluster24_StorageNode73	StorageNode	1444
-LOFAR_PIC_OSRack12_OSSubcluster24_StorageNode74	StorageNode	1445
-LOFAR_PIC_OSRack12_OSSubcluster25_StorageNode75	StorageNode	1446
-LOFAR_PIC_OSRack12_OSSubcluster25_StorageNode76	StorageNode	1447
-LOFAR_PIC_OSRack12_OSSubcluster25_StorageNode77	StorageNode	1448
-LOFAR_PIC_OSRack13_OSSubcluster26_StorageNode78	StorageNode	1449
-LOFAR_PIC_OSRack13_OSSubcluster26_StorageNode79	StorageNode	1450
-LOFAR_PIC_OSRack13_OSSubcluster26_StorageNode80	StorageNode	1451
-LOFAR_PIC_OSRack13_OSSubcluster27_StorageNode81	StorageNode	1452
-LOFAR_PIC_OSRack13_OSSubcluster27_StorageNode82	StorageNode	1453
-LOFAR_PIC_OSRack13_OSSubcluster27_StorageNode83	StorageNode	1454
-LOFAR_PIC_OSRack14_OSSubcluster28_StorageNode84	StorageNode	1455
-LOFAR_PIC_OSRack14_OSSubcluster28_StorageNode85	StorageNode	1456
-LOFAR_PIC_OSRack14_OSSubcluster28_StorageNode86	StorageNode	1457
-LOFAR_PIC_OSRack14_OSSubcluster29_StorageNode87	StorageNode	1458
-LOFAR_PIC_OSRack14_OSSubcluster29_StorageNode88	StorageNode	1459
-LOFAR_PIC_OSRack14_OSSubcluster29_StorageNode89	StorageNode	1460
-LOFAR_PIC_OSRack15_OSSubcluster30_StorageNode90	StorageNode	1461
-LOFAR_PIC_OSRack15_OSSubcluster30_StorageNode91	StorageNode	1462
-LOFAR_PIC_OSRack15_OSSubcluster30_StorageNode92	StorageNode	1463
-LOFAR_PIC_OSRack15_OSSubcluster31_StorageNode93	StorageNode	1464
-LOFAR_PIC_OSRack15_OSSubcluster31_StorageNode94	StorageNode	1465
-LOFAR_PIC_OSRack15_OSSubcluster31_StorageNode95	StorageNode	1466
-LOFAR_PIC_OSRack16_OSSubcluster32_StorageNode96	StorageNode	1467
-LOFAR_PIC_OSRack16_OSSubcluster32_StorageNode97	StorageNode	1468
-LOFAR_PIC_OSRack16_OSSubcluster32_StorageNode98	StorageNode	1469
-LOFAR_PIC_OSRack16_OSSubcluster33_StorageNode100	StorageNode	1470
-LOFAR_PIC_OSRack16_OSSubcluster33_StorageNode101	StorageNode	1471
-LOFAR_PIC_OSRack16_OSSubcluster33_StorageNode99	StorageNode	1472
-LOFAR_PIC_OSRack17_OSSubcluster34_StorageNode102	StorageNode	1473
-LOFAR_PIC_OSRack17_OSSubcluster34_StorageNode103	StorageNode	1474
-LOFAR_PIC_OSRack17_OSSubcluster34_StorageNode104	StorageNode	1475
-LOFAR_PIC_OSRack17_OSSubcluster35_StorageNode105	StorageNode	1476
-LOFAR_PIC_OSRack17_OSSubcluster35_StorageNode106	StorageNode	1477
-LOFAR_PIC_OSRack17_OSSubcluster35_StorageNode107	StorageNode	1478
-LOFAR_PIC_OSRack18_OSSubcluster36_StorageNode108	StorageNode	1479
-LOFAR_PIC_OSRack18_OSSubcluster36_StorageNode109	StorageNode	1480
-LOFAR_PIC_OSRack18_OSSubcluster36_StorageNode110	StorageNode	1481
-LOFAR_PIC_OSRack18_OSSubcluster37_StorageNode111	StorageNode	1482
-LOFAR_PIC_OSRack18_OSSubcluster37_StorageNode112	StorageNode	1483
-LOFAR_PIC_OSRack18_OSSubcluster37_StorageNode113	StorageNode	1484
-LOFAR_PIC_OSRack19_OSSubcluster38_StorageNode114	StorageNode	1485
-LOFAR_PIC_OSRack19_OSSubcluster38_StorageNode115	StorageNode	1486
-LOFAR_PIC_OSRack19_OSSubcluster38_StorageNode116	StorageNode	1487
-LOFAR_PIC_OSRack19_OSSubcluster39_StorageNode117	StorageNode	1488
-LOFAR_PIC_OSRack19_OSSubcluster39_StorageNode118	StorageNode	1489
-LOFAR_PIC_OSRack19_OSSubcluster39_StorageNode119	StorageNode	1490
-LOFAR_PIC_OSRack1_OSSubcluster2	OSSubcluster	1491
-LOFAR_PIC_OSRack1_OSSubcluster2_OfflineNode18	OfflineNode	1492
-LOFAR_PIC_OSRack1_OSSubcluster2_OfflineNode19	OfflineNode	1493
-LOFAR_PIC_OSRack1_OSSubcluster2_OfflineNode20	OfflineNode	1494
-LOFAR_PIC_OSRack1_OSSubcluster2_OfflineNode21	OfflineNode	1495
-LOFAR_PIC_OSRack1_OSSubcluster2_OfflineNode22	OfflineNode	1496
-LOFAR_PIC_OSRack1_OSSubcluster2_OfflineNode23	OfflineNode	1497
-LOFAR_PIC_OSRack1_OSSubcluster2_OfflineNode24	OfflineNode	1498
-LOFAR_PIC_OSRack1_OSSubcluster2_OfflineNode25	OfflineNode	1499
-LOFAR_PIC_OSRack1_OSSubcluster2_OfflineNode26	OfflineNode	1500
-LOFAR_PIC_OSRack1_OSSubcluster2_StorageNode6	StorageNode	1501
-LOFAR_PIC_OSRack1_OSSubcluster2_StorageNode7	StorageNode	1502
-LOFAR_PIC_OSRack1_OSSubcluster2_StorageNode8	StorageNode	1503
-LOFAR_PIC_OSRack1_OSSubcluster3	OSSubcluster	1504
-LOFAR_PIC_OSRack1_OSSubcluster3_OfflineNode27	OfflineNode	1505
-LOFAR_PIC_OSRack1_OSSubcluster3_OfflineNode28	OfflineNode	1506
-LOFAR_PIC_OSRack1_OSSubcluster3_OfflineNode29	OfflineNode	1507
-LOFAR_PIC_OSRack1_OSSubcluster3_OfflineNode30	OfflineNode	1508
-LOFAR_PIC_OSRack1_OSSubcluster3_OfflineNode31	OfflineNode	1509
-LOFAR_PIC_OSRack1_OSSubcluster3_OfflineNode32	OfflineNode	1510
-LOFAR_PIC_OSRack1_OSSubcluster3_OfflineNode33	OfflineNode	1511
-LOFAR_PIC_OSRack1_OSSubcluster3_OfflineNode34	OfflineNode	1512
-LOFAR_PIC_OSRack1_OSSubcluster3_OfflineNode35	OfflineNode	1513
-LOFAR_PIC_OSRack1_OSSubcluster3_StorageNode10	StorageNode	1514
-LOFAR_PIC_OSRack1_OSSubcluster3_StorageNode11	StorageNode	1515
-LOFAR_PIC_OSRack1_OSSubcluster3_StorageNode9	StorageNode	1516
-LOFAR_PIC_OSRack2	OSRack	1517
-LOFAR_PIC_OSRack20_OSSubcluster40_StorageNode120	StorageNode	1518
-LOFAR_PIC_OSRack20_OSSubcluster40_StorageNode121	StorageNode	1519
-LOFAR_PIC_OSRack20_OSSubcluster40_StorageNode122	StorageNode	1520
-LOFAR_PIC_OSRack20_OSSubcluster41_StorageNode123	StorageNode	1521
-LOFAR_PIC_OSRack20_OSSubcluster41_StorageNode124	StorageNode	1522
-LOFAR_PIC_OSRack20_OSSubcluster41_StorageNode125	StorageNode	1523
-LOFAR_PIC_OSRack21_OSSubcluster42_StorageNode126	StorageNode	1524
-LOFAR_PIC_OSRack21_OSSubcluster42_StorageNode127	StorageNode	1525
-LOFAR_PIC_OSRack2_OSSubcluster4	OSSubcluster	1526
-LOFAR_PIC_OSRack2_OSSubcluster4_OfflineNode36	OfflineNode	1527
-LOFAR_PIC_OSRack2_OSSubcluster4_OfflineNode37	OfflineNode	1528
-LOFAR_PIC_OSRack2_OSSubcluster4_OfflineNode38	OfflineNode	1529
-LOFAR_PIC_OSRack2_OSSubcluster4_OfflineNode39	OfflineNode	1530
-LOFAR_PIC_OSRack2_OSSubcluster4_OfflineNode40	OfflineNode	1531
-LOFAR_PIC_OSRack2_OSSubcluster4_OfflineNode41	OfflineNode	1532
-LOFAR_PIC_OSRack2_OSSubcluster4_OfflineNode42	OfflineNode	1533
-LOFAR_PIC_OSRack2_OSSubcluster4_OfflineNode43	OfflineNode	1534
-LOFAR_PIC_OSRack2_OSSubcluster4_OfflineNode44	OfflineNode	1535
-LOFAR_PIC_OSRack2_OSSubcluster4_StorageNode12	StorageNode	1536
-LOFAR_PIC_OSRack2_OSSubcluster4_StorageNode13	StorageNode	1537
-LOFAR_PIC_OSRack2_OSSubcluster4_StorageNode14	StorageNode	1538
-LOFAR_PIC_OSRack2_OSSubcluster5	OSSubcluster	1539
-LOFAR_PIC_OSRack2_OSSubcluster5_OfflineNode45	OfflineNode	1540
-LOFAR_PIC_OSRack2_OSSubcluster5_OfflineNode46	OfflineNode	1541
-LOFAR_PIC_OSRack2_OSSubcluster5_OfflineNode47	OfflineNode	1542
-LOFAR_PIC_OSRack2_OSSubcluster5_OfflineNode48	OfflineNode	1543
-LOFAR_PIC_OSRack2_OSSubcluster5_OfflineNode49	OfflineNode	1544
-LOFAR_PIC_OSRack2_OSSubcluster5_OfflineNode50	OfflineNode	1545
-LOFAR_PIC_OSRack2_OSSubcluster5_OfflineNode51	OfflineNode	1546
-LOFAR_PIC_OSRack2_OSSubcluster5_OfflineNode52	OfflineNode	1547
-LOFAR_PIC_OSRack2_OSSubcluster5_OfflineNode53	OfflineNode	1548
-LOFAR_PIC_OSRack2_OSSubcluster5_StorageNode15	StorageNode	1549
-LOFAR_PIC_OSRack2_OSSubcluster5_StorageNode16	StorageNode	1550
-LOFAR_PIC_OSRack2_OSSubcluster5_StorageNode17	StorageNode	1551
-LOFAR_PIC_OSRack3	OSRack	1552
-LOFAR_PIC_OSRack3_OSSubcluster6	OSSubcluster	1553
-LOFAR_PIC_OSRack3_OSSubcluster6_OfflineNode54	OfflineNode	1554
-LOFAR_PIC_OSRack3_OSSubcluster6_OfflineNode55	OfflineNode	1555
-LOFAR_PIC_OSRack3_OSSubcluster6_OfflineNode56	OfflineNode	1556
-LOFAR_PIC_OSRack3_OSSubcluster6_OfflineNode57	OfflineNode	1557
-LOFAR_PIC_OSRack3_OSSubcluster6_OfflineNode58	OfflineNode	1558
-LOFAR_PIC_OSRack3_OSSubcluster6_OfflineNode59	OfflineNode	1559
-LOFAR_PIC_OSRack3_OSSubcluster6_OfflineNode60	OfflineNode	1560
-LOFAR_PIC_OSRack3_OSSubcluster6_OfflineNode61	OfflineNode	1561
-LOFAR_PIC_OSRack3_OSSubcluster6_OfflineNode62	OfflineNode	1562
-LOFAR_PIC_OSRack3_OSSubcluster6_StorageNode18	StorageNode	1563
-LOFAR_PIC_OSRack3_OSSubcluster6_StorageNode19	StorageNode	1564
-LOFAR_PIC_OSRack3_OSSubcluster6_StorageNode20	StorageNode	1565
-LOFAR_PIC_OSRack3_OSSubcluster7	OSSubcluster	1566
-LOFAR_PIC_OSRack3_OSSubcluster7_OfflineNode63	OfflineNode	1567
-LOFAR_PIC_OSRack3_OSSubcluster7_OfflineNode64	OfflineNode	1568
-LOFAR_PIC_OSRack3_OSSubcluster7_OfflineNode65	OfflineNode	1569
-LOFAR_PIC_OSRack3_OSSubcluster7_OfflineNode66	OfflineNode	1570
-LOFAR_PIC_OSRack3_OSSubcluster7_OfflineNode67	OfflineNode	1571
-LOFAR_PIC_OSRack3_OSSubcluster7_OfflineNode68	OfflineNode	1572
-LOFAR_PIC_OSRack3_OSSubcluster7_OfflineNode69	OfflineNode	1573
-LOFAR_PIC_OSRack3_OSSubcluster7_OfflineNode70	OfflineNode	1574
-LOFAR_PIC_OSRack3_OSSubcluster7_OfflineNode71	OfflineNode	1575
-LOFAR_PIC_OSRack3_OSSubcluster7_StorageNode21	StorageNode	1576
-LOFAR_PIC_OSRack3_OSSubcluster7_StorageNode22	StorageNode	1577
-LOFAR_PIC_OSRack3_OSSubcluster7_StorageNode23	StorageNode	1578
-LOFAR_PIC_OSRack4_OSSubcluster8_OfflineNode72	OfflineNode	1579
-LOFAR_PIC_OSRack4_OSSubcluster8_OfflineNode73	OfflineNode	1580
-LOFAR_PIC_OSRack4_OSSubcluster8_OfflineNode74	OfflineNode	1581
-LOFAR_PIC_OSRack4_OSSubcluster8_OfflineNode75	OfflineNode	1582
-LOFAR_PIC_OSRack4_OSSubcluster8_OfflineNode76	OfflineNode	1583
-LOFAR_PIC_OSRack4_OSSubcluster8_OfflineNode77	OfflineNode	1584
-LOFAR_PIC_OSRack4_OSSubcluster8_OfflineNode78	OfflineNode	1585
-LOFAR_PIC_OSRack4_OSSubcluster8_OfflineNode79	OfflineNode	1586
-LOFAR_PIC_OSRack4_OSSubcluster8_OfflineNode80	OfflineNode	1587
-LOFAR_PIC_OSRack4_OSSubcluster8_StorageNode24	StorageNode	1588
-LOFAR_PIC_OSRack4_OSSubcluster8_StorageNode25	StorageNode	1589
-LOFAR_PIC_OSRack4_OSSubcluster8_StorageNode26	StorageNode	1590
-LOFAR_PIC_OSRack4_OSSubcluster9_OfflineNode81	OfflineNode	1591
-LOFAR_PIC_OSRack4_OSSubcluster9_OfflineNode82	OfflineNode	1592
-LOFAR_PIC_OSRack4_OSSubcluster9_OfflineNode83	OfflineNode	1593
-LOFAR_PIC_OSRack4_OSSubcluster9_OfflineNode84	OfflineNode	1594
-LOFAR_PIC_OSRack4_OSSubcluster9_OfflineNode85	OfflineNode	1595
-LOFAR_PIC_OSRack4_OSSubcluster9_OfflineNode86	OfflineNode	1596
-LOFAR_PIC_OSRack4_OSSubcluster9_OfflineNode87	OfflineNode	1597
-LOFAR_PIC_OSRack4_OSSubcluster9_OfflineNode88	OfflineNode	1598
-LOFAR_PIC_OSRack4_OSSubcluster9_OfflineNode89	OfflineNode	1599
-LOFAR_PIC_OSRack4_OSSubcluster9_StorageNode27	StorageNode	1600
-LOFAR_PIC_OSRack4_OSSubcluster9_StorageNode28	StorageNode	1601
-LOFAR_PIC_OSRack4_OSSubcluster9_StorageNode29	StorageNode	1602
-LOFAR_PIC_OSRack5_OSSubcluster10_OfflineNode90	OfflineNode	1603
-LOFAR_PIC_OSRack5_OSSubcluster10_OfflineNode91	OfflineNode	1604
-LOFAR_PIC_OSRack5_OSSubcluster10_OfflineNode92	OfflineNode	1605
-LOFAR_PIC_OSRack5_OSSubcluster10_OfflineNode93	OfflineNode	1606
-LOFAR_PIC_OSRack5_OSSubcluster10_OfflineNode94	OfflineNode	1607
-LOFAR_PIC_OSRack5_OSSubcluster10_OfflineNode95	OfflineNode	1608
-LOFAR_PIC_OSRack5_OSSubcluster10_OfflineNode96	OfflineNode	1609
-LOFAR_PIC_OSRack5_OSSubcluster10_OfflineNode97	OfflineNode	1610
-LOFAR_PIC_OSRack5_OSSubcluster10_OfflineNode98	OfflineNode	1611
-LOFAR_PIC_OSRack5_OSSubcluster10_StorageNode30	StorageNode	1612
-LOFAR_PIC_OSRack5_OSSubcluster10_StorageNode31	StorageNode	1613
-LOFAR_PIC_OSRack5_OSSubcluster10_StorageNode32	StorageNode	1614
-LOFAR_PIC_OSRack5_OSSubcluster11_OfflineNode100	OfflineNode	1615
-LOFAR_PIC_OSRack5_OSSubcluster11_OfflineNode101	OfflineNode	1616
-LOFAR_PIC_OSRack5_OSSubcluster11_OfflineNode102	OfflineNode	1617
-LOFAR_PIC_OSRack5_OSSubcluster11_OfflineNode103	OfflineNode	1618
-LOFAR_PIC_OSRack5_OSSubcluster11_OfflineNode104	OfflineNode	1619
-LOFAR_PIC_OSRack5_OSSubcluster11_OfflineNode105	OfflineNode	1620
-LOFAR_PIC_OSRack5_OSSubcluster11_OfflineNode106	OfflineNode	1621
-LOFAR_PIC_OSRack5_OSSubcluster11_OfflineNode107	OfflineNode	1622
-LOFAR_PIC_OSRack5_OSSubcluster11_OfflineNode99	OfflineNode	1623
-LOFAR_PIC_OSRack5_OSSubcluster11_StorageNode33	StorageNode	1624
-LOFAR_PIC_OSRack5_OSSubcluster11_StorageNode34	StorageNode	1625
-LOFAR_PIC_OSRack5_OSSubcluster11_StorageNode35	StorageNode	1626
-LOFAR_PIC_OSRack6_OSSubcluster12_OfflineNode108	OfflineNode	1627
-LOFAR_PIC_OSRack6_OSSubcluster12_OfflineNode109	OfflineNode	1628
-LOFAR_PIC_OSRack6_OSSubcluster12_OfflineNode110	OfflineNode	1629
-LOFAR_PIC_OSRack6_OSSubcluster12_OfflineNode111	OfflineNode	1630
-LOFAR_PIC_OSRack6_OSSubcluster12_OfflineNode112	OfflineNode	1631
-LOFAR_PIC_OSRack6_OSSubcluster12_OfflineNode113	OfflineNode	1632
-LOFAR_PIC_OSRack6_OSSubcluster12_OfflineNode114	OfflineNode	1633
-LOFAR_PIC_OSRack6_OSSubcluster12_OfflineNode115	OfflineNode	1634
-LOFAR_PIC_OSRack6_OSSubcluster12_OfflineNode116	OfflineNode	1635
-LOFAR_PIC_OSRack6_OSSubcluster12_StorageNode36	StorageNode	1636
-LOFAR_PIC_OSRack6_OSSubcluster12_StorageNode37	StorageNode	1637
-LOFAR_PIC_OSRack6_OSSubcluster12_StorageNode38	StorageNode	1638
-LOFAR_PIC_OSRack6_OSSubcluster13_OfflineNode117	OfflineNode	1639
-LOFAR_PIC_OSRack6_OSSubcluster13_OfflineNode118	OfflineNode	1640
-LOFAR_PIC_OSRack6_OSSubcluster13_OfflineNode119	OfflineNode	1641
-LOFAR_PIC_OSRack6_OSSubcluster13_OfflineNode120	OfflineNode	1642
-LOFAR_PIC_OSRack6_OSSubcluster13_OfflineNode121	OfflineNode	1643
-LOFAR_PIC_OSRack6_OSSubcluster13_OfflineNode122	OfflineNode	1644
-LOFAR_PIC_OSRack6_OSSubcluster13_OfflineNode123	OfflineNode	1645
-LOFAR_PIC_OSRack6_OSSubcluster13_OfflineNode124	OfflineNode	1646
-LOFAR_PIC_OSRack6_OSSubcluster13_OfflineNode125	OfflineNode	1647
-LOFAR_PIC_OSRack6_OSSubcluster13_StorageNode39	StorageNode	1648
-LOFAR_PIC_OSRack6_OSSubcluster13_StorageNode40	StorageNode	1649
-LOFAR_PIC_OSRack6_OSSubcluster13_StorageNode41	StorageNode	1650
-LOFAR_PIC_OSRack7_OSSubcluster14_OfflineNode126	OfflineNode	1651
-LOFAR_PIC_OSRack7_OSSubcluster14_OfflineNode127	OfflineNode	1652
-LOFAR_PIC_OSRack7_OSSubcluster14_StorageNode42	StorageNode	1653
-LOFAR_PIC_OSRack7_OSSubcluster14_StorageNode43	StorageNode	1654
-LOFAR_PIC_OSRack7_OSSubcluster14_StorageNode44	StorageNode	1655
-LOFAR_PIC_OSRack7_OSSubcluster15_StorageNode45	StorageNode	1656
-LOFAR_PIC_OSRack7_OSSubcluster15_StorageNode46	StorageNode	1657
-LOFAR_PIC_OSRack7_OSSubcluster15_StorageNode47	StorageNode	1658
-LOFAR_PIC_OSRack8_OSSubcluster16_StorageNode48	StorageNode	1659
-LOFAR_PIC_OSRack8_OSSubcluster16_StorageNode49	StorageNode	1660
-LOFAR_PIC_OSRack8_OSSubcluster16_StorageNode50	StorageNode	1661
-LOFAR_PIC_OSRack8_OSSubcluster17_StorageNode51	StorageNode	1662
-LOFAR_PIC_OSRack8_OSSubcluster17_StorageNode52	StorageNode	1663
-LOFAR_PIC_OSRack8_OSSubcluster17_StorageNode53	StorageNode	1664
-LOFAR_PIC_OSRack9_OSSubcluster18_StorageNode54	StorageNode	1665
-LOFAR_PIC_OSRack9_OSSubcluster18_StorageNode55	StorageNode	1666
-LOFAR_PIC_OSRack9_OSSubcluster18_StorageNode56	StorageNode	1667
-LOFAR_PIC_OSRack9_OSSubcluster19_StorageNode57	StorageNode	1668
-LOFAR_PIC_OSRack9_OSSubcluster19_StorageNode58	StorageNode	1669
-LOFAR_PIC_OSRack9_OSSubcluster19_StorageNode59	StorageNode	1670
diff --git a/MAC/Deployment/data/PVSS/create_db_CEP b/MAC/Deployment/data/PVSS/create_db_CEP
deleted file mode 100755
index 418613a8c695563d75b72f1a3a880c82c6543552..0000000000000000000000000000000000000000
--- a/MAC/Deployment/data/PVSS/create_db_CEP
+++ /dev/null
@@ -1,742 +0,0 @@
-#
-# create_db_file : Creates files for generating the PVSS and OTDB contents
-#
-# Copyright (C) 2006
-# ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-# Syntax: genDBbase modulename precompiled_headerfiles
-#
-# The generated files must be manually adjusted before they
-# can be used by genDBcode.
-#
-# $Id: create_db_files 12424 2009-01-12 13:29:18Z coolen $
-#
-VERSION="v1.0"
-
-#
-# SyntaxError msg
-#
-SyntaxError()
-{
-	Msg=$1
-
-	[ -z "${Msg}" ] || echo "ERROR: ${Msg}"
-	echo ""
-	echo "Syntax: $(basename $0) [-d destdir] [-o observation] [-s station]"
-	echo "Syntax: $(basename $0) [-d destdir] [-o observation] [-S]"
-	echo "    destdir      Relative directory where the resultfiles are placed."
-	echo "    observation  Name of an observation. When omitted the datapoints"
-	echo "                 for the permanent software are generated."
-	echo "    station      Name of the station. When omitted the datapoints"
-	echo "                 for the main & CEP database are generated."
-	echo ""
-	exit 1
-}
-
-#
-# cleanlist filename
-#
-# Removes all (partial) comment lines from the file
-cleanlist()
-{
-	cut -d"#" -f1 $1 | awk '{ if (NF > 0) print $0 }'
-}
-
-#
-# concatfile filename
-#
-# concatinates all lines of the file
-concatfile()
-{
-	cleanlist $1 | while read line rest
-	do
-		result=$result":"$line
-		echo $result
-	done | tail -1 | sed "s/^://"
-}
-
-#
-# create_ring_station_list
-#
-create_ring_station_list()
-{
-	# stationname ID stationType ...
-	cleanlist ${STATIONINFOFILE} | awk '{ 
-		if ($3 == "C") {
-			print "Core_"$1
-		}
-		else if ($3 == "R") {
-			print "Remote_"$1
-		}
-		else {
-			print "Europe_"$1
-		}
-	} ' >>/tmp/rslist
-	concatfile /tmp/rslist
-	rm -f /tmp/rslist
-}
-
-#
-# create_wan_switch_list
-#
-create_wan_switch_list()
-{
-	cleanlist ${WANFILE} | while read wan
-	do 
-		cleanlist ${wan}Wan.list | awk -v WAN=${wan} \
-		'{ 
-			print WAN"_"$1 
-		}'
-	done	>>/tmp/wslist
-	concatfile /tmp/wslist
-	rm -f /tmp/wslist
-}
-
-#
-# labelize somename
-#
-# Capitalizes the name preceding initial capitals with an _
-labelize()
-{
-	echo $1 | sed "s/[A-Z][a-z]/_&/g" | sed "s/^_//" | sed "s/\./_/g" | \
-		awk '{ print toupper($1) }'
-}
-
-#
-# substitute_adder
-#
-# syntax of the lines must be: dp dpt
-#
-substitute_adder()
-{
-	awk '
-	{
-		hasAdder=index($1,"@adder@");
-		if (hasAdder > 0) {
-			for (adNr = 0; adNr < 128; adNr++) {  
-				printf "Adder%d	%s\n", adNr, $2;
-			}
-		}
-		else {
-			print $1"	"$2;
-		}
-	} '
-}
-
-substitute_inputbuffer()
-{
-	awk '
-	{
-		hasInputBuffer=index($1,"@inputbuffer@");
-		if (hasInputBuffer > 0) {
-			for (ibNr = 0; ibNr < 128; ibNr++) {  
-				printf "InputBuffer%d	%s\n", ibNr, $2;
-			}
-		}
-		else {
-			print $1"	"$2;
-		}
-	} '
-}
-
-#
-# substitute_BGP
-#
-# syntax of the lines must be: dp dpt
-#
-substitute_BGP()
-{
-	awk '
-	{
-		hasBGP=index($1,"@bgp@");
-		if (hasBGP > 0) {
-			for (bgp=0; bgp<2; bgp++) {
-				dpname=$1;
-				sub("@bgp@", "BGP"bgp, dpname)
-				print dpname"	"$2;
-			}
-		}
-		else {
-			print $1"	"$2;
-		}
-	} '
-}
-
-
-#
-# substitute_BGP_midplane
-#
-# syntax of the lines must be: dp dpt
-#
-substitute_BGP_midplane()
-{
-	awk '
-	{
-		hasBGPMid=index($1,"@bgp@_@midplane@");
-		if (hasBGPMid > 0) {
-			for (midplane=0; midplane<4; midplane++) {
-				dpname=$1;
-				bgp=int(midplane/2)
-				sub("@bgp@_@midplane@", "BGP"bgp"_Midplane"midplane, dpname)
-				print dpname"	"$2;
-			}
-		}
-		else {
-			print $1"	"$2;
-		}
-	} '
-}
-
-
-#
-# substitute_BGP_midplane_ionode
-#
-# syntax of the lines must be: dp dpt
-#
-substitute_BGP_midplane_ionode()
-{
-	awk  '
-	{
-		hasBGPMidIONode=index($1,"@bgp@_@midplane@_@ionode@");
-		if (hasBGPMidIONode > 0) {
-			for (ionode=0; ionode<128; ionode++) {
-				dpname=$1;
-				bgp=int(ionode/64)
-				midplane=int(ionode/32)
-				sub("@bgp@_@midplane@_@ionode@", "BGP"bgp"_Midplane"midplane"_IONode"ionode, dpname)
-				print dpname"	"$2;
-			}
-		}
-		else {
-			print $1"	"$2;
-		}
-	} '
-}
-
-#
-# substitute_osrack
-#
-# syntax of the lines must be: dp dpt
-#
-substitute_osrack()
-{
-	awk '
-	{
-		hasOSRack=index($1,"@osrack@");
-		if (hasOSRack > 0) {
-			for (osr=0; osr<4; osr++) {
-				dpname=$1;
-				sub("@osrack@", "OSRack"osr, dpname)
-				print dpname"	"$2;
-			}
-		}
-		else {
-			print $1"	"$2;
-		}
-	} '
-}
-
-#
-# substitute_osrack_ossubcluster
-#
-# syntax of the lines must be: dp dpt
-#
-substitute_osrack_ossubcluster()
-{
-	awk '
-	{
-		hasOSRSub=index($1,"@osrack@_@ossubcluster@");
-		if (hasOSRSub > 0) {
-			for (osrsub=0; osrsub<8; osrsub++) {
-				dpname=$1;
-				osrack=int(osrsub/2)
-				sub("@osrack@_@ossubcluster@", "OSRack"osrack"_OSSubcluster"osrsub, dpname)
-				print dpname"	"$2;
-			}
-		}
-		else {
-			print $1"	"$2;
-		}
-	} '
-}
-
-#
-# substitute_osrack_ossubcluster_offlinenode
-#
-# syntax of the lines must be: dp dpt
-#
-substitute_osrack_ossubcluster_offlinenode()
-{
-	awk  '
-	{
-		hasOSRSubOff=index($1,"@osrack@_@ossubcluster@_@offlinenode@");
-		if (hasOSRSubOff > 0) {
-			for (offnode=0; offnode<128; offnode++) {
-				dpname=$1;
-				osrack=int(offnode/18)
-				ossub=int(offnode/9)
-				sub("@osrack@_@ossubcluster@_@offlinenode@", "OSRack"osrack"_OSSubcluster"ossub"_OfflineNode"offnode, dpname)
-				print dpname"	"$2;
-			}
-		}
-		else {
-			print $1"	"$2;
-		}
-	} '
-}
-
-#
-# substitute_osrack_ossubcluster_storagenode
-#
-# syntax of the lines must be: dp dpt
-#
-substitute_osrack_ossubcluster_storagenode()
-{
-	awk  '
-	{
-		hasOSRSubStor=index($1,"@osrack@_@ossubcluster@_@storagenode@");
-		if (hasOSRSubStor > 0) {
-			for (stornode=0; stornode<128; stornode++) {
-				dpname=$1;
-				osrack=int(stornode/6)
-				ossub=int(stornode/3)
-				sub("@osrack@_@ossubcluster@_@storagenode@", "OSRack"osrack"_OSSubcluster"ossub"_StorageNode"stornode, dpname)
-				print dpname"	"$2;
-			}
-		}
-		else {
-			print $1"	"$2;
-		}
-	} '
-}
-
-#
-# number_dps
-#
-# add action & datapoint number to dplines
-# 
-number_dps()
-{
-	awk '
-	BEGIN {
-		count = 1000;
-	};
-	{
-		print $1"	"$2"	"count;
-		count+=1;
-	} '
-}
-
-#
-# create_dpt_file inputfile dbtype
-#
-create_dpt_file()
-{
-	rm -f ${ERRORFILE}
-
-	(
-		echo -n "# This file was generated by $(basename $0) ${VERSION} on " ; date
-		echo	""
-		cat PVSSbase.dpdef
-	) >${DESTDIR}/${DPT_FILE}
-
-	prevdpt="abc"
-	cleanlist $1 | sort | while read dpt prefix dbtype dptype leaf dp
-	do
-		if [ "${dbtype}" != "$2" ]; then
-			continue
-		fi
-
-		if [ "${prevdpt}" == "${dpt}" ]; then
-			continue
-		fi
-		prevdpt=${dpt}
-
-		# create PVSStypes
-		echo "TypeName"
-		echo "${dpt}.${dpt}	1#1"
-		let count=2
-		# DPs in the LOFAR tree need an ObjectStatus element
-		if [ "LOFAR${dp#LOFAR}" == "${dp}" ];then
-			echo "	status	41#2:ObjectStatus"
-			let count=count+1
-		fi
-		# Adder and InputBuffer need an ObjectStatus && ProcessStatus element
-		if [ "${dpt}" == "Adder" ];then
-			echo "	status	41#2:ObjectStatus"
-		  	echo "	process	41#3:ProcessStatus"
-			let count=count+2
-		fi
-
-		if [ "${dpt}" == "InputBuffer" ];then
-			echo "	status	41#2:ObjectStatus"
-		  	echo "	process	41#3:ProcessStatus"
-			let count=count+2
-		fi
-
-
-		echo $dp | grep 'SW_' 2>&1 1>/dev/null
-		if [ $? = 0 ]; then
-			if [ ! -f ${dpt}.dpdef ]; then
-				echo "No definition file for ${dpt}" >> ${ERRORFILE}
-			fi
-			if [ "${dpt}" != "CEPObservation" ]; then
-			  echo "	process	41#3:ProcessStatus"
-			  let count=count+1
-			fi
-		fi
-
-		if [ -f ${dpt}.dpdef ]; then
-			let depth=1
-			oldnode=""
-			cleanlist ${dpt}.dpdef | awk -v elemNr=$count ' 
-				BEGIN {  
-					PVSStype["string"]	 = "25"
-					PVSStype["bool"]	 = "23"
-					PVSStype["uint"]	 = "20"
-					PVSStype["int"]		 = "21"
-					PVSStype["float"]	 = "22"
-					PVSStype["double"]	 = "22"
-					PVSStype["stringArr"]= "9"
-					PVSStype["boolArr"]	 = "7"
-					PVSStype["uintArr"]	 = "4"
-					PVSStype["intArr"]	 = "5"
-					PVSStype["floatArr"] = "6"
-					PVSStype["doubleArr"]= "6"
-					tabs="										"
-					oldnode[1]=""
-					prevlevel=0
-				} 
-				{
-					nodename = $1
-					level = 0
-					do {
-						dotpos=index(nodename,".");
-						if (dotpos > 0) {
-							level++;
-							newnode[level]=substr(nodename,0,dotpos-1);
-							nodename = substr(nodename,dotpos+1);
-							dotpos   = index(nodename,".");
-						}
-					} while (dotpos > 0);
-					
-					if (newnode[level] != oldnode[level]) {
-						print substr(tabs, 0, level) newnode[level]"	1#"elemNr;
-						elemNr++;
-						oldnode[level] = newnode[level];
-					}
-					if (substr($2,0,1) == ":") {
-						print substr(tabs, 0, level+1) nodename"	41#"elemNr$2
-					}
-					else {
-						print substr(tabs, 0, level+1) nodename"	"PVSStype[$2]"#"elemNr
-					}
-					elemNr++;
-
-					if (level < prevlevel) {
-						for (l = prevlevel; l > level; l--) {
-							oldnode[l]=""
-						}
-					}
-					prevlevel = level;
-				}'
-		fi
-		echo ""
-
-	done >>${DESTDIR}/${DPT_FILE}
-	echo "created: ${DESTDIR}/${DPT_FILE}"
-
-	# Modify 'leaf' value for some datapoints.
-	(
-		echo	"# Modify the default value for the leaf-field"
-		echo    "ElementName	TypeName	_original.._value	_original.._status"
-	) >${TMP_FILE}
-
-	cleanlist $1 | awk -v dbtype=$2 -v dptype=$3 '{ 
-		if ($3 == dbtype && $4 == dptype && $5 == "Y") {
-			print "_mp_"$1".status.leaf	"$1"	1	0x101"
-		} }' >>${TMP_FILE}
-
-	if [ -f ${ERRORFILE} ]; then
-		echo "ERRORS During creation:"
-		cat ${ERRORFILE}
-		rm -f ${ERRORFILE}
-	fi
-}
-
-#
-# create_dp_file inputfile dbtype dptype
-#
-create_dp_file()
-{
-	(
-		echo	"#"
-		echo -n "# This file was generated by $(basename $0) ${VERSION} on " ; date
-		echo	"#"
-		echo    "DpName	TypeName	ID"
-	) >${DESTDIR}/${DP_FILE}
-
-	# Note: ignore the PermSW_@... lines because they are there only for SAS
-	cleanlist $1 | grep -v "PermSW_@" | awk -v dbtype=$2 -v dptype=$3 '{ 
-		if ($3 == dbtype && $4 == dptype) {
-			print $6"	"$1	
-		} }' | \
-				substitute_adder | \
-				substitute_inputbuffer | \
-				substitute_BGP_midplane_ionode | \
-				substitute_BGP_midplane | \
-				substitute_BGP | \
-				substitute_osrack_ossubcluster_storagenode | \
-				substitute_osrack_ossubcluster_offlinenode | \
-				substitute_osrack_ossubcluster | \
-				substitute_osrack | \
-				sort -k1,1 |\
-				number_dps >>${DESTDIR}/${DP_FILE}
-
-
-	# setup master point and archives 
-	# NOTE: THIS IS ADDED TO THE DataPointTYPES file!
-	prevdpt="abc"
-	cleanlist $1 | sort | while read dpt prefix dbtype dptype leaf dp
-	do
-		if [ "${dbtype}" != "$2" ]; then
-			continue
-		fi
-
-		if [ "${prevdpt}" == "${dpt}" ]; then
-			continue
-		fi
-		prevdpt=${dpt}
-
-		# Create MasterDataPoint for LOFAR tree elements
-		if [ "LOFAR${dp#LOFAR}" == "${dp}" ];then
-			echo "DpName	TypeName	ID"
-			echo "_mp_${dpt}	${dpt}	0"
-			echo "_dt_${dpt}	_DynamicDatapoints	0"
-			echo ""
-		fi
-
-		# if software then create an hourarchive for the logMsg in the MasterDataPoint
-		echo $dp | grep 'SW_' 2>&1 1>/dev/null
-		if [ $? = 0 ]; then
-			if [ "${dpt}" != "CEPObservation" ]; then
-			   echo "ElementName	TypeName	_original.._value	_original.._status"
-			   echo "_dt_${dpt}.Leaf	_DynamicDatapoints	"'"'_mp_${dpt}.logMsg:_archive'"'"	0x101"
-			   echo "_dt_${dpt}.DynamicAttribute	_DynamicDatapoints	"'"'_da_none'"'"	0x101"
-			   echo ""
-
-			   echo "StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class"
-			   echo "0	0	_mp_${dpt}.process.logMsg	${dpt}		45	1"
-			   echo "0	0	_mp_${dpt}.process.logMsg	${dpt}	1	15		_ValueArchive_2"
-			   echo ""
-			fi
-		fi
-
-		# Adder and InputBuffer need an _mp and _dt also, and logMsg set
-		if [ "${dpt}" == "Adder" ];then
-			echo "DpName	TypeName	ID"
-			echo "_mp_${dpt}	${dpt}	0"
-			echo "_dt_${dpt}	_DynamicDatapoints	0"
-			echo ""
-			echo "ElementName	TypeName	_original.._value	_original.._status"
-			echo "_dt_${dpt}.Leaf	_DynamicDatapoints	"'"'_mp_${dpt}.logMsg:_archive'"'"	0x101"
-			echo "_dt_${dpt}.DynamicAttribute	_DynamicDatapoints	"'"'_da_none'"'"	0x101"
-			echo ""
-
-			echo "StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class"
-			echo "0	0	_mp_${dpt}.process.logMsg	${dpt}		45	1"
-			echo "0	0	_mp_${dpt}.process.logMsg	${dpt}	1	15		_ValueArchive_2"
-			echo ""
-		fi
-
-		if [ "${dpt}" == "InputBuffer" ];then
-			echo "DpName	TypeName	ID"
-			echo "_mp_${dpt}	${dpt}	0"
-			echo "_dt_${dpt}	_DynamicDatapoints	0"
-			echo ""
-		   	echo "ElementName	TypeName	_original.._value	_original.._status"
-			echo "_dt_${dpt}.Leaf	_DynamicDatapoints	"'"'_mp_${dpt}.logMsg:_archive'"'"	0x101"
-			echo "_dt_${dpt}.DynamicAttribute	_DynamicDatapoints	"'"'_da_none'"'"	0x101"
-			echo ""
-
-			echo "StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class"
-			echo "0	0	_mp_${dpt}.process.logMsg	${dpt}		45	1"
-			echo "0	0	_mp_${dpt}.process.logMsg	${dpt}	1	15		_ValueArchive_2"
-			echo ""
-		fi
-
-
-
-	done >>${DESTDIR}/${DPT_FILE}
-
-	echo "created: ${DESTDIR}/${DP_FILE}"
-}
-
-#
-# expand_component compname labelprefix DPprefix
-#
-# format COMPONENT_FILE:
-#	comp.comp 1#1
-#		field1	??#2
-#		field2	??#3
-#		...
-expand_component()
-{
-	expanding=false
-	cleanlist $COMPONENT_FILE | while read field fldtype
-	do
-		if [ $expanding == false ]; then
-			if [ $field == $1.$1 ]; then
-				expanding=true
-			fi
-			continue
-		fi
-
-		if [ -z "${fldtype}" ] || [ "${fldtype:0:8}" == "TypeName" ]; then 
-			expanding=false
-			continue
-		fi
-		
-		varlabel=`labelize $2_$field`
-		echo "#define	PN_${varlabel}	\"$3.${field}\""
-	done	
-}
-
-#
-# create_cpp_headerfile inputfile dbtype dptype
-#
-create_cpp_headerfile()
-{
-	# write out the fields of the components
-	(
-		echo "#ifndef LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H"
-		echo "#define LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H"
-		echo "// process"
-		expand_component ProcessStatus "FSM" "process" 
-		echo "// object"
-		expand_component ObjectStatus  "OBJ" "object"
-		echo ""
-	)  >>${DESTDIR}/${CPP_HEADERFILE}
-
-	cleanlist $1 | while read dpt prefix dbtype dptype leaf dp
-	do
-#		if [ "${dbtype}" != "$2" -o "${dptype}" != "$3" ]; then
-#			continue
-#		fi
-
-		if [ $prefix != "-" ]; then
-			label=`labelize ${dpt}`
-			echo "// $dpt"
-			echo "#define PSN_${label}	\"${dp}\""
-			echo "#define PST_${label}	\"${dpt}\""
-			if [ -f ${dpt}.dpdef ]; then
-				cleanlist ${dpt}.dpdef | while read varname vartype
-				do
-					if [ ${vartype:0:1} == ":" ]; then
-						expand_component ${vartype:1} ${prefix}_${varname} ${varname}
-					else
-						varlabel=`labelize ${varname}`
-						echo "#define PN_${prefix}_${varlabel}	\"${varname}\""
-					fi
-				done
-			fi
-			echo ""
-		fi
-	done >>${DESTDIR}/${CPP_HEADERFILE}
-
-	echo "#endif"  >>${DESTDIR}/${CPP_HEADERFILE}
-}
-
-#------------------------------ MAIN program ------------------------------
-#
-# Syntax: create_db_files [-d destdir] [-o observation] 
-#
-
-# setup defaults
-DESTDIR="."
-DPTYPENAME=Perm
-DPTYPE=P
-OBSNAME=""
-DBTYPENAME=CEP
-DBTYPE=C
-STNNAME="CEP"
-
-argv=`getopt "d:o:s:Sh" $*`		# reformat arguments
-#eval set argv=`getopt "d:o:s:Sh" $*`		# reformat arguments
-#shift
-while [ -n "$1" -a "$1" != "--" ]
-do
-	case "$1" in
-		-d)	DESTDIR=$2
-			[ -d ${DESTDIR} ] ||
-				SyntaxError "Destination directory >${DESTDIR}< does not exist"
-			shift 2
-			;;
-		-o) OBSNAME=$2
-			DPTYPENAME=Obs
-			DPTYPE=O
-			shift 2
-			;;
-		-h) SyntaxError
-			;;
-		*) SyntaxError
-			;;
-	esac
-done
-shift				# remove '--'
-
-
-# define the input files
-STATIONINFOFILE=../StaticMetaData/StationInfo.dat
-COMPONENT_FILE=PVSSbase.dpdef
-CLUSTERFILE=Clusters.list
-RINGFILE=Rings.list
-WANFILE=Wan.list
-ERRORFILE=/tmp/Crea.Error
-INPUTFILE=./PVSSDataPoints.base
-
-# define the output files
-CPP_HEADERFILE=PVSSDatapointDefs.h
-DP_FILE=${DBTYPENAME}${DPTYPENAME}Datapoints.dpl
-DPT_FILE=${DBTYPENAME}Datapointtypes.dpl
-TMP_FILE=/tmp/dpts$$.dpl
-
-# construct some lists
-CLUSTERLIST=`concatfile $CLUSTERFILE`
-RINGLIST=`concatfile $RINGFILE`
-RINGSTATIONLIST=`create_ring_station_list`
-WANLIST=`concatfile $WANFILE`
-WANSWITCHLIST=`create_wan_switch_list`
-
-# create the desired files
-create_dpt_file ${INPUTFILE} ${DBTYPE} ${DPTYPE}
-create_dp_file  ${INPUTFILE} ${DBTYPE} ${DPTYPE}
-
-
-#cat ${TMP_FILE} >>${DESTDIR}/${DPT_FILE}
-#rm -f ${TMP_FILE}
-#(
-#	echo -n "// This file was generated by $(basename $0) ${VERSION} on " ; date
-#	echo	""
-#) >${DESTDIR}/${CPP_HEADERFILE}
-#create_cpp_headerfile ${INPUTFILE} ${DBTYPE} ${DPTYPE}
-#echo "created: ${DESTDIR}/${CPP_HEADERFILE}"
-#mkdir -p ../../../../installed/gnu_debug/include/Deployment/
-#cp ${DESTDIR}/${CPP_HEADERFILE} ../../../../installed/gnu_debug/include/Deployment/
-
-
diff --git a/MAC/Deployment/data/PVSS/create_db_files b/MAC/Deployment/data/PVSS/create_db_files
index 63e081a70c5cdbc0fc932ec6ac22d68d28428ca9..769f9fd0486d215c57815e31db9e996a9bddf9de 100755
--- a/MAC/Deployment/data/PVSS/create_db_files
+++ b/MAC/Deployment/data/PVSS/create_db_files
@@ -26,7 +26,7 @@
 #
 # $Id$
 #
-VERSION="v1.0"
+VERSION="v2.0"
 
 #
 # SyntaxError msg
@@ -37,13 +37,13 @@ SyntaxError()
 
 	[ -z "${Msg}" ] || echo "ERROR: ${Msg}"
 	echo ""
-	echo "Syntax: $(basename $0) [-d destdir] [-o observation] [-s station]"
-	echo "Syntax: $(basename $0) [-d destdir] [-o observation] [-S]"
+	echo "Syntax: $(basename $0) [-d destdir] [-o observation] [-s station | -C]"
 	echo "    destdir      Relative directory where the resultfiles are placed."
 	echo "    observation  Name of an observation. When omitted the datapoints"
 	echo "                 for the permanent software are generated."
 	echo "    station      Name of the station. When omitted the datapoints"
 	echo "                 for the main database are generated."
+	echo "    -C           CEP datapoints are created (overrules -s)"
 	echo ""
 	exit 1
 }
@@ -117,6 +117,277 @@ labelize()
 		awk '{ print toupper($1) }'
 }
 
+#
+# substitute_adder
+#
+# syntax of the lines must be: dp dpt
+#
+substitute_adder()
+{
+	awk '
+	{
+		hasAdder=index($1,"@adder@");
+		if (hasAdder > 0) {
+			for (adNr = 0; adNr < 256; adNr++) {  
+				printf "Adder%d	%s\n", adNr, $2;
+			}
+		}
+		else {
+			print $1"	"$2;
+		}
+	} '
+}
+
+#
+# substitute_inputbuffer
+#
+# syntax of the lines must be: dp dpt
+#
+substitute_inputbuffer()
+{
+	awk '
+	{
+		hasInputBuffer=index($1,"@inputbuffer@");
+		if (hasInputBuffer > 0) {
+			for (ibNr = 0; ibNr < 128; ibNr++) {  
+				printf "InputBuffer%d	%s\n", ibNr, $2;
+			}
+		}
+		else {
+			print $1"	"$2;
+		}
+	} '
+}
+
+#
+# substitute_BGP
+#
+# syntax of the lines must be: dp dpt
+#
+substitute_BGP()
+{
+	awk '
+	{
+		hasBGP=index($1,"@bgp@");
+		if (hasBGP > 0) {
+			for (bgp=0; bgp<2; bgp++) {
+				dpname=$1;
+				sub("@bgp@", "BGP"bgp, dpname)
+				print dpname"	"$2;
+			}
+		}
+		else {
+			print $1"	"$2;
+		}
+	} '
+}
+
+#
+# substitute_BGP_midplane
+#
+# syntax of the lines must be: dp dpt
+#
+substitute_BGP_midplane()
+{
+	awk '
+	{
+		hasBGPMid=index($1,"@bgp@_@midplane@");
+		if (hasBGPMid > 0) {
+			for (midplane=0; midplane<4; midplane++) {
+				dpname=$1;
+				bgp=int(midplane/2)
+				sub("@bgp@_@midplane@", "BGP"bgp"_Midplane"midplane, dpname)
+				print dpname"	"$2;
+			}
+		}
+		else {
+			print $1"	"$2;
+		}
+	} '
+}
+
+#
+# substitute_BGP_midplane
+#
+# syntax of the lines must be: dp dpt
+#
+substitute_BGP_midplane()
+{
+	awk '
+	{
+		hasBGPMid=index($1,"@bgp@_@midplane@");
+		if (hasBGPMid > 0) {
+			for (midplane=0; midplane<4; midplane++) {
+				dpname=$1;
+				bgp=int(midplane/2)
+				sub("@bgp@_@midplane@", "BGP"bgp"_Midplane"midplane, dpname)
+				print dpname"	"$2;
+			}
+		}
+		else {
+			print $1"	"$2;
+		}
+	} '
+}
+#
+# substitute_BGP_midplane_ionode		# Adder and InputBuffer need an _mp and _dt also, and logMsg set
+		if [ "${dpt}" == "Adder" ];then
+			echo "DpName	TypeName	ID"
+			echo "_mp_${dpt}	${dpt}	0"
+			echo "_dt_${dpt}	_DynamicDatapoints	0"
+			echo ""
+			echo "ElementName	TypeName	_original.._value	_original.._status"
+			echo "_dt_${dpt}.Leaf	_DynamicDatapoints	"'"'_mp_${dpt}.logMsg:_archive'"'"	0x101"
+			echo "_dt_${dpt}.DynamicAttribute	_DynamicDatapoints	"'"'_da_none'"'"	0x101"
+			echo ""
+
+			echo "StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class"
+			echo "0	0	_mp_${dpt}.process.logMsg	${dpt}		45	1"
+			echo "0	0	_mp_${dpt}.process.logMsg	${dpt}	1	15		_ValueArchive_2"
+			echo ""
+		fi
+
+		if [ "${dpt}" == "InputBuffer" ];then
+			echo "DpName	TypeName	ID"
+			echo "_mp_${dpt}	${dpt}	0"
+			echo "_dt_${dpt}	_DynamicDatapoints	0"
+			echo ""
+		   	echo "ElementName	TypeName	_original.._value	_original.._status"
+			echo "_dt_${dpt}.Leaf	_DynamicDatapoints	"'"'_mp_${dpt}.logMsg:_archive'"'"	0x101"
+			echo "_dt_${dpt}.DynamicAttribute	_DynamicDatapoints	"'"'_da_none'"'"	0x101"
+			echo ""
+
+			echo "StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class"
+			echo "0	0	_mp_${dpt}.process.logMsg	${dpt}		45	1"
+			echo "0	0	_mp_${dpt}.process.logMsg	${dpt}	1	15		_ValueArchive_2"
+			echo ""
+		fi
+
+
+
+
+#
+# syntax of the lines must be: dp dpt
+#
+substitute_BGP_midplane_ionode()
+{
+	awk  '
+	{
+		hasBGPMidIONode=index($1,"@bgp@_@midplane@_@ionode@");
+		if (hasBGPMidIONode > 0) {
+			for (ionode=0; ionode<128; ionode++) {
+				dpname=$1;
+				bgp=int(ionode/64)
+				midplane=int(ionode/32)
+				sub("@bgp@_@midplane@_@ionode@", "BGP"bgp"_Midplane"midplane"_IONode"ionode, dpname)
+				print dpname"	"$2;
+			}
+		}
+		else {
+			print $1"	"$2;
+		}
+	} '
+}
+
+#
+# substitute_osrack
+#
+# syntax of the lines must be: dp dpt
+#
+substitute_osrack()
+{
+	awk '
+	{
+		hasOSRack=index($1,"@osrack@");
+		if (hasOSRack > 0) {
+			for (osr=0; osr<4; osr++) {
+				dpname=$1;
+				sub("@osrack@", "OSRack"osr, dpname)
+				print dpname"	"$2;
+			}
+		}
+		else {
+			print $1"	"$2;
+		}
+	} '
+}
+#
+# substitute_osrack_ossubcluster
+#
+# syntax of the lines must be: dp dpt
+#
+substitute_osrack_ossubcluster()
+{
+	awk '
+	{
+		hasOSRSub=index($1,"@osrack@_@ossubcluster@");
+		if (hasOSRSub > 0) {
+			for (osrsub=0; osrsub<8; osrsub++) {
+				dpname=$1;
+				osrack=int(osrsub/2)
+				sub("@osrack@_@ossubcluster@", "OSRack"osrack"_OSSubcluster"osrsub, dpname)
+				print dpname"	"$2;
+			}
+		}
+		else {
+			print $1"	"$2;
+		}
+	} '
+}
+
+#
+# substitute_osrack_ossubcluster_offlinenode
+#
+# syntax of the lines must be: dp dpt
+#
+substitute_osrack_ossubcluster_offlinenode()
+{
+	awk  '
+	{
+		hasOSRSubOff=index($1,"@osrack@_@ossubcluster@_@offlinenode@");
+		if (hasOSRSubOff > 0) {
+			for (offnode=0; offnode<128; offnode++) {
+				dpname=$1;
+				osrack=int(offnode/18)
+				ossub=int(offnode/9)
+				sub("@osrack@_@ossubcluster@_@offlinenode@", "OSRack"osrack"_OSSubcluster"ossub"_OfflineNode"offnode, dpname)
+				print dpname"	"$2;
+			}
+		}
+		else {
+			print $1"	"$2;
+		}
+	} '
+}
+
+#
+# substitute_osrack_ossubcluster_storagenode
+#
+# syntax of the lines must be: dp dpt
+#
+substitute_osrack_ossubcluster_storagenode()
+{
+	awk  '
+	{
+		hasOSRSubStor=index($1,"@osrack@_@ossubcluster@_@storagenode@");
+		if (hasOSRSubStor > 0) {
+			for (stornode=0; stornode<128; stornode++) {
+				dpname=$1;
+				osrack=int(stornode/6)
+				ossub=int(stornode/3)
+				sub("@osrack@_@ossubcluster@_@storagenode@", "OSRack"osrack"_OSSubcluster"ossub"_StorageNode"stornode, dpname)
+				print dpname"	"$2;
+			}
+		}
+		else {
+			print $1"	"$2;
+		}
+	} '
+}
+
+
+
+
 #
 # substitute_antenna
 #
@@ -473,6 +744,7 @@ substitute_instancenr()
 	} '
 }
 
+
 #
 # number_dps
 #
@@ -493,8 +765,10 @@ number_dps()
 #
 # create_dpt_file inputfile dbtype
 #
+
 create_dpt_file()
 {
+
 	rm -f ${ERRORFILE}
 
 	(
@@ -524,13 +798,27 @@ create_dpt_file()
 			echo "	status	41#2:ObjectStatus"
 			let count=count+1
 		fi
+		# Adder and InputBuffer need an ObjectStatus && ProcessStatus element
+		if [ "${dpt}" == "Adder" ];then
+			echo "	status	41#2:ObjectStatus"
+		  	echo "	process	41#3:ProcessStatus"
+			let count=count+2
+		fi
+
+		if [ "${dpt}" == "InputBuffer" ];then
+			echo "	status	41#2:ObjectStatus"
+		  	echo "	process	41#3:ProcessStatus"
+			let count=count+2
+		fi
 		echo $dp | grep 'SW_' 2>&1 1>/dev/null
 		if [ $? = 0 ]; then
 			if [ ! -f ${dpt}.dpdef ]; then
 				echo "No definition file for ${dpt}" >> ${ERRORFILE}
 			fi
-			echo "	process	41#3:ProcessStatus"
-			let count=count+1
+			if [[ ${dpt} != *Observation ]]; then
+				echo "	process	41#3:ProcessStatus"
+				let count=count+1
+			fi
 		fi
 
 		if [ -f ${dpt}.dpdef ]; then
@@ -642,10 +930,20 @@ create_dp_file()
 				substitute_observation | \
 				substitute_instancenr | \
 				substitute_antenna | \
+				substitute_adder | \
+				substitute_inputbuffer | \
+				substitute_BGP_midplane_ionode | \
+				substitute_BGP_midplane | \
+				substitute_BGP | \
+				substitute_osrack_ossubcluster_storagenode | \
+				substitute_osrack_ossubcluster_offlinenode | \
+				substitute_osrack_ossubcluster | \
+				substitute_osrack | \
 				sort -k1,1 |\
 				number_dps >>${DESTDIR}/${DP_FILE}
 
 	# Setup the values of the antenna datapoints
+
 	if [ $3 == "P" ]; then
 		if [ $NRLBAS -gt 0 -o $NRHBAS -gt 0 ]; then
 		(
@@ -708,6 +1006,26 @@ create_dp_file()
 		# if software then create an hourarchive for the logMsg in the MasterDataPoint
 		echo $dp | grep 'SW_' 2>&1 1>/dev/null
 		if [ $? = 0 ]; then
+			if [[ ${dpt} != *Observation ]]; then
+				echo "ElementName	TypeName	_original.._value	_original.._status"
+				echo "_dt_${dpt}.Leaf	_DynamicDatapoints	"'"'_mp_${dpt}.logMsg:_archive'"'"	0x101"
+				echo "_dt_${dpt}.DynamicAttribute	_DynamicDatapoints	"'"'_da_none'"'"	0x101"
+				echo ""
+
+				echo "StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class"
+				echo "0	0	_mp_${dpt}.process.logMsg	${dpt}		45	1"
+				echo "0	0	_mp_${dpt}.process.logMsg	${dpt}	1	15		_ValueArchive_2"
+				echo ""
+			fi
+		fi
+
+
+		# Adder and InputBuffer need an _mp and _dt also, and logMsg set
+		if [ "${dpt}" == "Adder" ];then
+			echo "DpName	TypeName	ID"
+			echo "_mp_${dpt}	${dpt}	0"
+			echo "_dt_${dpt}	_DynamicDatapoints	0"
+			echo ""
 			echo "ElementName	TypeName	_original.._value	_original.._status"
 			echo "_dt_${dpt}.Leaf	_DynamicDatapoints	"'"'_mp_${dpt}.logMsg:_archive'"'"	0x101"
 			echo "_dt_${dpt}.DynamicAttribute	_DynamicDatapoints	"'"'_da_none'"'"	0x101"
@@ -718,6 +1036,26 @@ create_dp_file()
 			echo "0	0	_mp_${dpt}.process.logMsg	${dpt}	1	15		_ValueArchive_2"
 			echo ""
 		fi
+
+		if [ "${dpt}" == "InputBuffer" ];then
+			echo "DpName	TypeName	ID"
+			echo "_mp_${dpt}	${dpt}	0"
+			echo "_dt_${dpt}	_DynamicDatapoints	0"
+			echo ""
+		   	echo "ElementName	TypeName	_original.._value	_original.._status"
+			echo "_dt_${dpt}.Leaf	_DynamicDatapoints	"'"'_mp_${dpt}.logMsg:_archive'"'"	0x101"
+			echo "_dt_${dpt}.DynamicAttribute	_DynamicDatapoints	"'"'_da_none'"'"	0x101"
+			echo ""
+
+			echo "StampSec	StampMSec	ElementName	TypeName	DetailNr	_archive.._type	_archive.._archive	_archive.._class"
+			echo "0	0	_mp_${dpt}.process.logMsg	${dpt}		45	1"
+			echo "0	0	_mp_${dpt}.process.logMsg	${dpt}	1	15		_ValueArchive_2"
+			echo ""
+		fi
+
+
+
+
 	done >>${DESTDIR}/${DPT_FILE}
 
 	echo "created: ${DESTDIR}/${DP_FILE}"
@@ -800,7 +1138,7 @@ create_cpp_headerfile()
 
 #------------------------------ MAIN program ------------------------------
 #
-# Syntax: create_db_files [-d destdir] [-o observation] [-s station]
+# Syntax: create_db_files [-d destdir] [-o observation] [-s station | -C]
 #
 
 # setup defaults
@@ -812,8 +1150,8 @@ DBTYPENAME=Main
 DBTYPE=M
 STNNAME="Station"
 
-argv=`getopt "d:o:s:Sh" $*`		# reformat arguments
-#eval set argv=`getopt "d:o:s:Sh" $*`		# reformat arguments
+argv=`getopt "d:o:s:Ch" $*`		# reformat arguments
+#eval set argv=`getopt "d:o:s:Ch" $*`		# reformat arguments
 #shift
 while [ -n "$1" -a "$1" != "--" ]
 do
@@ -833,14 +1171,15 @@ do
 			DBTYPE=S
 			shift 2
 			;;
-		-S) DBTYPENAME=Station
-			DBTYPE=S
+		-C) DBTYPENAME=CEP
+			DBTYPE=C
 			shift 1
 			;;
 		-h) SyntaxError
 			;;
 		*) SyntaxError
 			;;
+
 	esac
 done
 shift				# remove '--'
@@ -867,9 +1206,14 @@ RINGLIST=`concatfile $RINGFILE`
 RINGSTATIONLIST=`create_ring_station_list`
 WANLIST=`concatfile $WANFILE`
 WANSWITCHLIST=`create_wan_switch_list`
-let NRRSPBOARDS=`grep -s ${STNNAME}[[:space:]] ${STATIONINFOFILE} | awk '{ print $7 }'`
-let NRLBAS=`grep -s ${STNNAME}[[:space:]] ${STATIONINFOFILE} | awk '{ print $9 }'`
-let NRHBAS=`grep -s ${STNNAME}[[:space:]] ${STATIONINFOFILE} | awk '{ print $10 }'`
+let NRRSPBOARDS=0
+let NRLBAS=0
+let NRHBAS=0
+if [ "${DBTYPE}" == "S" ]; then
+	let NRRSPBOARDS=`grep -s ${STNNAME}[[:space:]]  ${STATIONINFOFILE} | awk '{ print $7 }'`
+	let NRLBAS=`grep -s ${STNNAME}[[:space:]] ${STATIONINFOFILE} | awk '{ print $9 }'`
+	let NRHBAS=`grep -s ${STNNAME}[[:space:]] ${STATIONINFOFILE} | awk '{ print $10 }'`
+fi
 
 # create the desired files
 create_dpt_file ${INPUTFILE} ${DBTYPE} ${DPTYPE}