From f51a195ab7bc9f5cd6a18c5331653c7ef7dc9bdf Mon Sep 17 00:00:00 2001 From: Ruud Overeem <overeem@astron.nl> Date: Tue, 9 Oct 2012 13:38:06 +0000 Subject: [PATCH] Task #1418: RMI #3608: Solved conflicting definitions of PST_STATION Only conflict in still in OnlineControl but that will be fixed in issue 3678. --- .../CEPHardwareMonitor/PVSSDatapointDefs.h | 98 +++++++-- .../src/CEPlogProcessor/PVSSDatapointDefs.h | 189 +++++++++++----- .../src/PythonControl/PVSSDatapointDefs.h | 183 +++++++++++----- .../src/SoftwareMonitor/PVSSDatapointDefs.h | 188 +++++----------- .../src/CRTriggerControl/PVSSDatapointDefs.h | 166 ++++++++++---- .../src/MACScheduler/PVSSDatapointDefs.h | 6 +- .../ObservationControl/PVSSDatapointDefs.h | 183 ++++++++++++---- .../src/BeamControl/PVSSDatapointDefs.h | 203 ++++++++++++++---- .../CalibrationControl/PVSSDatapointDefs.h | 203 ++++++++++++++---- .../src/ClockControl/PVSSDatapointDefs.h | 201 +++++++++++++---- .../src/HardwareMonitor/PVSSDatapointDefs.h | 128 +---------- .../src/StationControl/PVSSDatapointDefs.h | 167 +++++++------- .../src/TBBControl/PVSSDatapointDefs.h | 170 +++++++++++---- 13 files changed, 1356 insertions(+), 729 deletions(-) diff --git a/MAC/APL/CEPCU/src/CEPHardwareMonitor/PVSSDatapointDefs.h b/MAC/APL/CEPCU/src/CEPHardwareMonitor/PVSSDatapointDefs.h index 7eb0c5978bf..9f83a52dda5 100644 --- a/MAC/APL/CEPCU/src/CEPHardwareMonitor/PVSSDatapointDefs.h +++ b/MAC/APL/CEPCU/src/CEPHardwareMonitor/PVSSDatapointDefs.h @@ -1,4 +1,4 @@ -// This file was generated by create_db_files v2.0 on Fri Dec 9 13:04:01 UTC 2011 +// This file was generated by create_db_files v2.0 on Tue Oct 9 13:22:37 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,12 +55,18 @@ #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" +#define PN_OBSCTRL_COMMAND "command" // InputBuffer #define PSN_INPUT_BUFFER "LOFAR_PermSW_@psionode@_InputBuffer" @@ -93,20 +94,21 @@ #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_TIME "time" -#define PN_WTR_COUNT "count" +#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_PRODUKT_TYPE "dataProduktType" +#define PN_WTR_DATA_PRODUCT_TYPE "dataProductType" #define PN_WTR_OBSERVATION_NAME "observationName" // IONode @@ -191,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" @@ -317,6 +321,54 @@ #define PSN_HBA_ANTENNA "LOFAR_PIC_@hbaantenna@" #define PST_HBA_ANTENNA "HBAAntenna" +// 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" @@ -325,9 +377,17 @@ #define PSN_SAS_GATEWAY "LOFAR_PermSW_Daemons_SASGateway" #define PST_SAS_GATEWAY "SASGateway" +// HardwareMonitor +#define PSN_HARDWARE_MONITOR "LOFAR_PermSW_HardwareMonitor" +#define PST_HARDWARE_MONITOR "HardwareMonitor" +#define PN_HWM_RSP_CONNECTED "RSP.connected" +#define PN_HWM_TBB_CONNECTED "TBB.connected" +#define PN_HWM_EC_CONNECTED "EC.connected" + // 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" @@ -344,6 +404,8 @@ #define PN_CLC_CONNECTED "connected" #define PN_CLC_REQUESTED_CLOCK "requestedClock" #define PN_CLC_ACTUAL_CLOCK "actualClock" +#define PN_CLC_REQUESTED_BITMODE "requestedBitmode" +#define PN_CLC_ACTUAL_BITMODE "actualBitmode" // StnObservation #define PSN_STN_OBSERVATION "LOFAR_ObsSW_@observation@" @@ -352,6 +414,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_HBA_BITMAP "HBABitmap" +#define PN_OBS_LBA_BITMAP "LBABitmap" // BeamControl #define PSN_BEAM_CONTROL "LOFAR_ObsSW_@observation@_BeamControl" diff --git a/MAC/APL/CEPCU/src/CEPlogProcessor/PVSSDatapointDefs.h b/MAC/APL/CEPCU/src/CEPlogProcessor/PVSSDatapointDefs.h index 08712199f11..9f83a52dda5 100644 --- a/MAC/APL/CEPCU/src/CEPlogProcessor/PVSSDatapointDefs.h +++ b/MAC/APL/CEPCU/src/CEPlogProcessor/PVSSDatapointDefs.h @@ -1,4 +1,4 @@ -// This file was generated by create_db_files v2.0 on Thu Jul 23 13:58:12 UTC 2009 +// This file was generated by create_db_files v2.0 on Tue Oct 9 13:22:37 UTC 2012 #ifndef LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H #define LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H @@ -15,20 +15,6 @@ #define PN_OBJ_MESSAGE "object.message" #define PN_OBJ_LEAF "object.leaf" -// Station -#if 0 -#define PSN_STATION "LOFAR_PIC_@ring@_@station@" -#define PST_STATION "Station" -#define PN_STS_POWER48_ON "power48On" -#define PN_STS_POWER220_ON "power220On" -#endif - -// 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" @@ -39,12 +25,15 @@ #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" #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" #define PN_OBS_START_TIME "startTime" @@ -56,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" @@ -63,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 "process.logMsg" +#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" @@ -96,13 +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_RANK "rank" -#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@" @@ -159,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" @@ -241,10 +277,15 @@ #define PN_RCU_TRIGGER_FILTER "Trigger.filter" #define PN_RCU_TRIGGER_WINDOW "Trigger.window" #define PN_RCU_TRIGGER_OPERATING_MODE "Trigger.operatingMode" -#define PN_RCU_TRIGGER_COEFF0 "Trigger.coeff0" -#define PN_RCU_TRIGGER_COEFF1 "Trigger.coeff1" -#define PN_RCU_TRIGGER_COEFF2 "Trigger.coeff2" -#define PN_RCU_TRIGGER_COEFF3 "Trigger.coeff3" +#define PN_RCU_TRIGGER_TRIGGER_MODE "Trigger.triggerMode" +#define PN_RCU_TRIGGER_FILTER0_COEFF0 "Trigger.filter0.coeff0" +#define PN_RCU_TRIGGER_FILTER0_COEFF1 "Trigger.filter0.coeff1" +#define PN_RCU_TRIGGER_FILTER0_COEFF2 "Trigger.filter0.coeff2" +#define PN_RCU_TRIGGER_FILTER0_COEFF3 "Trigger.filter0.coeff3" +#define PN_RCU_TRIGGER_FILTER1_COEFF0 "Trigger.filter1.coeff0" +#define PN_RCU_TRIGGER_FILTER1_COEFF1 "Trigger.filter1.coeff1" +#define PN_RCU_TRIGGER_FILTER1_COEFF2 "Trigger.filter1.coeff2" +#define PN_RCU_TRIGGER_FILTER1_COEFF3 "Trigger.filter1.coeff3" // TBBoard #define PSN_TB_BOARD "LOFAR_PIC_@cabinet@_@subrack@_@TBBoard@" @@ -272,6 +313,62 @@ #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" + +// HBAAntenna +#define PSN_HBA_ANTENNA "LOFAR_PIC_@hbaantenna@" +#define PST_HBA_ANTENNA "HBAAntenna" + +// 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" @@ -290,6 +387,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" @@ -306,19 +404,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@" @@ -326,6 +413,9 @@ #define PN_OBS_NAME "name" #define PN_OBS_CLAIM_CLAIM_DATE "claim.claimDate" #define PN_OBS_CLAIM_NAME "claim.name" +#define PN_OBS_RECEIVER_BITMAP "receiverBitmap" +#define PN_OBS_HBA_BITMAP "HBABitmap" +#define PN_OBS_LBA_BITMAP "LBABitmap" // BeamControl #define PSN_BEAM_CONTROL "LOFAR_ObsSW_@observation@_BeamControl" @@ -362,5 +452,6 @@ #define PN_TBC_TRIGGER_PEAK_VALUE "trigger.peakValue" #define PN_TBC_TRIGGER_FLAGS "trigger.flags" #define PN_TBC_TRIGGER_TABLE "trigger.table" +#define PN_TBC_TRIGGER_MISSED "trigger.missed" #endif diff --git a/MAC/APL/CEPCU/src/PythonControl/PVSSDatapointDefs.h b/MAC/APL/CEPCU/src/PythonControl/PVSSDatapointDefs.h index 19f33ca2d9a..9f83a52dda5 100644 --- a/MAC/APL/CEPCU/src/PythonControl/PVSSDatapointDefs.h +++ b/MAC/APL/CEPCU/src/PythonControl/PVSSDatapointDefs.h @@ -1,4 +1,4 @@ -// This file was generated by create_db_files v2.0 on Tue Mar 9 08:12:06 UTC 2010 +// This file was generated by create_db_files v2.0 on Tue Oct 9 13:22:37 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,25 +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" #define PN_OBSCTRL_COMMAND "command" -// 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" - // 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" @@ -94,16 +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" -// PythonControl -#define PSN_PYTHON_CONTROL "LOFAR_ObsSW_@observation@_PythonControl" -#define PST_PYTHON_CONTROL "PythonControl" +// 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@" @@ -160,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" @@ -243,10 +278,14 @@ #define PN_RCU_TRIGGER_WINDOW "Trigger.window" #define PN_RCU_TRIGGER_OPERATING_MODE "Trigger.operatingMode" #define PN_RCU_TRIGGER_TRIGGER_MODE "Trigger.triggerMode" -#define PN_RCU_TRIGGER_COEFF0 "Trigger.coeff0" -#define PN_RCU_TRIGGER_COEFF1 "Trigger.coeff1" -#define PN_RCU_TRIGGER_COEFF2 "Trigger.coeff2" -#define PN_RCU_TRIGGER_COEFF3 "Trigger.coeff3" +#define PN_RCU_TRIGGER_FILTER0_COEFF0 "Trigger.filter0.coeff0" +#define PN_RCU_TRIGGER_FILTER0_COEFF1 "Trigger.filter0.coeff1" +#define PN_RCU_TRIGGER_FILTER0_COEFF2 "Trigger.filter0.coeff2" +#define PN_RCU_TRIGGER_FILTER0_COEFF3 "Trigger.filter0.coeff3" +#define PN_RCU_TRIGGER_FILTER1_COEFF0 "Trigger.filter1.coeff0" +#define PN_RCU_TRIGGER_FILTER1_COEFF1 "Trigger.filter1.coeff1" +#define PN_RCU_TRIGGER_FILTER1_COEFF2 "Trigger.filter1.coeff2" +#define PN_RCU_TRIGGER_FILTER1_COEFF3 "Trigger.filter1.coeff3" // TBBoard #define PSN_TB_BOARD "LOFAR_PIC_@cabinet@_@subrack@_@TBBoard@" @@ -274,6 +313,62 @@ #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" + +// HBAAntenna +#define PSN_HBA_ANTENNA "LOFAR_PIC_@hbaantenna@" +#define PST_HBA_ANTENNA "HBAAntenna" + +// 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" @@ -292,6 +387,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" @@ -308,19 +404,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@" @@ -329,6 +414,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_HBA_BITMAP "HBABitmap" +#define PN_OBS_LBA_BITMAP "LBABitmap" // BeamControl #define PSN_BEAM_CONTROL "LOFAR_ObsSW_@observation@_BeamControl" diff --git a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/PVSSDatapointDefs.h b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/PVSSDatapointDefs.h index 5b9ef52cfd1..9f83a52dda5 100644 --- a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/PVSSDatapointDefs.h +++ b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/PVSSDatapointDefs.h @@ -1,4 +1,4 @@ -// This file was generated by create_db_files v2.0 on Tue Oct 9 10:22:18 UTC 2012 +// This file was generated by create_db_files v2.0 on Tue Oct 9 13:22:37 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" @@ -328,132 +316,58 @@ // 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" @@ -500,8 +414,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" +#define PN_OBS_HBA_BITMAP "HBABitmap" +#define PN_OBS_LBA_BITMAP "LBABitmap" // BeamControl #define PSN_BEAM_CONTROL "LOFAR_ObsSW_@observation@_BeamControl" diff --git a/MAC/APL/MainCU/src/CRTriggerControl/PVSSDatapointDefs.h b/MAC/APL/MainCU/src/CRTriggerControl/PVSSDatapointDefs.h index 5c125589922..9f83a52dda5 100644 --- a/MAC/APL/MainCU/src/CRTriggerControl/PVSSDatapointDefs.h +++ b/MAC/APL/MainCU/src/CRTriggerControl/PVSSDatapointDefs.h @@ -1,4 +1,4 @@ -// This file was generated by create_db_files v2.0 on Mon Jul 25 13:48:26 UTC 2011 +// This file was generated by create_db_files v2.0 on Tue Oct 9 13:22:37 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" @@ -57,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" @@ -64,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" @@ -97,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@" @@ -159,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" @@ -277,6 +313,62 @@ #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" + +// HBAAntenna +#define PSN_HBA_ANTENNA "LOFAR_PIC_@hbaantenna@" +#define PST_HBA_ANTENNA "HBAAntenna" + +// 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" @@ -295,6 +387,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" @@ -311,19 +404,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_DELTAZ "deltaZ" +#define PN_CLC_REQUESTED_BITMODE "requestedBitmode" +#define PN_CLC_ACTUAL_BITMODE "actualBitmode" // StnObservation #define PSN_STN_OBSERVATION "LOFAR_ObsSW_@observation@" @@ -332,6 +414,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_HBA_BITMAP "HBABitmap" +#define PN_OBS_LBA_BITMAP "LBABitmap" // BeamControl #define PSN_BEAM_CONTROL "LOFAR_ObsSW_@observation@_BeamControl" diff --git a/MAC/APL/MainCU/src/MACScheduler/PVSSDatapointDefs.h b/MAC/APL/MainCU/src/MACScheduler/PVSSDatapointDefs.h index 7da72b0148f..9f83a52dda5 100644 --- a/MAC/APL/MainCU/src/MACScheduler/PVSSDatapointDefs.h +++ b/MAC/APL/MainCU/src/MACScheduler/PVSSDatapointDefs.h @@ -1,4 +1,4 @@ -// This file was generated by create_db_files v2.0 on Tue Oct 9 12:57:00 UTC 2012 +// This file was generated by create_db_files v2.0 on Tue Oct 9 13:22:37 UTC 2012 #ifndef LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H #define LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H @@ -414,8 +414,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" +#define PN_OBS_HBA_BITMAP "HBABitmap" +#define PN_OBS_LBA_BITMAP "LBABitmap" // BeamControl #define PSN_BEAM_CONTROL "LOFAR_ObsSW_@observation@_BeamControl" diff --git a/MAC/APL/MainCU/src/ObservationControl/PVSSDatapointDefs.h b/MAC/APL/MainCU/src/ObservationControl/PVSSDatapointDefs.h index 0b0b6d33ec3..9f83a52dda5 100644 --- a/MAC/APL/MainCU/src/ObservationControl/PVSSDatapointDefs.h +++ b/MAC/APL/MainCU/src/ObservationControl/PVSSDatapointDefs.h @@ -1,4 +1,4 @@ -// This file was generated by create_db_files v2.0 on Tue Sep 8 12:34:54 UTC 2009 +// This file was generated by create_db_files v2.0 on Tue Oct 9 13:22:37 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,25 +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" #define PN_OBSCTRL_COMMAND "command" -// 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" - // 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" @@ -94,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@" @@ -156,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" @@ -238,10 +277,15 @@ #define PN_RCU_TRIGGER_FILTER "Trigger.filter" #define PN_RCU_TRIGGER_WINDOW "Trigger.window" #define PN_RCU_TRIGGER_OPERATING_MODE "Trigger.operatingMode" -#define PN_RCU_TRIGGER_COEFF0 "Trigger.coeff0" -#define PN_RCU_TRIGGER_COEFF1 "Trigger.coeff1" -#define PN_RCU_TRIGGER_COEFF2 "Trigger.coeff2" -#define PN_RCU_TRIGGER_COEFF3 "Trigger.coeff3" +#define PN_RCU_TRIGGER_TRIGGER_MODE "Trigger.triggerMode" +#define PN_RCU_TRIGGER_FILTER0_COEFF0 "Trigger.filter0.coeff0" +#define PN_RCU_TRIGGER_FILTER0_COEFF1 "Trigger.filter0.coeff1" +#define PN_RCU_TRIGGER_FILTER0_COEFF2 "Trigger.filter0.coeff2" +#define PN_RCU_TRIGGER_FILTER0_COEFF3 "Trigger.filter0.coeff3" +#define PN_RCU_TRIGGER_FILTER1_COEFF0 "Trigger.filter1.coeff0" +#define PN_RCU_TRIGGER_FILTER1_COEFF1 "Trigger.filter1.coeff1" +#define PN_RCU_TRIGGER_FILTER1_COEFF2 "Trigger.filter1.coeff2" +#define PN_RCU_TRIGGER_FILTER1_COEFF3 "Trigger.filter1.coeff3" // TBBoard #define PSN_TB_BOARD "LOFAR_PIC_@cabinet@_@subrack@_@TBBoard@" @@ -269,6 +313,62 @@ #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" + +// HBAAntenna +#define PSN_HBA_ANTENNA "LOFAR_PIC_@hbaantenna@" +#define PST_HBA_ANTENNA "HBAAntenna" + +// 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" @@ -287,6 +387,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" @@ -303,19 +404,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@" @@ -324,6 +414,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_HBA_BITMAP "HBABitmap" +#define PN_OBS_LBA_BITMAP "LBABitmap" // BeamControl #define PSN_BEAM_CONTROL "LOFAR_ObsSW_@observation@_BeamControl" @@ -360,5 +452,6 @@ #define PN_TBC_TRIGGER_PEAK_VALUE "trigger.peakValue" #define PN_TBC_TRIGGER_FLAGS "trigger.flags" #define PN_TBC_TRIGGER_TABLE "trigger.table" +#define PN_TBC_TRIGGER_MISSED "trigger.missed" #endif diff --git a/MAC/APL/StationCU/src/BeamControl/PVSSDatapointDefs.h b/MAC/APL/StationCU/src/BeamControl/PVSSDatapointDefs.h index 3ddc45b8e81..9f83a52dda5 100644 --- a/MAC/APL/StationCU/src/BeamControl/PVSSDatapointDefs.h +++ b/MAC/APL/StationCU/src/BeamControl/PVSSDatapointDefs.h @@ -1,4 +1,4 @@ -// This file was generated by create_db_files v1.0 on Wed Feb 4 15:00:05 UTC 2009 +// This file was generated by create_db_files v2.0 on Tue Oct 9 13:22:37 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,12 +25,15 @@ #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" #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" #define PN_OBS_START_TIME "startTime" @@ -54,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" @@ -61,24 +55,88 @@ #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" +#define PN_OBSCTRL_COMMAND "command" + +// 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" +#define PN_IPB_STREAM1_BLOCKS_IN "stream1.blocksIn" +#define PN_IPB_STREAM1_PERC_BAD "stream1.percBad" +#define PN_IPB_STREAM1_REJECTED "stream1.rejected" +#define PN_IPB_STREAM2_BLOCKS_IN "stream2.blocksIn" +#define PN_IPB_STREAM2_PERC_BAD "stream2.percBad" +#define PN_IPB_STREAM2_REJECTED "stream2.rejected" +#define PN_IPB_STREAM3_BLOCKS_IN "stream3.blocksIn" +#define PN_IPB_STREAM3_PERC_BAD "stream3.percBad" +#define PN_IPB_STREAM3_REJECTED "stream3.rejected" +#define PN_IPB_LATE "late" +#define PN_IPB_IO_TIME "IOTime" + +// 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" -// OnlineControl -#define PSN_ONLINE_CONTROL "LOFAR_ObsSW_@observation@_OnlineControl" -#define PST_ONLINE_CONTROL "OnlineControl" +// 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" -// Correlator -#define PSN_CORRELATOR "LOFAR_ObsSW_@observation@_OnlineControl_Correlator" -#define PST_CORRELATOR "Correlator" +// 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" -// StorageAppl -#define PSN_STORAGE_APPL "LOFAR_ObsSW_@observation@_OnlineControl_StorageAppl" -#define PST_STORAGE_APPL "StorageAppl" +// 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@" @@ -88,8 +146,8 @@ #define PN_CAB_FRONT_FAN_OUTER "frontFanOuter" #define PN_CAB_FRONT_AIRFLOW "frontAirflow" #define PN_CAB_BACK_DOOR_OPEN "backDoorOpen" -#define PN_CAB_BACKT_FAN_INNER "backtFanInner" -#define PN_CAB_BACKT_FAN_OUTER "backtFanOuter" +#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" @@ -135,7 +193,10 @@ #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" #define PN_RSP__ETHERNET_STATUS_CHILD_STATE "Ethernet.status.childState" #define PN_RSP__ETHERNET_STATUS_MESSAGE "Ethernet.status.message" @@ -216,10 +277,15 @@ #define PN_RCU_TRIGGER_FILTER "Trigger.filter" #define PN_RCU_TRIGGER_WINDOW "Trigger.window" #define PN_RCU_TRIGGER_OPERATING_MODE "Trigger.operatingMode" -#define PN_RCU_TRIGGER_COEFF0 "Trigger.coeff0" -#define PN_RCU_TRIGGER_COEFF1 "Trigger.coeff1" -#define PN_RCU_TRIGGER_COEFF2 "Trigger.coeff2" -#define PN_RCU_TRIGGER_COEFF3 "Trigger.coeff3" +#define PN_RCU_TRIGGER_TRIGGER_MODE "Trigger.triggerMode" +#define PN_RCU_TRIGGER_FILTER0_COEFF0 "Trigger.filter0.coeff0" +#define PN_RCU_TRIGGER_FILTER0_COEFF1 "Trigger.filter0.coeff1" +#define PN_RCU_TRIGGER_FILTER0_COEFF2 "Trigger.filter0.coeff2" +#define PN_RCU_TRIGGER_FILTER0_COEFF3 "Trigger.filter0.coeff3" +#define PN_RCU_TRIGGER_FILTER1_COEFF0 "Trigger.filter1.coeff0" +#define PN_RCU_TRIGGER_FILTER1_COEFF1 "Trigger.filter1.coeff1" +#define PN_RCU_TRIGGER_FILTER1_COEFF2 "Trigger.filter1.coeff2" +#define PN_RCU_TRIGGER_FILTER1_COEFF3 "Trigger.filter1.coeff3" // TBBoard #define PSN_TB_BOARD "LOFAR_PIC_@cabinet@_@subrack@_@TBBoard@" @@ -247,6 +313,62 @@ #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" + +// HBAAntenna +#define PSN_HBA_ANTENNA "LOFAR_PIC_@hbaantenna@" +#define PST_HBA_ANTENNA "HBAAntenna" + +// 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" @@ -260,10 +382,12 @@ #define PST_HARDWARE_MONITOR "HardwareMonitor" #define PN_HWM_RSP_CONNECTED "RSP.connected" #define PN_HWM_TBB_CONNECTED "TBB.connected" +#define PN_HWM_EC_CONNECTED "EC.connected" // 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" @@ -280,19 +404,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@" @@ -300,6 +413,9 @@ #define PN_OBS_NAME "name" #define PN_OBS_CLAIM_CLAIM_DATE "claim.claimDate" #define PN_OBS_CLAIM_NAME "claim.name" +#define PN_OBS_RECEIVER_BITMAP "receiverBitmap" +#define PN_OBS_HBA_BITMAP "HBABitmap" +#define PN_OBS_LBA_BITMAP "LBABitmap" // BeamControl #define PSN_BEAM_CONTROL "LOFAR_ObsSW_@observation@_BeamControl" @@ -336,5 +452,6 @@ #define PN_TBC_TRIGGER_PEAK_VALUE "trigger.peakValue" #define PN_TBC_TRIGGER_FLAGS "trigger.flags" #define PN_TBC_TRIGGER_TABLE "trigger.table" +#define PN_TBC_TRIGGER_MISSED "trigger.missed" #endif diff --git a/MAC/APL/StationCU/src/CalibrationControl/PVSSDatapointDefs.h b/MAC/APL/StationCU/src/CalibrationControl/PVSSDatapointDefs.h index 3ddc45b8e81..9f83a52dda5 100644 --- a/MAC/APL/StationCU/src/CalibrationControl/PVSSDatapointDefs.h +++ b/MAC/APL/StationCU/src/CalibrationControl/PVSSDatapointDefs.h @@ -1,4 +1,4 @@ -// This file was generated by create_db_files v1.0 on Wed Feb 4 15:00:05 UTC 2009 +// This file was generated by create_db_files v2.0 on Tue Oct 9 13:22:37 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,12 +25,15 @@ #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" #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" #define PN_OBS_START_TIME "startTime" @@ -54,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" @@ -61,24 +55,88 @@ #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" +#define PN_OBSCTRL_COMMAND "command" + +// 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" +#define PN_IPB_STREAM1_BLOCKS_IN "stream1.blocksIn" +#define PN_IPB_STREAM1_PERC_BAD "stream1.percBad" +#define PN_IPB_STREAM1_REJECTED "stream1.rejected" +#define PN_IPB_STREAM2_BLOCKS_IN "stream2.blocksIn" +#define PN_IPB_STREAM2_PERC_BAD "stream2.percBad" +#define PN_IPB_STREAM2_REJECTED "stream2.rejected" +#define PN_IPB_STREAM3_BLOCKS_IN "stream3.blocksIn" +#define PN_IPB_STREAM3_PERC_BAD "stream3.percBad" +#define PN_IPB_STREAM3_REJECTED "stream3.rejected" +#define PN_IPB_LATE "late" +#define PN_IPB_IO_TIME "IOTime" + +// 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" -// OnlineControl -#define PSN_ONLINE_CONTROL "LOFAR_ObsSW_@observation@_OnlineControl" -#define PST_ONLINE_CONTROL "OnlineControl" +// 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" -// Correlator -#define PSN_CORRELATOR "LOFAR_ObsSW_@observation@_OnlineControl_Correlator" -#define PST_CORRELATOR "Correlator" +// 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" -// StorageAppl -#define PSN_STORAGE_APPL "LOFAR_ObsSW_@observation@_OnlineControl_StorageAppl" -#define PST_STORAGE_APPL "StorageAppl" +// 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@" @@ -88,8 +146,8 @@ #define PN_CAB_FRONT_FAN_OUTER "frontFanOuter" #define PN_CAB_FRONT_AIRFLOW "frontAirflow" #define PN_CAB_BACK_DOOR_OPEN "backDoorOpen" -#define PN_CAB_BACKT_FAN_INNER "backtFanInner" -#define PN_CAB_BACKT_FAN_OUTER "backtFanOuter" +#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" @@ -135,7 +193,10 @@ #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" #define PN_RSP__ETHERNET_STATUS_CHILD_STATE "Ethernet.status.childState" #define PN_RSP__ETHERNET_STATUS_MESSAGE "Ethernet.status.message" @@ -216,10 +277,15 @@ #define PN_RCU_TRIGGER_FILTER "Trigger.filter" #define PN_RCU_TRIGGER_WINDOW "Trigger.window" #define PN_RCU_TRIGGER_OPERATING_MODE "Trigger.operatingMode" -#define PN_RCU_TRIGGER_COEFF0 "Trigger.coeff0" -#define PN_RCU_TRIGGER_COEFF1 "Trigger.coeff1" -#define PN_RCU_TRIGGER_COEFF2 "Trigger.coeff2" -#define PN_RCU_TRIGGER_COEFF3 "Trigger.coeff3" +#define PN_RCU_TRIGGER_TRIGGER_MODE "Trigger.triggerMode" +#define PN_RCU_TRIGGER_FILTER0_COEFF0 "Trigger.filter0.coeff0" +#define PN_RCU_TRIGGER_FILTER0_COEFF1 "Trigger.filter0.coeff1" +#define PN_RCU_TRIGGER_FILTER0_COEFF2 "Trigger.filter0.coeff2" +#define PN_RCU_TRIGGER_FILTER0_COEFF3 "Trigger.filter0.coeff3" +#define PN_RCU_TRIGGER_FILTER1_COEFF0 "Trigger.filter1.coeff0" +#define PN_RCU_TRIGGER_FILTER1_COEFF1 "Trigger.filter1.coeff1" +#define PN_RCU_TRIGGER_FILTER1_COEFF2 "Trigger.filter1.coeff2" +#define PN_RCU_TRIGGER_FILTER1_COEFF3 "Trigger.filter1.coeff3" // TBBoard #define PSN_TB_BOARD "LOFAR_PIC_@cabinet@_@subrack@_@TBBoard@" @@ -247,6 +313,62 @@ #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" + +// HBAAntenna +#define PSN_HBA_ANTENNA "LOFAR_PIC_@hbaantenna@" +#define PST_HBA_ANTENNA "HBAAntenna" + +// 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" @@ -260,10 +382,12 @@ #define PST_HARDWARE_MONITOR "HardwareMonitor" #define PN_HWM_RSP_CONNECTED "RSP.connected" #define PN_HWM_TBB_CONNECTED "TBB.connected" +#define PN_HWM_EC_CONNECTED "EC.connected" // 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" @@ -280,19 +404,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@" @@ -300,6 +413,9 @@ #define PN_OBS_NAME "name" #define PN_OBS_CLAIM_CLAIM_DATE "claim.claimDate" #define PN_OBS_CLAIM_NAME "claim.name" +#define PN_OBS_RECEIVER_BITMAP "receiverBitmap" +#define PN_OBS_HBA_BITMAP "HBABitmap" +#define PN_OBS_LBA_BITMAP "LBABitmap" // BeamControl #define PSN_BEAM_CONTROL "LOFAR_ObsSW_@observation@_BeamControl" @@ -336,5 +452,6 @@ #define PN_TBC_TRIGGER_PEAK_VALUE "trigger.peakValue" #define PN_TBC_TRIGGER_FLAGS "trigger.flags" #define PN_TBC_TRIGGER_TABLE "trigger.table" +#define PN_TBC_TRIGGER_MISSED "trigger.missed" #endif diff --git a/MAC/APL/StationCU/src/ClockControl/PVSSDatapointDefs.h b/MAC/APL/StationCU/src/ClockControl/PVSSDatapointDefs.h index 223eb1a0268..9f83a52dda5 100644 --- a/MAC/APL/StationCU/src/ClockControl/PVSSDatapointDefs.h +++ b/MAC/APL/StationCU/src/ClockControl/PVSSDatapointDefs.h @@ -1,4 +1,4 @@ -// This file was generated by create_db_files v1.0 on Wed Feb 4 15:00:05 UTC 2009 +// This file was generated by create_db_files v2.0 on Tue Oct 9 13:22:37 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,12 +25,15 @@ #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" #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" #define PN_OBS_START_TIME "startTime" @@ -54,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" @@ -61,24 +55,88 @@ #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" +#define PN_OBSCTRL_COMMAND "command" + +// 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" +#define PN_IPB_STREAM1_BLOCKS_IN "stream1.blocksIn" +#define PN_IPB_STREAM1_PERC_BAD "stream1.percBad" +#define PN_IPB_STREAM1_REJECTED "stream1.rejected" +#define PN_IPB_STREAM2_BLOCKS_IN "stream2.blocksIn" +#define PN_IPB_STREAM2_PERC_BAD "stream2.percBad" +#define PN_IPB_STREAM2_REJECTED "stream2.rejected" +#define PN_IPB_STREAM3_BLOCKS_IN "stream3.blocksIn" +#define PN_IPB_STREAM3_PERC_BAD "stream3.percBad" +#define PN_IPB_STREAM3_REJECTED "stream3.rejected" +#define PN_IPB_LATE "late" +#define PN_IPB_IO_TIME "IOTime" + +// 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" -// OnlineControl -#define PSN_ONLINE_CONTROL "LOFAR_ObsSW_@observation@_OnlineControl" -#define PST_ONLINE_CONTROL "OnlineControl" +// 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" -// Correlator -#define PSN_CORRELATOR "LOFAR_ObsSW_@observation@_OnlineControl_Correlator" -#define PST_CORRELATOR "Correlator" +// 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" -// StorageAppl -#define PSN_STORAGE_APPL "LOFAR_ObsSW_@observation@_OnlineControl_StorageAppl" -#define PST_STORAGE_APPL "StorageAppl" +// 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@" @@ -88,8 +146,8 @@ #define PN_CAB_FRONT_FAN_OUTER "frontFanOuter" #define PN_CAB_FRONT_AIRFLOW "frontAirflow" #define PN_CAB_BACK_DOOR_OPEN "backDoorOpen" -#define PN_CAB_BACKT_FAN_INNER "backtFanInner" -#define PN_CAB_BACKT_FAN_OUTER "backtFanOuter" +#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" @@ -135,7 +193,10 @@ #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" #define PN_RSP__ETHERNET_STATUS_CHILD_STATE "Ethernet.status.childState" #define PN_RSP__ETHERNET_STATUS_MESSAGE "Ethernet.status.message" @@ -216,10 +277,15 @@ #define PN_RCU_TRIGGER_FILTER "Trigger.filter" #define PN_RCU_TRIGGER_WINDOW "Trigger.window" #define PN_RCU_TRIGGER_OPERATING_MODE "Trigger.operatingMode" -#define PN_RCU_TRIGGER_COEFF0 "Trigger.coeff0" -#define PN_RCU_TRIGGER_COEFF1 "Trigger.coeff1" -#define PN_RCU_TRIGGER_COEFF2 "Trigger.coeff2" -#define PN_RCU_TRIGGER_COEFF3 "Trigger.coeff3" +#define PN_RCU_TRIGGER_TRIGGER_MODE "Trigger.triggerMode" +#define PN_RCU_TRIGGER_FILTER0_COEFF0 "Trigger.filter0.coeff0" +#define PN_RCU_TRIGGER_FILTER0_COEFF1 "Trigger.filter0.coeff1" +#define PN_RCU_TRIGGER_FILTER0_COEFF2 "Trigger.filter0.coeff2" +#define PN_RCU_TRIGGER_FILTER0_COEFF3 "Trigger.filter0.coeff3" +#define PN_RCU_TRIGGER_FILTER1_COEFF0 "Trigger.filter1.coeff0" +#define PN_RCU_TRIGGER_FILTER1_COEFF1 "Trigger.filter1.coeff1" +#define PN_RCU_TRIGGER_FILTER1_COEFF2 "Trigger.filter1.coeff2" +#define PN_RCU_TRIGGER_FILTER1_COEFF3 "Trigger.filter1.coeff3" // TBBoard #define PSN_TB_BOARD "LOFAR_PIC_@cabinet@_@subrack@_@TBBoard@" @@ -247,6 +313,62 @@ #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" + +// HBAAntenna +#define PSN_HBA_ANTENNA "LOFAR_PIC_@hbaantenna@" +#define PST_HBA_ANTENNA "HBAAntenna" + +// 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" @@ -260,10 +382,12 @@ #define PST_HARDWARE_MONITOR "HardwareMonitor" #define PN_HWM_RSP_CONNECTED "RSP.connected" #define PN_HWM_TBB_CONNECTED "TBB.connected" +#define PN_HWM_EC_CONNECTED "EC.connected" // 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" @@ -283,25 +407,15 @@ #define PN_CLC_REQUESTED_BITMODE "requestedBitmode" #define PN_CLC_ACTUAL_BITMODE "actualBitmode" -// 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" +#define PN_OBS_RECEIVER_BITMAP "receiverBitmap" +#define PN_OBS_HBA_BITMAP "HBABitmap" +#define PN_OBS_LBA_BITMAP "LBABitmap" // BeamControl #define PSN_BEAM_CONTROL "LOFAR_ObsSW_@observation@_BeamControl" @@ -338,5 +452,6 @@ #define PN_TBC_TRIGGER_PEAK_VALUE "trigger.peakValue" #define PN_TBC_TRIGGER_FLAGS "trigger.flags" #define PN_TBC_TRIGGER_TABLE "trigger.table" +#define PN_TBC_TRIGGER_MISSED "trigger.missed" #endif diff --git a/MAC/APL/StationCU/src/HardwareMonitor/PVSSDatapointDefs.h b/MAC/APL/StationCU/src/HardwareMonitor/PVSSDatapointDefs.h index 6ac3f4355be..9f83a52dda5 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 Tue Oct 9 12:42:34 UTC 2012 +// This file was generated by create_db_files v2.0 on Tue Oct 9 13:22:37 UTC 2012 #ifndef LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H #define LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H @@ -316,132 +316,10 @@ // 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" @@ -536,8 +414,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" +#define PN_OBS_HBA_BITMAP "HBABitmap" +#define PN_OBS_LBA_BITMAP "LBABitmap" // BeamControl #define PSN_BEAM_CONTROL "LOFAR_ObsSW_@observation@_BeamControl" diff --git a/MAC/APL/StationCU/src/StationControl/PVSSDatapointDefs.h b/MAC/APL/StationCU/src/StationControl/PVSSDatapointDefs.h index 8834630bd6a..9f83a52dda5 100644 --- a/MAC/APL/StationCU/src/StationControl/PVSSDatapointDefs.h +++ b/MAC/APL/StationCU/src/StationControl/PVSSDatapointDefs.h @@ -1,4 +1,4 @@ -// This file was generated by create_db_files v2.0 on Thu Jan 5 11:01:56 UTC 2012 +// This file was generated by create_db_files v2.0 on Tue Oct 9 13:22:37 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,12 +55,18 @@ #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" +#define PN_OBSCTRL_COMMAND "command" // InputBuffer #define PSN_INPUT_BUFFER "LOFAR_PermSW_@psionode@_InputBuffer" @@ -93,20 +94,21 @@ #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_TIME "time" -#define PN_WTR_COUNT "count" +#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_PRODUKT_TYPE "dataProduktType" +#define PN_WTR_DATA_PRODUCT_TYPE "dataProductType" #define PN_WTR_OBSERVATION_NAME "observationName" // IONode @@ -131,7 +133,7 @@ #define PN_LCN_CLAIMED "claimed" // CEPHardwareMonitor -#define PSN_CEP_HARDWARE_MONITOR "LOFAR_PermSW_HardwareMonitor" +#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" @@ -191,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" @@ -312,84 +316,58 @@ // 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_STATE "element00.status.state" -#define PN_HBA_ELEMENT00_STATUS_CHILD_STATE "element00.status.childState" -#define PN_HBA_ELEMENT00_STATUS_MESSAGE "element00.status.message" -#define PN_HBA_ELEMENT00_STATUS_LEAF "element00.status.leaf" -#define PN_HBA_ELEMENT01_STATUS_STATE "element01.status.state" -#define PN_HBA_ELEMENT01_STATUS_CHILD_STATE "element01.status.childState" -#define PN_HBA_ELEMENT01_STATUS_MESSAGE "element01.status.message" -#define PN_HBA_ELEMENT01_STATUS_LEAF "element01.status.leaf" -#define PN_HBA_ELEMENT02_STATUS_STATE "element02.status.state" -#define PN_HBA_ELEMENT02_STATUS_CHILD_STATE "element02.status.childState" -#define PN_HBA_ELEMENT02_STATUS_MESSAGE "element02.status.message" -#define PN_HBA_ELEMENT02_STATUS_LEAF "element02.status.leaf" -#define PN_HBA_ELEMENT03_STATUS_STATE "element03.status.state" -#define PN_HBA_ELEMENT03_STATUS_CHILD_STATE "element03.status.childState" -#define PN_HBA_ELEMENT03_STATUS_MESSAGE "element03.status.message" -#define PN_HBA_ELEMENT03_STATUS_LEAF "element03.status.leaf" -#define PN_HBA_ELEMENT04_STATUS_STATE "element04.status.state" -#define PN_HBA_ELEMENT04_STATUS_CHILD_STATE "element04.status.childState" -#define PN_HBA_ELEMENT04_STATUS_MESSAGE "element04.status.message" -#define PN_HBA_ELEMENT04_STATUS_LEAF "element04.status.leaf" -#define PN_HBA_ELEMENT05_STATUS_STATE "element05.status.state" -#define PN_HBA_ELEMENT05_STATUS_CHILD_STATE "element05.status.childState" -#define PN_HBA_ELEMENT05_STATUS_MESSAGE "element05.status.message" -#define PN_HBA_ELEMENT05_STATUS_LEAF "element05.status.leaf" -#define PN_HBA_ELEMENT06_STATUS_STATE "element06.status.state" -#define PN_HBA_ELEMENT06_STATUS_CHILD_STATE "element06.status.childState" -#define PN_HBA_ELEMENT06_STATUS_MESSAGE "element06.status.message" -#define PN_HBA_ELEMENT06_STATUS_LEAF "element06.status.leaf" -#define PN_HBA_ELEMENT07_STATUS_STATE "element07.status.state" -#define PN_HBA_ELEMENT07_STATUS_CHILD_STATE "element07.status.childState" -#define PN_HBA_ELEMENT07_STATUS_MESSAGE "element07.status.message" -#define PN_HBA_ELEMENT07_STATUS_LEAF "element07.status.leaf" -#define PN_HBA_ELEMENT08_STATUS_STATE "element08.status.state" -#define PN_HBA_ELEMENT08_STATUS_CHILD_STATE "element08.status.childState" -#define PN_HBA_ELEMENT08_STATUS_MESSAGE "element08.status.message" -#define PN_HBA_ELEMENT08_STATUS_LEAF "element08.status.leaf" -#define PN_HBA_ELEMENT09_STATUS_STATE "element09.status.state" -#define PN_HBA_ELEMENT09_STATUS_CHILD_STATE "element09.status.childState" -#define PN_HBA_ELEMENT09_STATUS_MESSAGE "element09.status.message" -#define PN_HBA_ELEMENT09_STATUS_LEAF "element09.status.leaf" -#define PN_HBA_ELEMENT10_STATUS_STATE "element10.status.state" -#define PN_HBA_ELEMENT10_STATUS_CHILD_STATE "element10.status.childState" -#define PN_HBA_ELEMENT10_STATUS_MESSAGE "element10.status.message" -#define PN_HBA_ELEMENT10_STATUS_LEAF "element10.status.leaf" -#define PN_HBA_ELEMENT11_STATUS_STATE "element11.status.state" -#define PN_HBA_ELEMENT11_STATUS_CHILD_STATE "element11.status.childState" -#define PN_HBA_ELEMENT11_STATUS_MESSAGE "element11.status.message" -#define PN_HBA_ELEMENT11_STATUS_LEAF "element11.status.leaf" -#define PN_HBA_ELEMENT12_STATUS_STATE "element12.status.state" -#define PN_HBA_ELEMENT12_STATUS_CHILD_STATE "element12.status.childState" -#define PN_HBA_ELEMENT12_STATUS_MESSAGE "element12.status.message" -#define PN_HBA_ELEMENT12_STATUS_LEAF "element12.status.leaf" -#define PN_HBA_ELEMENT13_STATUS_STATE "element13.status.state" -#define PN_HBA_ELEMENT13_STATUS_CHILD_STATE "element13.status.childState" -#define PN_HBA_ELEMENT13_STATUS_MESSAGE "element13.status.message" -#define PN_HBA_ELEMENT13_STATUS_LEAF "element13.status.leaf" -#define PN_HBA_ELEMENT14_STATUS_STATE "element14.status.state" -#define PN_HBA_ELEMENT14_STATUS_CHILD_STATE "element14.status.childState" -#define PN_HBA_ELEMENT14_STATUS_MESSAGE "element14.status.message" -#define PN_HBA_ELEMENT14_STATUS_LEAF "element14.status.leaf" -#define PN_HBA_ELEMENT15_STATUS_STATE "element15.status.state" -#define PN_HBA_ELEMENT15_STATUS_CHILD_STATE "element15.status.childState" -#define PN_HBA_ELEMENT15_STATUS_MESSAGE "element15.status.message" -#define PN_HBA_ELEMENT15_STATUS_LEAF "element15.status.leaf" + +// 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" @@ -409,6 +387,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" @@ -435,8 +414,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_LBA_BITMAP "LBAbitmap" -#define PN_OBS_HBA_BITMAP "HBAbitmap" +#define PN_OBS_HBA_BITMAP "HBABitmap" +#define PN_OBS_LBA_BITMAP "LBABitmap" // BeamControl #define PSN_BEAM_CONTROL "LOFAR_ObsSW_@observation@_BeamControl" diff --git a/MAC/APL/StationCU/src/TBBControl/PVSSDatapointDefs.h b/MAC/APL/StationCU/src/TBBControl/PVSSDatapointDefs.h index 6cb9a56637b..9f83a52dda5 100644 --- a/MAC/APL/StationCU/src/TBBControl/PVSSDatapointDefs.h +++ b/MAC/APL/StationCU/src/TBBControl/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 13:22:37 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,62 @@ #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" + +// HBAAntenna +#define PSN_HBA_ANTENNA "LOFAR_PIC_@hbaantenna@" +#define PST_HBA_ANTENNA "HBAAntenna" + +// 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 +387,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 +404,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 +414,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_HBA_BITMAP "HBABitmap" +#define PN_OBS_LBA_BITMAP "LBABitmap" // BeamControl #define PSN_BEAM_CONTROL "LOFAR_ObsSW_@observation@_BeamControl" -- GitLab