diff --git a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSDatapointDefs.h b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSDatapointDefs.h index a629930544acd08fc8f4941b0e574da0cceeee5c..44b6b53fcac8a914de36587f1a436d3933b11fa5 100644 --- a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSDatapointDefs.h +++ b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSDatapointDefs.h @@ -1,4 +1,4 @@ -// This file was generated by create_db_files v2.0 on Tue Oct 9 13:22:37 UTC 2012 +// This file was generated by create_db_files v2.0 on Mon Feb 24 16:30:50 CET 2014 #ifndef LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H #define LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H @@ -33,6 +33,7 @@ #define PSN_OBSERVATION "LOFAR_ObsSW_@observation@" #define PST_OBSERVATION "Observation" #define PN_OBS_CLAIM_CLAIM_DATE "claim.claimDate" +#define PN_OBS_CLAIM_FREE_DATE "claim.freeDate" #define PN_OBS_CLAIM_NAME "claim.name" #define PN_OBS_CLAIM_PERIOD "claimPeriod" #define PN_OBS_PREPARE_PERIOD "preparePeriod" @@ -117,13 +118,18 @@ #define PN_ION_STATION0 "station0" #define PN_ION_IP0 "IP0" #define PN_ION_MAC0 "MAC0" +#define PN_ION_RSP0 "RSP0" #define PN_ION_STATION1 "station1" #define PN_ION_IP1 "IP1" #define PN_ION_MAC1 "MAC1" +#define PN_ION_RSP1 "RSP1" +#define PN_ION_MAC_FOREIGN "MACForeign" +#define PN_ION_RSP_FOREIGN "RSPForeign" #define PN_ION_USE2ND_STATION "use2ndStation" #define PN_ION_USED_STATION "usedStation" #define PN_ION_USEDIP "usedIP" #define PN_ION_USEDMAC "usedMAC" +#define PN_ION_USEDRSP "usedRSP" // LocusNode #define PSN_LOCUS_NODE "LOFAR_PIC_@osrack@_@locusnode@" @@ -138,6 +144,66 @@ #define PN_CHM_BGP_CONNECTED "BGP.connected" #define PN_CHM_CLUSTER_CONNECTED "Cluster.connected" +// OnlineControl +#define PSN_ONLINE_CONTROL "LOFAR_ObsSW_@observation@_OnlineControl" +#define PST_ONLINE_CONTROL "OnlineControl" + +// BGPAppl +#define PSN_BGP_APPL "LOFAR_ObsSW_@observation@_OnlineControl_BGPAppl" +#define PST_BGP_APPL "BGPAppl" +#define PN_BGPA_IO_NODE_LIST "ioNodeList" +#define PN_BGPA_ADDER_LIST "adderList" +#define PN_BGPA_LOCUS_NODE_LIST "locusNodeList" +#define PN_BGPA_WRITER_LIST "writerList" +#define PN_BGPA_DATA_PRODUCT_LIST "dataProductList" +#define PN_BGPA_DATA_PRODUCT_TYPE_LIST "dataProductTypeList" + +// CobaltNIC +#define PSN_COBALTNIC "LOFAR_PIC_Cobalt_@cobaltnode@_@cobaltnic@" +#define PST_COBALTNIC "CobaltNIC" +#define PN_CNI_NODE "Node" +#define PN_CNI_CPU "CPU" +#define PN_CNI_INTERFACE "Interface" +#define PN_CNI_MAC "MAC" +#define PN_CNI_STATION_LIST "stationList" +#define PN_CNI_RSP_LIST "RSPList" +#define PN_CNI_IP_LIST "IPList" + +// CobaltStationInput +#define PSN_COBALT_STATION_INPUT "LOFAR_PermSW_@pscobaltnode@_CobaltStationInput" +#define PST_COBALT_STATION_INPUT "CobaltStationInput" +#define PN_CSI_STATION_NAME "stationName" +#define PN_CSI_OBSERVATION_NAME "observationName" +#define PN_CSI_STREAM0_BLOCKS_IN "stream0.blocksIn" +#define PN_CSI_STREAM0_REJECTED "stream0.rejected" +#define PN_CSI_STREAM1_BLOCKS_IN "stream1.blocksIn" +#define PN_CSI_STREAM1_REJECTED "stream1.rejected" +#define PN_CSI_STREAM2_BLOCKS_IN "stream2.blocksIn" +#define PN_CSI_STREAM2_REJECTED "stream2.rejected" +#define PN_CSI_STREAM3_BLOCKS_IN "stream3.blocksIn" +#define PN_CSI_STREAM3_REJECTED "stream3.rejected" + +// CobaltGPUProc +#define PSN_COBALTGPU_PROC "LOFAR_ObsSW_@observation@_@oscobaltnode@_@cobaltgpuproc@" +#define PST_COBALTGPU_PROC "CobaltGPUProc" +#define PN_CGP_OBSERVATION_NAME "observationName" +#define PN_CGP_DATA_PRODUCT_TYPE "dataProductType" +#define PN_CGP_SUBBAND "subband" +#define PN_CGP_DROPPING "dropping" +#define PN_CGP_WRITTEN "written" +#define PN_CGP_DROPPED "dropped" + +// CobaltOutputProc +#define PSN_COBALT_OUTPUT_PROC "LOFAR_ObsSW_@observation@_CobaltOutputProc" +#define PST_COBALT_OUTPUT_PROC "CobaltOutputProc" +#define PN_COP_LOCUS_NODE "locusNode" +#define PN_COP_DATA_PRODUCT_TYPE "dataProductType" +#define PN_COP_FILE_NAME "fileName" +#define PN_COP_DIRECTORY "directory" +#define PN_COP_DROPPING "dropping" +#define PN_COP_WRITTEN "written" +#define PN_COP_DROPPED "dropped" + // Cabinet #define PSN_CABINET "LOFAR_PIC_@cabinet@" #define PST_CABINET "Cabinet" @@ -267,6 +333,7 @@ #define PN_RCU_ATTENUATION "Attenuation" #define PN_RCU_NOF_OVERFLOW "nofOverflow" #define PN_RCU_ADC_STATISTICS_OVERFLOW "ADCStatistics.overflow" +#define PN_RCU_ANTENNAS "antennas" #define PN_RCU_TBB_ERROR "TBB.error" #define PN_RCU_TBB_MODE "TBB.mode" #define PN_RCU_TBB_START_ADDR "TBB.startAddr" @@ -308,6 +375,7 @@ #define PN_TBB_TEMPMP1 "tempMP1" #define PN_TBB_TEMPMP2 "tempMP2" #define PN_TBB_TEMPMP3 "tempMP3" +#define PN_TBB_RECORDING "recording" #define PN_TBB_IMAGE_INFO_VERSION "imageInfo.version" #define PN_TBB_IMAGE_INFO_WRITE_DATE "imageInfo.writeDate" #define PN_TBB_IMAGE_INFO_TP_FILE "imageInfo.TPFile" @@ -333,9 +401,13 @@ #define PN_STI_WIDE_LBAS "wide_LBAS" #define PN_STI_POWER48_ON "power48On" #define PN_STI_POWER220_ON "power220On" +#define PN_STI_DATASTREAM0 "datastream0" +#define PN_STI_DATASTREAM1 "datastream1" #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_NR_BROKEN "HBA.nrBroken" +#define PN_STI_HBA_NR_BROKEN_ARCHIVE "HBA.nrBrokenArchive" #define PN_STI_HBA_CENTERX "HBA.centerX" #define PN_STI_HBA_CENTERY "HBA.centerY" #define PN_STI_HBA_CENTERZ "HBA.centerZ" @@ -359,6 +431,8 @@ #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_NR_BROKEN "LBA.nrBroken" +#define PN_STI_LBA_NR_BROKEN_ARCHIVE "LBA.nrBrokenArchive" #define PN_STI_LBA_CENTERX "LBA.centerX" #define PN_STI_LBA_CENTERY "LBA.centerY" #define PN_STI_LBA_CENTERZ "LBA.centerZ" @@ -373,9 +447,14 @@ #define PSN_LOG_PROCESSOR "LOFAR_PermSW_Daemons_LogProcessor" #define PST_LOG_PROCESSOR "LogProcessor" -// PVSSGateway -#define PSN_PVSS_GATEWAY "LOFAR_PermSW_Daemons_PVSSGateway" -#define PST_PVSS_GATEWAY "PVSSGateway" +// SASGateway +#define PSN_SAS_GATEWAY "LOFAR_PermSW_Daemons_SASGateway" +#define PST_SAS_GATEWAY "SASGateway" + +// SoftwareMonitor +#define PSN_SOFTWARE_MONITOR "LOFAR_PermSW_Daemons_SoftwareMonitor" +#define PST_SOFTWARE_MONITOR "SoftwareMonitor" +#define PN_SWM_SW_LEVEL "SWLevel" // HardwareMonitor #define PSN_HARDWARE_MONITOR "LOFAR_PermSW_HardwareMonitor" @@ -384,11 +463,6 @@ #define PN_HWM_TBB_CONNECTED "TBB.connected" #define PN_HWM_EC_CONNECTED "EC.connected" -// SoftwareMonitor -#define PSN_SOFTWARE_MONITOR "LOFAR_PermSW_Daemons_SoftwareMonitor" -#define PST_SOFTWARE_MONITOR "SoftwareMonitor" -#define PN_SWM_SW_LEVEL "SWLevel" - // SHMInfoServer #define PSN_SHM_INFO_SERVER "LOFAR_PermSW_SHMInfoServer" #define PST_SHM_INFO_SERVER "SHMInfoServer" @@ -412,6 +486,7 @@ #define PST_STN_OBSERVATION "StnObservation" #define PN_OBS_NAME "name" #define PN_OBS_CLAIM_CLAIM_DATE "claim.claimDate" +#define PN_OBS_CLAIM_FREE_DATE "claim.freeDate" #define PN_OBS_CLAIM_NAME "claim.name" #define PN_OBS_RECEIVER_BITMAP "receiverBitmap" #define PN_OBS_HBA_BITMAP "HBABitmap" diff --git a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.h b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.h index b93fb1187156db91037b276562dc927c323c467e..b9cbf4931598c9357b62a68e53e9dcc9859b866c 100644 --- a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.h +++ b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.h @@ -20,8 +20,8 @@ //# //# $Id: PVSSGateway.h 19796 2012-01-17 10:06:03Z overeem $ -#ifndef KEYVALUELOGGER_H -#define KEYVALUELOGGER_H +#ifndef PVSSGATEWAY_H +#define PVSSGATEWAY_H // \file PVSSGateway.h // one_line_description