diff --git a/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.cc b/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.cc
index ce344654eff95c7ff1e3e7d01b56ae74f304599e..f2934a228ad9991a50d0eb34f628c8b132664392 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.cc
+++ b/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.cc
@@ -255,12 +255,8 @@ GCFEvent::TResult ECMonitor::createPropertySets(GCFEvent& event, GCFPortInterfac
// resize vectors.
itsCabs.resize (itsNrCabs, 0);
- string mainDB(PVSSinfo::getMainDBName()+":");
- string stationNameMask(mainDB+createPropertySetName(PSN_STATION, getName()));
-// LOG_DEBUG_STR("stationNameMask=" << stationNameMask);
- string PSname(formatString(stationNameMask.c_str(), 0));
-// LOG_DEBUG_STR("PSname=" << PSname);
- itsStation = new RTDBPropertySet(PSname, PST_STATION, PSAT_WO | PSAT_CW, this);
+ string PSname(createPropertySetName(PSN_STATION_INFO, getName()));
+ itsStation = new RTDBPropertySet(PSname, PST_STATION_INFO, PSAT_WO | PSAT_CW, this);
itsStation->setConfirmation(false);
string cabNameMask(createPropertySetName(PSN_CABINET, getName()));
@@ -526,10 +522,10 @@ GCFEvent::TResult ECMonitor::askStatus(GCFEvent& event, GCFPortInterface& port)
}
bState = (sts_stat.power & STS_POWER48_ON);
- itsStation->setValue(PN_STS_POWER48_ON, GCFPVBool(bState), 0.0, false);
+ itsStation->setValue(PN_STI_POWER48_ON, GCFPVBool(bState), 0.0, false);
bState = (sts_stat.power & STS_POWER220_ON);
- itsStation->setValue(PN_STS_POWER220_ON, GCFPVBool(bState), 0.0, false);
+ itsStation->setValue(PN_STI_POWER220_ON, GCFPVBool(bState), 0.0, false);
//bState = (sts_stat.lightning & STS_LIGHTNING);
//itsStation->setValue(PN_STS_LIGHTNING, GCFPVBool(bState), 0.0, false);
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/PVSSDatapointDefs.h b/MAC/APL/StationCU/src/HardwareMonitor/PVSSDatapointDefs.h
index 6cb9a56637b40cf1db0fbe4912dd8035d51caac7..6ac3f4355be0d3bb48a72c35bb9398d5830f1a9d 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/PVSSDatapointDefs.h
+++ b/MAC/APL/StationCU/src/HardwareMonitor/PVSSDatapointDefs.h
@@ -1,4 +1,4 @@
-// This file was generated by create_db_files v2.0 on Mon Apr 26 01:38:02 UTC 2010
+// This file was generated by create_db_files v2.0 on Tue Oct 9 12:42:34 UTC 2012
#ifndef LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H
#define LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H
@@ -15,18 +15,6 @@
#define PN_OBJ_MESSAGE "object.message"
#define PN_OBJ_LEAF "object.leaf"
-// Station
-#define PSN_STATION "LOFAR_PIC_@ring@_@station@"
-#define PST_STATION "Station"
-#define PN_STS_POWER48_ON "power48On"
-#define PN_STS_POWER220_ON "power220On"
-
-// Station
-#define PSN_STATION "LOFAR_PermSW_@ring@_@station@"
-#define PST_STATION "Station"
-#define PN_STS_POWER48_ON "power48On"
-#define PN_STS_POWER220_ON "power220On"
-
// MACScheduler
#define PSN_MAC_SCHEDULER "LOFAR_PermSW_MACScheduler"
#define PST_MAC_SCHEDULER "MACScheduler"
@@ -37,6 +25,10 @@
#define PN_MS_OTDB_LAST_POLL "OTDB.lastPoll"
#define PN_MS_OTDB_POLLINTERVAL "OTDB.pollinterval"
+// CRTriggerControl
+#define PSN_CR_TRIGGER_CONTROL "LOFAR_PermSW_CRTriggerControl"
+#define PST_CR_TRIGGER_CONTROL "CRTriggerControl"
+
// Observation
#define PSN_OBSERVATION "LOFAR_ObsSW_@observation@"
#define PST_OBSERVATION "Observation"
@@ -53,6 +45,9 @@
#define PN_OBS_SAMPLE_CLOCK "sampleClock"
#define PN_OBS_RUN_STATE "runState"
#define PN_OBS_MEASUREMENT_SET "measurementSet"
+#define PN_OBS_PROCESS_TYPE "processType"
+#define PN_OBS_PROCESS_SUBTYPE "processSubtype"
+#define PN_OBS_STRATEGY "strategy"
#define PN_OBS_STATION_LIST "stationList"
#define PN_OBS_INPUT_NODE_LIST "inputNodeList"
#define PN_OBS_BGL_NODE_LIST "BGLNodeList"
@@ -60,24 +55,24 @@
#define PN_OBS_BEAMS_ANGLE1 "Beams.angle1"
#define PN_OBS_BEAMS_ANGLE2 "Beams.angle2"
#define PN_OBS_BEAMS_DIRECTION_TYPE "Beams.directionType"
-#define PN_OBS_BEAMS_BEAMLET_LIST "Beams.beamletList"
#define PN_OBS_BEAMS_SUBBAND_LIST "Beams.subbandList"
+#define PN_OBS_TIED_ARRAY_BEAMS_BEAM_INDEX "TiedArrayBeams.beamIndex"
+#define PN_OBS_TIED_ARRAY_BEAMS_ANGLE1 "TiedArrayBeams.angle1"
+#define PN_OBS_TIED_ARRAY_BEAMS_ANGLE2 "TiedArrayBeams.angle2"
+#define PN_OBS_TIED_ARRAY_BEAMS_DIRECTION_TYPE "TiedArrayBeams.directionType"
+#define PN_OBS_TIED_ARRAY_BEAMS_DISPERSION "TiedArrayBeams.dispersion"
+#define PN_OBS_TIED_ARRAY_BEAMS_COHERENT "TiedArrayBeams.coherent"
// ObservationControl
#define PSN_OBSERVATION_CONTROL "LOFAR_ObsSW_@observation@_ObservationControl"
#define PST_OBSERVATION_CONTROL "ObservationControl"
-
-// Adder
-#define PSN_ADDER "@adder@"
-#define PST_ADDER "Adder"
-#define PN_ADD_DROPPING "dropping"
-#define PN_ADD_NR_BLOCKS_DROPPED "nrBlocksDropped"
-#define PN_ADD_LOG_LINE "logLine"
+#define PN_OBSCTRL_COMMAND "command"
// InputBuffer
-#define PSN_INPUT_BUFFER "@inputbuffer@"
+#define PSN_INPUT_BUFFER "LOFAR_PermSW_@psionode@_InputBuffer"
#define PST_INPUT_BUFFER "InputBuffer"
#define PN_IPB_STATION_NAME "stationName"
+#define PN_IPB_OBSERVATION_NAME "observationName"
#define PN_IPB_STREAM0_BLOCKS_IN "stream0.blocksIn"
#define PN_IPB_STREAM0_PERC_BAD "stream0.percBad"
#define PN_IPB_STREAM0_REJECTED "stream0.rejected"
@@ -93,12 +88,55 @@
#define PN_IPB_LATE "late"
#define PN_IPB_IO_TIME "IOTime"
-// Storage
-#define PSN_STORAGE "@storage@"
-#define PST_STORAGE "Storage"
-#define PN_STR_TIME "time"
-#define PN_STR_COUNT "count"
-#define PN_STR_DROPPED "dropped"
+// Adder
+#define PSN_ADDER "LOFAR_ObsSW_@osionode@_@adder@"
+#define PST_ADDER "Adder"
+#define PN_ADD_DROPPING "dropping"
+#define PN_ADD_DROPPED "dropped"
+#define PN_ADD_DATA_PRODUCT_TYPE "dataProductType"
+#define PN_ADD_DATA_PRODUCT "dataProduct"
+#define PN_ADD_FILE_NAME "fileName"
+#define PN_ADD_LOCUS_NODE "locusNode"
+#define PN_ADD_WRITER "writer"
+#define PN_ADD_DIRECTORY "directory"
+#define PN_ADD_OBSERVATION_NAME "observationName"
+
+// Writer
+#define PSN_WRITER "LOFAR_ObsSW_@oslocusnode@_@writer@"
+#define PST_WRITER "Writer"
+#define PN_WTR_WRITTEN "written"
+#define PN_WTR_DROPPED "dropped"
+#define PN_WTR_FILE_NAME "fileName"
+#define PN_WTR_DATA_RATE "dataRate"
+#define PN_WTR_DATA_PRODUCT_TYPE "dataProductType"
+#define PN_WTR_OBSERVATION_NAME "observationName"
+
+// IONode
+#define PSN_IO_NODE "LOFAR_PIC_BGP_@midplane@_@ionode@"
+#define PST_IO_NODE "IONode"
+#define PN_ION_STATION0 "station0"
+#define PN_ION_IP0 "IP0"
+#define PN_ION_MAC0 "MAC0"
+#define PN_ION_STATION1 "station1"
+#define PN_ION_IP1 "IP1"
+#define PN_ION_MAC1 "MAC1"
+#define PN_ION_USE2ND_STATION "use2ndStation"
+#define PN_ION_USED_STATION "usedStation"
+#define PN_ION_USEDIP "usedIP"
+#define PN_ION_USEDMAC "usedMAC"
+
+// LocusNode
+#define PSN_LOCUS_NODE "LOFAR_PIC_@osrack@_@locusnode@"
+#define PST_LOCUS_NODE "LocusNode"
+#define PN_LCN_FREE "free"
+#define PN_LCN_TOTAL "total"
+#define PN_LCN_CLAIMED "claimed"
+
+// CEPHardwareMonitor
+#define PSN_CEP_HARDWARE_MONITOR "LOFAR_PermSW_CEPHardwareMonitor"
+#define PST_CEP_HARDWARE_MONITOR "CEPHardwareMonitor"
+#define PN_CHM_BGP_CONNECTED "BGP.connected"
+#define PN_CHM_CLUSTER_CONNECTED "Cluster.connected"
// Cabinet
#define PSN_CABINET "LOFAR_PIC_@cabinet@"
@@ -155,6 +193,8 @@
#define PN_RSP_VOLTAGE25 "voltage25"
#define PN_RSP_VOLTAGE33 "voltage33"
#define PN_RSP_VERSION "version"
+#define PN_RSP_BITMODE "bitmode"
+#define PN_RSP_BITMODE_CAPABILITY "bitmodeCapability"
#define PN_RSP_ALERT "alert"
#define PN_RSP_SPLITTER_ON "splitterOn"
#define PN_RSP__ETHERNET_STATUS_STATE "Ethernet.status.state"
@@ -273,6 +313,184 @@
#define PN_TBB_IMAGE_INFO_TP_FILE "imageInfo.TPFile"
#define PN_TBB_IMAGE_INFO_MP_FILE "imageInfo.MPFile"
+// LBAAntenna
+#define PSN_LBA_ANTENNA "LOFAR_PIC_@lbaantenna@"
+#define PST_LBA_ANTENNA "LBAAntenna"
+#define PN_LBA_COMMON_RCUX "common.RCUX"
+#define PN_LBA_COMMON_RCUY "common.RCUY"
+#define PN_LBA_COMMON_DELTAX "common.deltaX"
+#define PN_LBA_COMMON_DELTAY "common.deltaY"
+#define PN_LBA_COMMON_DELTAZ "common.deltaZ"
+
+// HBAAntenna
+#define PSN_HBA_ANTENNA "LOFAR_PIC_@hbaantenna@"
+#define PST_HBA_ANTENNA "HBAAntenna"
+#define PN_HBA_COMMON_RCUX "common.RCUX"
+#define PN_HBA_COMMON_RCUY "common.RCUY"
+#define PN_HBA_COMMON_DELTAX "common.deltaX"
+#define PN_HBA_COMMON_DELTAY "common.deltaY"
+#define PN_HBA_COMMON_DELTAZ "common.deltaZ"
+#define PN_HBA_ELEMENT00_STATUS "element00.status"
+#define PN_HBA_ELEMENT00_X "element00.X"
+#define PN_HBA_ELEMENT00_STATUS "element00.status"
+#define PN_HBA_ELEMENT00_Y "element00.Y"
+#define PN_HBA_ELEMENT00_STATUS "element00.status"
+#define PN_HBA_ELEMENT00_COMM "element00.comm"
+#define PN_HBA_ELEMENT00_STATUS "element00.status"
+#define PN_HBA_ELEMENT01_STATUS "element01.status"
+#define PN_HBA_ELEMENT01_X "element01.X"
+#define PN_HBA_ELEMENT01_STATUS "element01.status"
+#define PN_HBA_ELEMENT01_Y "element01.Y"
+#define PN_HBA_ELEMENT01_STATUS "element01.status"
+#define PN_HBA_ELEMENT01_COMM "element01.comm"
+#define PN_HBA_ELEMENT01_STATUS "element01.status"
+#define PN_HBA_ELEMENT02_STATUS "element02.status"
+#define PN_HBA_ELEMENT02_X "element02.X"
+#define PN_HBA_ELEMENT02_STATUS "element02.status"
+#define PN_HBA_ELEMENT02_Y "element02.Y"
+#define PN_HBA_ELEMENT02_STATUS "element02.status"
+#define PN_HBA_ELEMENT02_COMM "element02.comm"
+#define PN_HBA_ELEMENT02_STATUS "element02.status"
+#define PN_HBA_ELEMENT03_STATUS "element03.status"
+#define PN_HBA_ELEMENT03_X "element03.X"
+#define PN_HBA_ELEMENT03_STATUS "element03.status"
+#define PN_HBA_ELEMENT03_Y "element03.Y"
+#define PN_HBA_ELEMENT03_STATUS "element03.status"
+#define PN_HBA_ELEMENT03_COMM "element03.comm"
+#define PN_HBA_ELEMENT03_STATUS "element03.status"
+#define PN_HBA_ELEMENT04_STATUS "element04.status"
+#define PN_HBA_ELEMENT04_X "element04.X"
+#define PN_HBA_ELEMENT04_STATUS "element04.status"
+#define PN_HBA_ELEMENT04_Y "element04.Y"
+#define PN_HBA_ELEMENT04_STATUS "element04.status"
+#define PN_HBA_ELEMENT04_COMM "element04.comm"
+#define PN_HBA_ELEMENT04_STATUS "element04.status"
+#define PN_HBA_ELEMENT05_STATUS "element05.status"
+#define PN_HBA_ELEMENT05_X "element05.X"
+#define PN_HBA_ELEMENT05_STATUS "element05.status"
+#define PN_HBA_ELEMENT05_Y "element05.Y"
+#define PN_HBA_ELEMENT05_STATUS "element05.status"
+#define PN_HBA_ELEMENT05_COMM "element05.comm"
+#define PN_HBA_ELEMENT05_STATUS "element05.status"
+#define PN_HBA_ELEMENT06_STATUS "element06.status"
+#define PN_HBA_ELEMENT06_X "element06.X"
+#define PN_HBA_ELEMENT06_STATUS "element06.status"
+#define PN_HBA_ELEMENT06_Y "element06.Y"
+#define PN_HBA_ELEMENT06_STATUS "element06.status"
+#define PN_HBA_ELEMENT06_COMM "element06.comm"
+#define PN_HBA_ELEMENT06_STATUS "element06.status"
+#define PN_HBA_ELEMENT07_STATUS "element07.status"
+#define PN_HBA_ELEMENT07_X "element07.X"
+#define PN_HBA_ELEMENT07_STATUS "element07.status"
+#define PN_HBA_ELEMENT07_Y "element07.Y"
+#define PN_HBA_ELEMENT07_STATUS "element07.status"
+#define PN_HBA_ELEMENT07_COMM "element07.comm"
+#define PN_HBA_ELEMENT07_STATUS "element07.status"
+#define PN_HBA_ELEMENT08_STATUS "element08.status"
+#define PN_HBA_ELEMENT08_X "element08.X"
+#define PN_HBA_ELEMENT08_STATUS "element08.status"
+#define PN_HBA_ELEMENT08_Y "element08.Y"
+#define PN_HBA_ELEMENT08_STATUS "element08.status"
+#define PN_HBA_ELEMENT08_COMM "element08.comm"
+#define PN_HBA_ELEMENT08_STATUS "element08.status"
+#define PN_HBA_ELEMENT09_STATUS "element09.status"
+#define PN_HBA_ELEMENT09_X "element09.X"
+#define PN_HBA_ELEMENT09_STATUS "element09.status"
+#define PN_HBA_ELEMENT09_Y "element09.Y"
+#define PN_HBA_ELEMENT09_STATUS "element09.status"
+#define PN_HBA_ELEMENT09_COMM "element09.comm"
+#define PN_HBA_ELEMENT09_STATUS "element09.status"
+#define PN_HBA_ELEMENT10_STATUS "element10.status"
+#define PN_HBA_ELEMENT10_X "element10.X"
+#define PN_HBA_ELEMENT10_STATUS "element10.status"
+#define PN_HBA_ELEMENT10_Y "element10.Y"
+#define PN_HBA_ELEMENT10_STATUS "element10.status"
+#define PN_HBA_ELEMENT10_COMM "element10.comm"
+#define PN_HBA_ELEMENT10_STATUS "element10.status"
+#define PN_HBA_ELEMENT11_STATUS "element11.status"
+#define PN_HBA_ELEMENT11_X "element11.X"
+#define PN_HBA_ELEMENT11_STATUS "element11.status"
+#define PN_HBA_ELEMENT11_Y "element11.Y"
+#define PN_HBA_ELEMENT11_STATUS "element11.status"
+#define PN_HBA_ELEMENT11_COMM "element11.comm"
+#define PN_HBA_ELEMENT11_STATUS "element11.status"
+#define PN_HBA_ELEMENT12_STATUS "element12.status"
+#define PN_HBA_ELEMENT12_X "element12.X"
+#define PN_HBA_ELEMENT12_STATUS "element12.status"
+#define PN_HBA_ELEMENT12_Y "element12.Y"
+#define PN_HBA_ELEMENT12_STATUS "element12.status"
+#define PN_HBA_ELEMENT12_COMM "element12.comm"
+#define PN_HBA_ELEMENT12_STATUS "element12.status"
+#define PN_HBA_ELEMENT13_STATUS "element13.status"
+#define PN_HBA_ELEMENT13_X "element13.X"
+#define PN_HBA_ELEMENT13_STATUS "element13.status"
+#define PN_HBA_ELEMENT13_Y "element13.Y"
+#define PN_HBA_ELEMENT13_STATUS "element13.status"
+#define PN_HBA_ELEMENT13_COMM "element13.comm"
+#define PN_HBA_ELEMENT13_STATUS "element13.status"
+#define PN_HBA_ELEMENT14_STATUS "element14.status"
+#define PN_HBA_ELEMENT14_X "element14.X"
+#define PN_HBA_ELEMENT14_STATUS "element14.status"
+#define PN_HBA_ELEMENT14_Y "element14.Y"
+#define PN_HBA_ELEMENT14_STATUS "element14.status"
+#define PN_HBA_ELEMENT14_COMM "element14.comm"
+#define PN_HBA_ELEMENT14_STATUS "element14.status"
+#define PN_HBA_ELEMENT15_STATUS "element15.status"
+#define PN_HBA_ELEMENT15_X "element15.X"
+#define PN_HBA_ELEMENT15_STATUS "element15.status"
+#define PN_HBA_ELEMENT15_Y "element15.Y"
+#define PN_HBA_ELEMENT15_STATUS "element15.status"
+#define PN_HBA_ELEMENT15_COMM "element15.comm"
+#define PN_HBA_ELEMENT15_STATUS "element15.status"
+
+// StationInfo
+#define PSN_STATION_INFO "LOFAR_PIC_StationInfo"
+#define PST_STATION_INFO "StationInfo"
+#define PN_STI_STATIONID "stationID"
+#define PN_STI_N_RSP_BOARDS "N_RSPBoards"
+#define PN_STI_N_TB_BOARDS "N_TBBoards"
+#define PN_STI_N_LBAS "N_LBAS"
+#define PN_STI_N_HBAS "N_HBAS"
+#define PN_STI_HBA__SPLIT "HBA_Split"
+#define PN_STI_WIDE_LBAS "wide_LBAS"
+#define PN_STI_POWER48_ON "power48On"
+#define PN_STI_POWER220_ON "power220On"
+#define PN_STI_CABINET_X "Cabinet.X"
+#define PN_STI_CABINET_Y "Cabinet.Y"
+#define PN_STI_CABINET_Z "Cabinet.Z"
+#define PN_STI_HBA_CENTERX "HBA.centerX"
+#define PN_STI_HBA_CENTERY "HBA.centerY"
+#define PN_STI_HBA_CENTERZ "HBA.centerZ"
+#define PN_STI_HBA_HBA0_CENTERX "HBA.HBA0.centerX"
+#define PN_STI_HBA_HBA0_CENTERY "HBA.HBA0.centerY"
+#define PN_STI_HBA_HBA0_CENTERZ "HBA.HBA0.centerZ"
+#define PN_STI_HBA_HBA0__NORMAL_VECTOR_X "HBA.HBA0.NormalVector.X"
+#define PN_STI_HBA_HBA0__NORMAL_VECTOR_Y "HBA.HBA0.NormalVector.Y"
+#define PN_STI_HBA_HBA0__NORMAL_VECTOR_Z "HBA.HBA0.NormalVector.Z"
+#define PN_STI_HBA_HBA0__ROTATION_MATRIX_X "HBA.HBA0.RotationMatrix.X"
+#define PN_STI_HBA_HBA0__ROTATION_MATRIX_Y "HBA.HBA0.RotationMatrix.Y"
+#define PN_STI_HBA_HBA0__ROTATION_MATRIX_Z "HBA.HBA0.RotationMatrix.Z"
+#define PN_STI_HBA_HBA0_ROTATION "HBA.HBA0.rotation"
+#define PN_STI_HBA_HBA1_CENTERX "HBA.HBA1.centerX"
+#define PN_STI_HBA_HBA1_CENTERY "HBA.HBA1.centerY"
+#define PN_STI_HBA_HBA1_CENTERZ "HBA.HBA1.centerZ"
+#define PN_STI_HBA_HBA1__NORMAL_VECTOR_X "HBA.HBA1.NormalVector.X"
+#define PN_STI_HBA_HBA1__NORMAL_VECTOR_Y "HBA.HBA1.NormalVector.Y"
+#define PN_STI_HBA_HBA1__NORMAL_VECTOR_Z "HBA.HBA1.NormalVector.Z"
+#define PN_STI_HBA_HBA1__ROTATION_MATRIX_X "HBA.HBA1.RotationMatrix.X"
+#define PN_STI_HBA_HBA1__ROTATION_MATRIX_Y "HBA.HBA1.RotationMatrix.Y"
+#define PN_STI_HBA_HBA1__ROTATION_MATRIX_Z "HBA.HBA1.RotationMatrix.Z"
+#define PN_STI_HBA_HBA1_ROTATION "HBA.HBA1.rotation"
+#define PN_STI_LBA_CENTERX "LBA.centerX"
+#define PN_STI_LBA_CENTERY "LBA.centerY"
+#define PN_STI_LBA_CENTERZ "LBA.centerZ"
+#define PN_STI_LBA__NORMAL_VECTOR_X "LBA.NormalVector.X"
+#define PN_STI_LBA__NORMAL_VECTOR_Y "LBA.NormalVector.Y"
+#define PN_STI_LBA__NORMAL_VECTOR_Z "LBA.NormalVector.Z"
+#define PN_STI_LBA__ROTATION_MATRIX_X "LBA.RotationMatrix.X"
+#define PN_STI_LBA__ROTATION_MATRIX_Y "LBA.RotationMatrix.Y"
+#define PN_STI_LBA__ROTATION_MATRIX_Z "LBA.RotationMatrix.Z"
+
// LogProcessor
#define PSN_LOG_PROCESSOR "LOFAR_PermSW_Daemons_LogProcessor"
#define PST_LOG_PROCESSOR "LogProcessor"
@@ -291,6 +509,7 @@
// SoftwareMonitor
#define PSN_SOFTWARE_MONITOR "LOFAR_PermSW_SoftwareMonitor"
#define PST_SOFTWARE_MONITOR "SoftwareMonitor"
+#define PN_SWM_SW_LEVEL "SWLevel"
// SHMInfoServer
#define PSN_SHM_INFO_SERVER "LOFAR_PermSW_SHMInfoServer"
@@ -307,19 +526,8 @@
#define PN_CLC_CONNECTED "connected"
#define PN_CLC_REQUESTED_CLOCK "requestedClock"
#define PN_CLC_ACTUAL_CLOCK "actualClock"
-
-// Antenna
-#define PSN_ANTENNA "@antenna@"
-#define PST_ANTENNA "Antenna"
-#define PN_ANT_STATUS_STATE "status.state"
-#define PN_ANT_STATUS_CHILD_STATE "status.childState"
-#define PN_ANT_STATUS_MESSAGE "status.message"
-#define PN_ANT_STATUS_LEAF "status.leaf"
-#define PN_ANT_RCUX "RCUX"
-#define PN_ANT_RCUY "RCUY"
-#define PN_ANT_DELTAX "deltaX"
-#define PN_ANT_DELTAY "deltaY"
-#define PN_ANT_DELTAH "deltaH"
+#define PN_CLC_REQUESTED_BITMODE "requestedBitmode"
+#define PN_CLC_ACTUAL_BITMODE "actualBitmode"
// StnObservation
#define PSN_STN_OBSERVATION "LOFAR_ObsSW_@observation@"
@@ -328,6 +536,8 @@
#define PN_OBS_CLAIM_CLAIM_DATE "claim.claimDate"
#define PN_OBS_CLAIM_NAME "claim.name"
#define PN_OBS_RECEIVER_BITMAP "receiverBitmap"
+#define PN_OBS_HB_ABITMAP "HBAbitmap"
+#define PN_OBS_LB_ABITMAP "LBAbitmap"
// BeamControl
#define PSN_BEAM_CONTROL "LOFAR_ObsSW_@observation@_BeamControl"
diff --git a/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base b/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base
index 4c24e224e594f1d2a2772bd1b3ed65bb66f33b15..d7ebb363914233dbd41e6fac09a91b27d68fd3c9 100644
--- a/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base
+++ b/MAC/Deployment/data/PVSS/data/PVSSDataPoints.base
@@ -20,7 +20,7 @@
LOFAR - M N LOFAR
PIC - M N LOFAR_PIC
Ring - M N LOFAR_PIC_@ring@
-Station STS M Y LOFAR_PIC_@ring@_@station@
+Station - M Y LOFAR_PIC_@ring@_@station@
WAN - M N LOFAR_PIC_WAN
WANarea - M N LOFAR_PIC_WAN_@wan@
Switch - M Y LOFAR_PIC_WAN_@wan@_@switch@
@@ -28,7 +28,7 @@ PermSW - M N LOFAR_PermSW
RTDBPort - M N CRTriggerPort
# Note: the next 4 lines are neccesary for PVSS2SAS to create the PIC tree.
Ring - M N LOFAR_PermSW_@ring@
-Station STS M Y LOFAR_PermSW_@ring@_@station@
+Station - M Y LOFAR_PermSW_@ring@_@station@
Cluster - M N LOFAR_PermSW_@cluster@
Node - M Y LOFAR_PermSW_@cluster@_@node@
Daemons - M N LOFAR_PermSW_Daemons
@@ -87,7 +87,7 @@ RCU RCU S N LOFAR_PIC_@cabinet@_@subrack@_@RSPBoard@_@rcu@
TBBoard TBB S Y LOFAR_PIC_@cabinet@_@subrack@_@TBBoard@
LBAAntenna LBA S N LOFAR_PIC_@lbaantenna@
HBAAntenna HBA S N LOFAR_PIC_@hbaantenna@
-StationInfo - S Y LOFAR_PIC_StationInfo
+StationInfo STI S Y LOFAR_PIC_StationInfo
StnPermSW - S N LOFAR_PermSW
# Note: the next 2 lines are neccesary for PVSS2SAS to create the PIC tree.
Cluster - S N LOFAR_PermSW_@cluster@
diff --git a/MAC/Deployment/data/PVSS/data/Station.dpdef b/MAC/Deployment/data/PVSS/data/Station.dpdef
deleted file mode 100644
index 77c09bc0bb5e92b91e125a402fb04a6d67a26ebf..0000000000000000000000000000000000000000
--- a/MAC/Deployment/data/PVSS/data/Station.dpdef
+++ /dev/null
@@ -1,5 +0,0 @@
-# Station
-#
-power48On bool
-power220On bool
-
diff --git a/MAC/Deployment/data/PVSS/data/StationInfo.dpdef b/MAC/Deployment/data/PVSS/data/StationInfo.dpdef
index a9d495292f14e99ad3ac102f62e9cd3ef9668eb0..4c0bce9a49b157915ad4c597f2ecfdb23221a488 100644
--- a/MAC/Deployment/data/PVSS/data/StationInfo.dpdef
+++ b/MAC/Deployment/data/PVSS/data/StationInfo.dpdef
@@ -5,6 +5,8 @@ N_LBAS int
N_HBAS int
HBA_Split bool
wide_LBAS bool
+power48On bool
+power220On bool
Cabinet.X float
Cabinet.Y float
Cabinet.Z float