diff --git a/.gitattributes b/.gitattributes
index faddd3cd7e5b311e676b8a92122257f9e2b39c4d..0bae4154ae761affc723cec2f21e0f911b23398a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -354,7 +354,6 @@ MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.cc -text
MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.h -text
MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc -text
MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.h -text
-MAC/APL/StationCU/src/TBBControl/TBBControlDefines.h -text
MAC/APL/StationCU/src/TBBControl/TBBObservation.cc -text
MAC/APL/StationCU/src/TBBControl/TBBObservation.h -text
MAC/APL/lofarconf.in -text svneol=native#application/octet-stream
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
index f45fd46f7b8170b65535dba3b2234460615af9cb..41b40666ae21ba48971a9aba176d5817be42f8c8 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
@@ -38,8 +38,8 @@
#include <OTDB/TreeStateConv.h>
#include <signal.h>
-#include "MACSchedulerDefines.h"
#include "MACScheduler.h"
+#include "PVSSDatapointDefs.h"
#include "../Package__Version.h"
using namespace LOFAR::GCF::PVSS;
diff --git a/MAC/APL/MainCU/src/MACScheduler/Makefile.am b/MAC/APL/MainCU/src/MACScheduler/Makefile.am
index 05488375dc1f9ffffd1866218b8992ce452c999a..18a81161372f4fca901707f4fb358c74acfec33e 100644
--- a/MAC/APL/MainCU/src/MACScheduler/Makefile.am
+++ b/MAC/APL/MainCU/src/MACScheduler/Makefile.am
@@ -15,7 +15,7 @@ MACScheduler_DEPENDENCIES = $(LOFAR_DEPEND)
NOINSTHDRS = MACScheduler.h \
ObsClaimer.h \
- MACSchedulerDefines.h
+ PVSSDatapointDefs.h
INSTHDRS =
diff --git a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc
index 9e9d4972dc4fead1579b7369a5b3613f175aaa7a..492d8422d782a109a72bdd01aa4991d1303daf76 100644
--- a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc
@@ -38,8 +38,8 @@
#include <APL/RTDBCommon/ClaimMgrTask.h>
#include <signal.h>
-#include "MACSchedulerDefines.h"
#include "ObsClaimer.h"
+#include "PVSSDatapointDefs.h"
#include <boost/date_time/posix_time/posix_time.hpp>
using namespace LOFAR::GCF::PVSS;
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACSchedulerDefines.h b/MAC/APL/MainCU/src/MACScheduler/PVSSDatapointDefs.h
similarity index 71%
rename from MAC/APL/MainCU/src/MACScheduler/MACSchedulerDefines.h
rename to MAC/APL/MainCU/src/MACScheduler/PVSSDatapointDefs.h
index 35ad882a66ae1c1dde0470e5e14cb6252289610d..5b4182fc55c01a7b9ef08007aa8c6d2c9a24483b 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACSchedulerDefines.h
+++ b/MAC/APL/MainCU/src/MACScheduler/PVSSDatapointDefs.h
@@ -1,4 +1,4 @@
-// This file was generated by create_db_files v1.0 on Mon Jun 23 06:58:37 UTC 2008
+// This file was generated by create_db_files v1.0 on Wed Mar 11 12:40:11 UTC 2009
#ifndef LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H
#define LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H
@@ -13,11 +13,19 @@
#define PN_OBJ_STATE "object.state"
#define PN_OBJ_CHILD_STATE "object.childState"
#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__CHILD_DP "__childDp"
+#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"
@@ -33,6 +41,7 @@
#define PSN_OBSERVATION "LOFAR_ObsSW_@observation@"
#define PST_OBSERVATION "Observation"
#define PN_OBS_CLAIM_CLAIM_DATE "claim.claimDate"
+#define PN_OBS_CLAIM_NAME "claim.name"
#define PN_OBS_RECEIVER_BITMAP "receiverBitmap"
#define PN_OBS_CLAIM_PERIOD "claimPeriod"
#define PN_OBS_PREPARE_PERIOD "preparePeriod"
@@ -43,6 +52,7 @@
#define PN_OBS_ANTENNA_ARRAY "antennaArray"
#define PN_OBS_RECEIVER_LIST "receiverList"
#define PN_OBS_SAMPLE_CLOCK "sampleClock"
+#define PN_OBS_RUN_STATE "runState"
#define PN_OBS_MEASUREMENT_SET "measurementSet"
#define PN_OBS_STATION_LIST "stationList"
#define PN_OBS_INPUT_NODE_LIST "inputNodeList"
@@ -54,41 +64,62 @@
#define PN_OBS_BEAMS_BEAMLET_LIST "Beams.beamletList"
#define PN_OBS_BEAMS_SUBBAND_LIST "Beams.subbandList"
-// ObsCtrl
-#define PSN_OBS_CTRL "LOFAR_ObsSW_@observation@_ObsCtrl"
-#define PST_OBS_CTRL "ObsCtrl"
+// ObservationControl
+#define PSN_OBSERVATION_CONTROL "LOFAR_ObsSW_@observation@_ObservationControl"
+#define PST_OBSERVATION_CONTROL "ObservationControl"
-// OnlineCtrl
-#define PSN_ONLINE_CTRL "LOFAR_ObsSW_@observation@_OnlineCtrl"
-#define PST_ONLINE_CTRL "OnlineCtrl"
+// OnlineControl
+#define PSN_ONLINE_CONTROL "LOFAR_ObsSW_@observation@_OnlineControl"
+#define PST_ONLINE_CONTROL "OnlineControl"
// Correlator
-#define PSN_CORRELATOR "LOFAR_ObsSW_@observation@_OnlineCtrl_Correlator"
+#define PSN_CORRELATOR "LOFAR_ObsSW_@observation@_OnlineControl_Correlator"
#define PST_CORRELATOR "Correlator"
// StorageAppl
-#define PSN_STORAGE_APPL "LOFAR_ObsSW_@observation@_OnlineCtrl_StorageAppl"
+#define PSN_STORAGE_APPL "LOFAR_ObsSW_@observation@_OnlineControl_StorageAppl"
#define PST_STORAGE_APPL "StorageAppl"
// Cabinet
#define PSN_CABINET "LOFAR_PIC_@cabinet@"
#define PST_CABINET "Cabinet"
-#define PN_CAB_DOOR_OPEN "doorOpen"
-#define PN_CAB_FAN "fan"
-#define PN_CAB_INLET_TEMP "inletTemp"
-#define PN_CAB_FRONT_TEMP "frontTemp"
-#define PN_CAB_BACK_TEMP "backTemp"
-#define PN_CAB_SETPOINT_TEMP "setpointTemp"
-#define PN_CAB_AMBIENT_TEMP "ambientTemp"
+#define PN_CAB_FRONT_DOOR_OPEN "frontDoorOpen"
+#define PN_CAB_FRONT_FAN_INNER "frontFanInner"
+#define PN_CAB_FRONT_FAN_OUTER "frontFanOuter"
+#define PN_CAB_FRONT_AIRFLOW "frontAirflow"
+#define PN_CAB_BACK_DOOR_OPEN "backDoorOpen"
+#define PN_CAB_BACK_FAN_INNER "backFanInner"
+#define PN_CAB_BACK_FAN_OUTER "backFanOuter"
+#define PN_CAB_BACK_AIRFLOW "backAirflow"
+#define PN_CAB_TEMP_ALARM "tempAlarm"
+#define PN_CAB_HUMIDITY_ALARM "humidityAlarm"
+#define PN_CAB_TEMPERATURE "temperature"
+#define PN_CAB_TEMP_MIN "tempMin"
+#define PN_CAB_TEMP_MAX "tempMax"
+#define PN_CAB_TEMP_MAX_MAX "tempMaxMax"
+#define PN_CAB_HUMIDITY "humidity"
+#define PN_CAB_HUMIDITY_MAX "humidityMax"
+#define PN_CAB_HUMIDITY_MAX_MAX "humidityMaxMax"
#define PN_CAB_CONTROL_MODE "controlMode"
+#define PN_CAB_TEMPERATURE_SENSOR "temperatureSensor"
+#define PN_CAB_HUMIDITY_CONTROL "humidityControl"
+#define PN_CAB_DOOR_CONTROL "doorControl"
// SubRack
#define PSN_SUB_RACK "LOFAR_PIC_@cabinet@_@subrack@"
#define PST_SUB_RACK "SubRack"
+#define PN_SRCK_SPU_STATUS_STATE "SPU.status.state"
+#define PN_SRCK_SPU_STATUS_CHILD_STATE "SPU.status.childState"
+#define PN_SRCK_SPU_STATUS_MESSAGE "SPU.status.message"
+#define PN_SRCK_SPU_STATUS_LEAF "SPU.status.leaf"
#define PN_SRCK_SPU__VHBA "SPU.Vhba"
#define PN_SRCK_SPU__VLBA "SPU.Vlba"
#define PN_SRCK_SPU__VDIG "SPU.Vdig"
#define PN_SRCK_SPU_TEMPERATURE "SPU.temperature"
+#define PN_SRCK_CLOCK_BOARD_STATUS_STATE "clockBoard.status.state"
+#define PN_SRCK_CLOCK_BOARD_STATUS_CHILD_STATE "clockBoard.status.childState"
+#define PN_SRCK_CLOCK_BOARD_STATUS_MESSAGE "clockBoard.status.message"
+#define PN_SRCK_CLOCK_BOARD_STATUS_LEAF "clockBoard.status.leaf"
#define PN_SRCK_CLOCK_BOARD__VFSP "clockBoard.Vfsp"
#define PN_SRCK_CLOCK_BOARD__VCLOCK "clockBoard.Vclock"
#define PN_SRCK_CLOCK_BOARD_VERSION "clockBoard.version"
@@ -108,6 +139,7 @@
#define PN_RSP__ETHERNET_STATUS_STATE "Ethernet.status.state"
#define PN_RSP__ETHERNET_STATUS_CHILD_STATE "Ethernet.status.childState"
#define PN_RSP__ETHERNET_STATUS_MESSAGE "Ethernet.status.message"
+#define PN_RSP__ETHERNET_STATUS_LEAF "Ethernet.status.leaf"
#define PN_RSP_ETHERNET_PACKETS_RECEIVED "Ethernet.packetsReceived"
#define PN_RSP_ETHERNET_PACKETS_ERROR "Ethernet.packetsError"
#define PN_RSP_ETHERNET_LAST_ERROR "Ethernet.lastError"
@@ -116,11 +148,13 @@
#define PN_RSP_BP_STATUS_STATE "BP.status.state"
#define PN_RSP_BP_STATUS_CHILD_STATE "BP.status.childState"
#define PN_RSP_BP_STATUS_MESSAGE "BP.status.message"
+#define PN_RSP_BP_STATUS_LEAF "BP.status.leaf"
#define PN_RSP_BP_TEMPERATURE "BP.temperature"
#define PN_RSP_BP_VERSION "BP.version"
#define PN_RSP_AP0_STATUS_STATE "AP0.status.state"
#define PN_RSP_AP0_STATUS_CHILD_STATE "AP0.status.childState"
#define PN_RSP_AP0_STATUS_MESSAGE "AP0.status.message"
+#define PN_RSP_AP0_STATUS_LEAF "AP0.status.leaf"
#define PN_RSP_AP0_TEMPERATURE "AP0.temperature"
#define PN_RSP_AP0_VERSION "AP0.version"
#define PN_RSP_AP0_SYNC_SAMPLE_COUNT "AP0.SYNC.sampleCount"
@@ -129,6 +163,7 @@
#define PN_RSP_AP1_STATUS_STATE "AP1.status.state"
#define PN_RSP_AP1_STATUS_CHILD_STATE "AP1.status.childState"
#define PN_RSP_AP1_STATUS_MESSAGE "AP1.status.message"
+#define PN_RSP_AP1_STATUS_LEAF "AP1.status.leaf"
#define PN_RSP_AP1_TEMPERATURE "AP1.temperature"
#define PN_RSP_AP1_VERSION "AP1.version"
#define PN_RSP_AP1_SYNC_SAMPLE_COUNT "AP1.SYNC.sampleCount"
@@ -137,6 +172,7 @@
#define PN_RSP_AP2_STATUS_STATE "AP2.status.state"
#define PN_RSP_AP2_STATUS_CHILD_STATE "AP2.status.childState"
#define PN_RSP_AP2_STATUS_MESSAGE "AP2.status.message"
+#define PN_RSP_AP2_STATUS_LEAF "AP2.status.leaf"
#define PN_RSP_AP2_TEMPERATURE "AP2.temperature"
#define PN_RSP_AP2_VERSION "AP2.version"
#define PN_RSP_AP2_SYNC_SAMPLE_COUNT "AP2.SYNC.sampleCount"
@@ -145,6 +181,7 @@
#define PN_RSP_AP3_STATUS_STATE "AP3.status.state"
#define PN_RSP_AP3_STATUS_CHILD_STATE "AP3.status.childState"
#define PN_RSP_AP3_STATUS_MESSAGE "AP3.status.message"
+#define PN_RSP_AP3_STATUS_LEAF "AP3.status.leaf"
#define PN_RSP_AP3_TEMPERATURE "AP3.temperature"
#define PN_RSP_AP3_VERSION "AP3.version"
#define PN_RSP_AP3_SYNC_SAMPLE_COUNT "AP3.SYNC.sampleCount"
@@ -210,11 +247,6 @@
#define PN_TBB_IMAGE_INFO_TP_FILE "imageInfo.TPFile"
#define PN_TBB_IMAGE_INFO_MP_FILE "imageInfo.MPFile"
-// StationClock
-#define PSN_STATION_CLOCK "LOFAR_PIC_StationClock"
-#define PST_STATION_CLOCK "StationClock"
-#define PN_SCK_CLOCK "clock"
-
// LogProcessor
#define PSN_LOG_PROCESSOR "LOFAR_PermSW_Daemons_LogProcessor"
#define PST_LOG_PROCESSOR "LogProcessor"
@@ -233,33 +265,45 @@
#define PSN_SOFTWARE_MONITOR "LOFAR_PermSW_SoftwareMonitor"
#define PST_SOFTWARE_MONITOR "SoftwareMonitor"
-// TemperatureMonitor
-#define PSN_TEMPERATURE_MONITOR "LOFAR_PermSW_TemperatureMonitor"
-#define PST_TEMPERATURE_MONITOR "TemperatureMonitor"
+// SHMInfoServer
+#define PSN_SHM_INFO_SERVER "LOFAR_PermSW_SHMInfoServer"
+#define PST_SHM_INFO_SERVER "SHMInfoServer"
-// MACInfoServer
-#define PSN_MAC_INFO_SERVER "LOFAR_PermSW_MACInfoServer"
-#define PST_MAC_INFO_SERVER "MACInfoServer"
+// StationControl
+#define PSN_STATION_CONTROL "LOFAR_PermSW_StationControl"
+#define PST_STATION_CONTROL "StationControl"
+#define PN_SC_ACTIVE_OBSERVATIONS "activeObservations"
-// StationCtrl
-#define PSN_STATION_CTRL "LOFAR_PermSW_StationCtrl"
-#define PST_STATION_CTRL "StationCtrl"
+// ClockControl
+#define PSN_CLOCK_CONTROL "LOFAR_PermSW_ClockControl"
+#define PST_CLOCK_CONTROL "ClockControl"
+#define PN_CLC_CONNECTED "connected"
+#define PN_CLC_REQUESTED_CLOCK "requestedClock"
+#define PN_CLC_ACTUAL_CLOCK "actualClock"
-// DigBoardCtrl
-#define PSN_DIG_BOARD_CTRL "LOFAR_PermSW_DigBoardCtrl"
-#define PST_DIG_BOARD_CTRL "DigBoardCtrl"
-#define PN_DBC_CONNECTED "connected"
-#define PN_DBC_CLOCK "clock"
+// 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"
// StnObservation
#define PSN_STN_OBSERVATION "LOFAR_ObsSW_@observation@"
#define PST_STN_OBSERVATION "StnObservation"
#define PN_OBS_NAME "name"
#define PN_OBS_CLAIM_CLAIM_DATE "claim.claimDate"
+#define PN_OBS_CLAIM_NAME "claim.name"
-// BeamCtrl
-#define PSN_BEAM_CTRL "LOFAR_ObsSW_@observation@_BeamCtrl"
-#define PST_BEAM_CTRL "BeamCtrl"
+// BeamControl
+#define PSN_BEAM_CONTROL "LOFAR_ObsSW_@observation@_BeamControl"
+#define PST_BEAM_CONTROL "BeamControl"
#define PN_BC_CONNECTED "connected"
#define PN_BC_SUB_ARRAY "subArray"
#define PN_BC_SUBBAND_LIST "subbandList"
@@ -269,9 +313,9 @@
#define PN_BC_DIRECTION_TYPE "directionType"
#define PN_BC_BEAM_NAME "beamName"
-// CalCtrl
-#define PSN_CAL_CTRL "LOFAR_ObsSW_@observation@_CalCtrl"
-#define PST_CAL_CTRL "CalCtrl"
+// CalibrationControl
+#define PSN_CALIBRATION_CONTROL "LOFAR_ObsSW_@observation@_CalibrationControl"
+#define PST_CALIBRATION_CONTROL "CalibrationControl"
#define PN_CC_CONNECTED "connected"
#define PN_CC_BEAM_NAMES "beamNames"
#define PN_CC_ANTENNA_ARRAY "antennaArray"
@@ -279,9 +323,9 @@
#define PN_CC_NYQUISTZONE "nyquistzone"
#define PN_CC_RCUS "rcus"
-// TBBCtrl
-#define PSN_TBB_CTRL "LOFAR_ObsSW_@observation@_TBBCtrl"
-#define PST_TBB_CTRL "TBBCtrl"
+// TBBControl
+#define PSN_TBB_CONTROL "LOFAR_ObsSW_@observation@_TBBControl"
+#define PST_TBB_CONTROL "TBBControl"
#define PN_TBC_CONNECTED "connected"
#define PN_TBC_TRIGGER_RCU_NR "trigger.rcuNr"
#define PN_TBC_TRIGGER_SEQUENCE_NR "trigger.sequenceNr"
diff --git a/MAC/APL/MainCU/src/ObservationControl/Makefile.am b/MAC/APL/MainCU/src/ObservationControl/Makefile.am
index 4a6b706458e383ce271f645a724f91169f2a7c5d..dec4c2bef6053e0dc380ca198b1f1159e34a3600 100644
--- a/MAC/APL/MainCU/src/ObservationControl/Makefile.am
+++ b/MAC/APL/MainCU/src/ObservationControl/Makefile.am
@@ -12,7 +12,7 @@ ObservationControl_LDADD = $(LOFAR_DEPEND)
ObservationControl_DEPENDENCIES = $(LOFAR_DEPEND)
NOINSTHDRS = ObservationControl.h \
- ObservationControlDefines.h
+ PVSSDatapointDefs.h
INSTHDRS =
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
index 69033318af52db2f0c34f7202652d888b2592f3f..7371fc57e126cb1cda4a08dc3d66d00a1aab7b3d 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
@@ -39,7 +39,7 @@
#include <signal.h>
#include "ObservationControl.h"
-#include "ObservationControlDefines.h"
+#include "PVSSDatapointDefs.h"
#include "../Package__Version.h"
@@ -109,7 +109,7 @@ ObservationControl::ObservationControl(const string& cntlrName) :
LOG_DEBUG_STR ("Timer for forcing quit is set to " << itsForcedQuitDelay);
// Inform Logging manager who we are
- LOG_INFO_STR("MACProcessScope: " << createPropertySetName(PSN_OBS_CTRL, getName(), itsObsDPname));
+ LOG_INFO_STR("MACProcessScope: " << createPropertySetName(PSN_OBSERVATION_CONTROL, getName(), itsObsDPname));
// NOTE: SAS gateway is not yet aware of claimMgr so the data will not be transferred to SAS.
// attach to child control task
@@ -270,10 +270,10 @@ GCFEvent::TResult ObservationControl::starting_state(GCFEvent& event,
case F_ENTRY: {
// Get access to my own propertyset.
- string propSetName(createPropertySetName(PSN_OBS_CTRL, getName(), itsObsDPname));
+ string propSetName(createPropertySetName(PSN_OBSERVATION_CONTROL, getName(), itsObsDPname));
LOG_DEBUG_STR ("Activating PropertySet: " << propSetName);
itsPropertySet = new RTDBPropertySet(propSetName.c_str(),
- PST_OBS_CTRL,
+ PST_OBSERVATION_CONTROL,
PSAT_RW,
this);
}
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControlDefines.h b/MAC/APL/MainCU/src/ObservationControl/PVSSDatapointDefs.h
similarity index 71%
rename from MAC/APL/MainCU/src/ObservationControl/ObservationControlDefines.h
rename to MAC/APL/MainCU/src/ObservationControl/PVSSDatapointDefs.h
index 35ad882a66ae1c1dde0470e5e14cb6252289610d..5b4182fc55c01a7b9ef08007aa8c6d2c9a24483b 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControlDefines.h
+++ b/MAC/APL/MainCU/src/ObservationControl/PVSSDatapointDefs.h
@@ -1,4 +1,4 @@
-// This file was generated by create_db_files v1.0 on Mon Jun 23 06:58:37 UTC 2008
+// This file was generated by create_db_files v1.0 on Wed Mar 11 12:40:11 UTC 2009
#ifndef LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H
#define LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H
@@ -13,11 +13,19 @@
#define PN_OBJ_STATE "object.state"
#define PN_OBJ_CHILD_STATE "object.childState"
#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__CHILD_DP "__childDp"
+#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"
@@ -33,6 +41,7 @@
#define PSN_OBSERVATION "LOFAR_ObsSW_@observation@"
#define PST_OBSERVATION "Observation"
#define PN_OBS_CLAIM_CLAIM_DATE "claim.claimDate"
+#define PN_OBS_CLAIM_NAME "claim.name"
#define PN_OBS_RECEIVER_BITMAP "receiverBitmap"
#define PN_OBS_CLAIM_PERIOD "claimPeriod"
#define PN_OBS_PREPARE_PERIOD "preparePeriod"
@@ -43,6 +52,7 @@
#define PN_OBS_ANTENNA_ARRAY "antennaArray"
#define PN_OBS_RECEIVER_LIST "receiverList"
#define PN_OBS_SAMPLE_CLOCK "sampleClock"
+#define PN_OBS_RUN_STATE "runState"
#define PN_OBS_MEASUREMENT_SET "measurementSet"
#define PN_OBS_STATION_LIST "stationList"
#define PN_OBS_INPUT_NODE_LIST "inputNodeList"
@@ -54,41 +64,62 @@
#define PN_OBS_BEAMS_BEAMLET_LIST "Beams.beamletList"
#define PN_OBS_BEAMS_SUBBAND_LIST "Beams.subbandList"
-// ObsCtrl
-#define PSN_OBS_CTRL "LOFAR_ObsSW_@observation@_ObsCtrl"
-#define PST_OBS_CTRL "ObsCtrl"
+// ObservationControl
+#define PSN_OBSERVATION_CONTROL "LOFAR_ObsSW_@observation@_ObservationControl"
+#define PST_OBSERVATION_CONTROL "ObservationControl"
-// OnlineCtrl
-#define PSN_ONLINE_CTRL "LOFAR_ObsSW_@observation@_OnlineCtrl"
-#define PST_ONLINE_CTRL "OnlineCtrl"
+// OnlineControl
+#define PSN_ONLINE_CONTROL "LOFAR_ObsSW_@observation@_OnlineControl"
+#define PST_ONLINE_CONTROL "OnlineControl"
// Correlator
-#define PSN_CORRELATOR "LOFAR_ObsSW_@observation@_OnlineCtrl_Correlator"
+#define PSN_CORRELATOR "LOFAR_ObsSW_@observation@_OnlineControl_Correlator"
#define PST_CORRELATOR "Correlator"
// StorageAppl
-#define PSN_STORAGE_APPL "LOFAR_ObsSW_@observation@_OnlineCtrl_StorageAppl"
+#define PSN_STORAGE_APPL "LOFAR_ObsSW_@observation@_OnlineControl_StorageAppl"
#define PST_STORAGE_APPL "StorageAppl"
// Cabinet
#define PSN_CABINET "LOFAR_PIC_@cabinet@"
#define PST_CABINET "Cabinet"
-#define PN_CAB_DOOR_OPEN "doorOpen"
-#define PN_CAB_FAN "fan"
-#define PN_CAB_INLET_TEMP "inletTemp"
-#define PN_CAB_FRONT_TEMP "frontTemp"
-#define PN_CAB_BACK_TEMP "backTemp"
-#define PN_CAB_SETPOINT_TEMP "setpointTemp"
-#define PN_CAB_AMBIENT_TEMP "ambientTemp"
+#define PN_CAB_FRONT_DOOR_OPEN "frontDoorOpen"
+#define PN_CAB_FRONT_FAN_INNER "frontFanInner"
+#define PN_CAB_FRONT_FAN_OUTER "frontFanOuter"
+#define PN_CAB_FRONT_AIRFLOW "frontAirflow"
+#define PN_CAB_BACK_DOOR_OPEN "backDoorOpen"
+#define PN_CAB_BACK_FAN_INNER "backFanInner"
+#define PN_CAB_BACK_FAN_OUTER "backFanOuter"
+#define PN_CAB_BACK_AIRFLOW "backAirflow"
+#define PN_CAB_TEMP_ALARM "tempAlarm"
+#define PN_CAB_HUMIDITY_ALARM "humidityAlarm"
+#define PN_CAB_TEMPERATURE "temperature"
+#define PN_CAB_TEMP_MIN "tempMin"
+#define PN_CAB_TEMP_MAX "tempMax"
+#define PN_CAB_TEMP_MAX_MAX "tempMaxMax"
+#define PN_CAB_HUMIDITY "humidity"
+#define PN_CAB_HUMIDITY_MAX "humidityMax"
+#define PN_CAB_HUMIDITY_MAX_MAX "humidityMaxMax"
#define PN_CAB_CONTROL_MODE "controlMode"
+#define PN_CAB_TEMPERATURE_SENSOR "temperatureSensor"
+#define PN_CAB_HUMIDITY_CONTROL "humidityControl"
+#define PN_CAB_DOOR_CONTROL "doorControl"
// SubRack
#define PSN_SUB_RACK "LOFAR_PIC_@cabinet@_@subrack@"
#define PST_SUB_RACK "SubRack"
+#define PN_SRCK_SPU_STATUS_STATE "SPU.status.state"
+#define PN_SRCK_SPU_STATUS_CHILD_STATE "SPU.status.childState"
+#define PN_SRCK_SPU_STATUS_MESSAGE "SPU.status.message"
+#define PN_SRCK_SPU_STATUS_LEAF "SPU.status.leaf"
#define PN_SRCK_SPU__VHBA "SPU.Vhba"
#define PN_SRCK_SPU__VLBA "SPU.Vlba"
#define PN_SRCK_SPU__VDIG "SPU.Vdig"
#define PN_SRCK_SPU_TEMPERATURE "SPU.temperature"
+#define PN_SRCK_CLOCK_BOARD_STATUS_STATE "clockBoard.status.state"
+#define PN_SRCK_CLOCK_BOARD_STATUS_CHILD_STATE "clockBoard.status.childState"
+#define PN_SRCK_CLOCK_BOARD_STATUS_MESSAGE "clockBoard.status.message"
+#define PN_SRCK_CLOCK_BOARD_STATUS_LEAF "clockBoard.status.leaf"
#define PN_SRCK_CLOCK_BOARD__VFSP "clockBoard.Vfsp"
#define PN_SRCK_CLOCK_BOARD__VCLOCK "clockBoard.Vclock"
#define PN_SRCK_CLOCK_BOARD_VERSION "clockBoard.version"
@@ -108,6 +139,7 @@
#define PN_RSP__ETHERNET_STATUS_STATE "Ethernet.status.state"
#define PN_RSP__ETHERNET_STATUS_CHILD_STATE "Ethernet.status.childState"
#define PN_RSP__ETHERNET_STATUS_MESSAGE "Ethernet.status.message"
+#define PN_RSP__ETHERNET_STATUS_LEAF "Ethernet.status.leaf"
#define PN_RSP_ETHERNET_PACKETS_RECEIVED "Ethernet.packetsReceived"
#define PN_RSP_ETHERNET_PACKETS_ERROR "Ethernet.packetsError"
#define PN_RSP_ETHERNET_LAST_ERROR "Ethernet.lastError"
@@ -116,11 +148,13 @@
#define PN_RSP_BP_STATUS_STATE "BP.status.state"
#define PN_RSP_BP_STATUS_CHILD_STATE "BP.status.childState"
#define PN_RSP_BP_STATUS_MESSAGE "BP.status.message"
+#define PN_RSP_BP_STATUS_LEAF "BP.status.leaf"
#define PN_RSP_BP_TEMPERATURE "BP.temperature"
#define PN_RSP_BP_VERSION "BP.version"
#define PN_RSP_AP0_STATUS_STATE "AP0.status.state"
#define PN_RSP_AP0_STATUS_CHILD_STATE "AP0.status.childState"
#define PN_RSP_AP0_STATUS_MESSAGE "AP0.status.message"
+#define PN_RSP_AP0_STATUS_LEAF "AP0.status.leaf"
#define PN_RSP_AP0_TEMPERATURE "AP0.temperature"
#define PN_RSP_AP0_VERSION "AP0.version"
#define PN_RSP_AP0_SYNC_SAMPLE_COUNT "AP0.SYNC.sampleCount"
@@ -129,6 +163,7 @@
#define PN_RSP_AP1_STATUS_STATE "AP1.status.state"
#define PN_RSP_AP1_STATUS_CHILD_STATE "AP1.status.childState"
#define PN_RSP_AP1_STATUS_MESSAGE "AP1.status.message"
+#define PN_RSP_AP1_STATUS_LEAF "AP1.status.leaf"
#define PN_RSP_AP1_TEMPERATURE "AP1.temperature"
#define PN_RSP_AP1_VERSION "AP1.version"
#define PN_RSP_AP1_SYNC_SAMPLE_COUNT "AP1.SYNC.sampleCount"
@@ -137,6 +172,7 @@
#define PN_RSP_AP2_STATUS_STATE "AP2.status.state"
#define PN_RSP_AP2_STATUS_CHILD_STATE "AP2.status.childState"
#define PN_RSP_AP2_STATUS_MESSAGE "AP2.status.message"
+#define PN_RSP_AP2_STATUS_LEAF "AP2.status.leaf"
#define PN_RSP_AP2_TEMPERATURE "AP2.temperature"
#define PN_RSP_AP2_VERSION "AP2.version"
#define PN_RSP_AP2_SYNC_SAMPLE_COUNT "AP2.SYNC.sampleCount"
@@ -145,6 +181,7 @@
#define PN_RSP_AP3_STATUS_STATE "AP3.status.state"
#define PN_RSP_AP3_STATUS_CHILD_STATE "AP3.status.childState"
#define PN_RSP_AP3_STATUS_MESSAGE "AP3.status.message"
+#define PN_RSP_AP3_STATUS_LEAF "AP3.status.leaf"
#define PN_RSP_AP3_TEMPERATURE "AP3.temperature"
#define PN_RSP_AP3_VERSION "AP3.version"
#define PN_RSP_AP3_SYNC_SAMPLE_COUNT "AP3.SYNC.sampleCount"
@@ -210,11 +247,6 @@
#define PN_TBB_IMAGE_INFO_TP_FILE "imageInfo.TPFile"
#define PN_TBB_IMAGE_INFO_MP_FILE "imageInfo.MPFile"
-// StationClock
-#define PSN_STATION_CLOCK "LOFAR_PIC_StationClock"
-#define PST_STATION_CLOCK "StationClock"
-#define PN_SCK_CLOCK "clock"
-
// LogProcessor
#define PSN_LOG_PROCESSOR "LOFAR_PermSW_Daemons_LogProcessor"
#define PST_LOG_PROCESSOR "LogProcessor"
@@ -233,33 +265,45 @@
#define PSN_SOFTWARE_MONITOR "LOFAR_PermSW_SoftwareMonitor"
#define PST_SOFTWARE_MONITOR "SoftwareMonitor"
-// TemperatureMonitor
-#define PSN_TEMPERATURE_MONITOR "LOFAR_PermSW_TemperatureMonitor"
-#define PST_TEMPERATURE_MONITOR "TemperatureMonitor"
+// SHMInfoServer
+#define PSN_SHM_INFO_SERVER "LOFAR_PermSW_SHMInfoServer"
+#define PST_SHM_INFO_SERVER "SHMInfoServer"
-// MACInfoServer
-#define PSN_MAC_INFO_SERVER "LOFAR_PermSW_MACInfoServer"
-#define PST_MAC_INFO_SERVER "MACInfoServer"
+// StationControl
+#define PSN_STATION_CONTROL "LOFAR_PermSW_StationControl"
+#define PST_STATION_CONTROL "StationControl"
+#define PN_SC_ACTIVE_OBSERVATIONS "activeObservations"
-// StationCtrl
-#define PSN_STATION_CTRL "LOFAR_PermSW_StationCtrl"
-#define PST_STATION_CTRL "StationCtrl"
+// ClockControl
+#define PSN_CLOCK_CONTROL "LOFAR_PermSW_ClockControl"
+#define PST_CLOCK_CONTROL "ClockControl"
+#define PN_CLC_CONNECTED "connected"
+#define PN_CLC_REQUESTED_CLOCK "requestedClock"
+#define PN_CLC_ACTUAL_CLOCK "actualClock"
-// DigBoardCtrl
-#define PSN_DIG_BOARD_CTRL "LOFAR_PermSW_DigBoardCtrl"
-#define PST_DIG_BOARD_CTRL "DigBoardCtrl"
-#define PN_DBC_CONNECTED "connected"
-#define PN_DBC_CLOCK "clock"
+// 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"
// StnObservation
#define PSN_STN_OBSERVATION "LOFAR_ObsSW_@observation@"
#define PST_STN_OBSERVATION "StnObservation"
#define PN_OBS_NAME "name"
#define PN_OBS_CLAIM_CLAIM_DATE "claim.claimDate"
+#define PN_OBS_CLAIM_NAME "claim.name"
-// BeamCtrl
-#define PSN_BEAM_CTRL "LOFAR_ObsSW_@observation@_BeamCtrl"
-#define PST_BEAM_CTRL "BeamCtrl"
+// BeamControl
+#define PSN_BEAM_CONTROL "LOFAR_ObsSW_@observation@_BeamControl"
+#define PST_BEAM_CONTROL "BeamControl"
#define PN_BC_CONNECTED "connected"
#define PN_BC_SUB_ARRAY "subArray"
#define PN_BC_SUBBAND_LIST "subbandList"
@@ -269,9 +313,9 @@
#define PN_BC_DIRECTION_TYPE "directionType"
#define PN_BC_BEAM_NAME "beamName"
-// CalCtrl
-#define PSN_CAL_CTRL "LOFAR_ObsSW_@observation@_CalCtrl"
-#define PST_CAL_CTRL "CalCtrl"
+// CalibrationControl
+#define PSN_CALIBRATION_CONTROL "LOFAR_ObsSW_@observation@_CalibrationControl"
+#define PST_CALIBRATION_CONTROL "CalibrationControl"
#define PN_CC_CONNECTED "connected"
#define PN_CC_BEAM_NAMES "beamNames"
#define PN_CC_ANTENNA_ARRAY "antennaArray"
@@ -279,9 +323,9 @@
#define PN_CC_NYQUISTZONE "nyquistzone"
#define PN_CC_RCUS "rcus"
-// TBBCtrl
-#define PSN_TBB_CTRL "LOFAR_ObsSW_@observation@_TBBCtrl"
-#define PST_TBB_CTRL "TBBCtrl"
+// TBBControl
+#define PSN_TBB_CONTROL "LOFAR_ObsSW_@observation@_TBBControl"
+#define PST_TBB_CONTROL "TBBControl"
#define PN_TBC_CONNECTED "connected"
#define PN_TBC_TRIGGER_RCU_NR "trigger.rcuNr"
#define PN_TBC_TRIGGER_SEQUENCE_NR "trigger.sequenceNr"
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControlDefines.cc b/MAC/APL/StationCU/src/TBBControl/TBBControlDefines.cc
deleted file mode 100644
index 73dfe7fb36e63ca4d3e109776e7b5896e7e72307..0000000000000000000000000000000000000000
--- a/MAC/APL/StationCU/src/TBBControl/TBBControlDefines.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-//# TBBControlDefines.h: preprocessor definitions of various constants
-//#
-//# Copyright (C) 2002-2003
-//# 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
-//#
-//# $Id$
-
-
-#ifndef TBBCONTROLDEFINES_H
-#define TBBCONTROLDEFINES_H
-
-namespace LOFAR {
- namespace StationCU {
-
-#define BC_TASKNAME "TBBControl"
-
-#define PSN_TBB_CTRL "LOFAR_PermSW_TBBControl"
-#define PST_TBB_CTRL "TBBControl"
-
-#define PN_TBB_CONNECTED "connected"
-#define PN_TBB_SEQUENCE_NR "sequence_nr"
-#define PN_TBB_TIME "time"
-#define PN_TBB_SAMPLE_NR "sample_nr"
-#define PN_TBB_TRIGGER_SUM "trigger_sum"
-#define PN_TBB_TRIGGER_SAMPLES "trigger_samples"
-#define PN_TBB_PEAK_VALUE "peak_value"
-//#define PN_TBB_ ""
-
-#define PN_TBB_TBBID "TbbID"
-
-// next lines should be defined somewhere in Common.
-#define PVSSNAME_FSM_CURACT "currentAction"
-#define PVSSNAME_FSM_ERROR "error"
-#define PVSSNAME_FSM_LOGMSG "logMsg"
-#define PVSSNAME_FSM_STATE "state"
-#define PVSSNAME_FSM_CHILDSTATE "childState"
-
-}; // StationCU
-}; // LOFAR
-
-#endif
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControlDefines.h b/MAC/APL/StationCU/src/TBBControl/TBBControlDefines.h
deleted file mode 100644
index 10913a920699b165038f98606ae130c2dcc90cef..0000000000000000000000000000000000000000
--- a/MAC/APL/StationCU/src/TBBControl/TBBControlDefines.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//# TBBControlDefines.h: preprocessor definitions of various constants
-//#
-//# Copyright (C) 2002-2003
-//# 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
-//#
-//# $Id: TBBControlDefines.cc,v 1.1 2007/11/03 16:29:07 overeem Exp $
-
-#ifndef TBBCONTROLDEFINES_H
-#define TBBCONTROLDEFINES_H
-
-namespace LOFAR {
- namespace StationCU {
-
-#define TBC_TASKNAME "TBBCtrl"
-
-// TBBCtrl
-#define PSN_TBB_CTRL "LOFAR_ObsSW_@observation@_TBBCtrl"
-#define PST_TBB_CTRL "TBBCtrl"
-#define PN_TBC_CONNECTED "connected"
-#define PN_TBC_TRIGGER_RCU_NR "trigger.rcuNr"
-#define PN_TBC_TRIGGER_SEQUENCE_NR "trigger.sequenceNr"
-#define PN_TBC_TRIGGER_TIME "trigger.time"
-#define PN_TBC_TRIGGER_SAMPLE_NR "trigger.sampleNr"
-#define PN_TBC_TRIGGER_SUM "trigger.sum"
-#define PN_TBC_TRIGGER_NR_SAMPLES "trigger.nrSamples"
-#define PN_TBC_TRIGGER_PEAK_VALUE "trigger.peakValue"
-#define PN_TBC_TRIGGER_FLAGS "trigger.flags"
-#define PN_TBC_TRIGGER_TABLE "trigger.table"
-
-// next lines should be defined somewhere in Common.
-#define PVSSNAME_FSM_CURACT "currentAction"
-#define PVSSNAME_FSM_ERROR "error"
-#define PVSSNAME_FSM_LOGMSG "logMsg"
-#define PVSSNAME_FSM_STATE "state"
-#define PVSSNAME_FSM_CHILDSTATE "childState"
-
-}; // StationCU
-}; // LOFAR
-
-#endif