Task #1418: Added 'MACProcessScope' marker to the logstream so that the...

Task #1418: Added 'MACProcessScope' marker to the logstream so that the information is shown in the Navigator.

MAC/APL/CEPCU/src/PythonControl/PVSSDatapointDefs.h

-// 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 Tue Sep 24 10:09:50 UTC 2013
 
 #ifndef LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H
 #define LOFAR_DEPLOYMENT_PVSSDATAPOINTS_H
@@ -120,6 +120,7 @@
 #define PN_ION_STATION1	"station1"
 #define PN_ION_IP1	"IP1"
 #define PN_ION_MAC1	"MAC1"
+#define PN_ION_MAC_FOREIGN	"MACForeign"
 #define PN_ION_USE2ND_STATION	"use2ndStation"
 #define PN_ION_USED_STATION	"usedStation"
 #define PN_ION_USEDIP	"usedIP"
@@ -138,6 +139,59 @@
 #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"
+
+// PythonControl
+#define PSN_PYTHON_CONTROL	"LOFAR_ObsSW_@observation@_PythonControl"
+#define PST_PYTHON_CONTROL	"PythonControl"
+
+// 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"
+
+// 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 +321,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 +363,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 +389,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 +419,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"
@@ -377,6 +439,11 @@
 #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"
 #define PST_HARDWARE_MONITOR	"HardwareMonitor"
@@ -384,11 +451,6 @@
 #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"
 #define PST_SHM_INFO_SERVER	"SHMInfoServer"

MAC/APL/CEPCU/src/PythonControl/PythonControl.cc

@@ -88,6 +88,9 @@ PythonControl::PythonControl(const string&	cntlrName) :
 	LOG_DEBUG_STR("Reading parset file:" << LOFAR_SHARE_LOCATION << "/" << cntlrName);
 	globalParameterSet()->adoptFile(string(LOFAR_SHARE_LOCATION)+"/"+cntlrName);
 
+	LOG_INFO_STR("MACProcessScope: " << createPropertySetName(PSN_PYTHON_CONTROL, getName(), 
+																	globalParameterSet()->getString("_DPname")));
+
 	// attach to parent control task
 	itsParentControl = ParentControl::instance();