Bug 1189: Moved some constants to LofarConstants.

LCS/Common/include/Common/LofarConstants.h

@@ -29,12 +29,19 @@
 //# Never #include <config.h> or #include <lofar_config.h> in a header file!
 
 namespace LOFAR {
-	static const int N_POL					= 2;			// Number of polarizations
-	static const int MAX_RCUS				= 96  * N_POL;	// Max number of RCU's in one station
-	static const int MAX_SUBBANDS			= 512;			// Number of subbands that are created
-	static const int MAX_BEAMLETS			= 216;			// Max number of beamlets comming from one station
-	static const int MAX_BEAMLETS_PER_RSP	= 54;			// Max number of beamlets comming from one RSPboard
-	static const int N_HBA_ELEM_PER_TILE	= 16;			// Number of High Band antenna per tile
+	static const int N_POL					  = 2;				// Number of polarizations
+	static const int MAX_RCUS				  = 96  * N_POL;	// Max number of RCU's in one station
+	static const int MAX_SUBBANDS			  = 512;			// Number of subbands that are created
+	static const int MAX_BEAMLETS			  = 216;			// Max number of beamlets comming from one station
+	static const int MAX_BEAMLETS_PER_RSP	  = 54;				// Max number of beamlets comming from one RSPboard
+	static const int N_HBA_ELEM_PER_TILE	  = 16;				// Number of High Band antenna per tile
+	static const int NR_SUBRACKS_PER_CABINET  = 2;
+	static const int NR_RSPBOARDS_PER_SUBRACK = 4;
+	static const int NR_TBBOARDS_PER_RSPBOARD = 2;
+	static const int NR_RCUS_PER_RSPBOARD     = 8;
+	static const int NR_RCUS_PER_TBBOARD      = (NR_TBBOARDS_PER_RSPBOARD * NR_RCUS_PER_RSPBOARD);
+	static const int NR_RCUS_PER_SUBRACK      = (NR_RCUS_PER_RSPBOARD * NR_RSPBOARDS_PER_SUBRACK);
+	static const int NR_RCUS_PER_CABINET      = (NR_RCUS_PER_SUBRACK  * NR_SUBRACKS_PER_CABINET);
 }
 
 #endif

MAC/APL/RTCCommon/include/APL/RTCCommon/RegisterState.h

@@ -68,7 +68,7 @@ namespace LOFAR {
 	 *            reset          read          |
 	 *               \     +--------------->  READ ------+ read_ack
 	 *                \    |                    *        |
-	 *                 *   |           schedule_|read    *       clear
+	 *                 .   |           schedule_|read    *       clear
 	 * UNDEFINED ---> IDLE + <---+              |       DONE --------------->+
 	 *                 ^   | not_|modified      |        ^                   |
 	 *                 |   |     |              |        |                   |

MAC/APL/StationCU/src/HardwareMonitor/RCUConstants.h

@@ -45,16 +45,6 @@ static const uint32	LB_FILTER_OFFSET	= 18;
 static const uint32	ATT_MASK			= 0x00F80000;
 static const uint32	ATT_OFFSET			= 19;
 
-
-// NOTE: THESE CONSTANTS SHOULD BE SOMEWHERE AT A GLOBAL PLACE
-static const uint32	NR_SUBRACKS_PER_CABINET	 = 2;
-static const uint32	NR_RSPBOARDS_PER_SUBRACK = 4;
-static const uint32	NR_TBBOARDS_PER_RSPBOARD = 2;
-static const uint32	NR_RCUS_PER_RSPBOARD	 = 8;
-static const uint32	NR_RCUS_PER_TBBOARD		 = (NR_TBBOARDS_PER_RSPBOARD * NR_RCUS_PER_RSPBOARD);
-static const uint32	NR_RCUS_PER_SUBRACK		 = (NR_RCUS_PER_RSPBOARD * NR_RSPBOARDS_PER_SUBRACK);
-static const uint32	NR_RCUS_PER_CABINET		 = (NR_RCUS_PER_SUBRACK  * NR_SUBRACKS_PER_CABINET);
-
 #define PN_RSP_AP_VERSION_MASK		"AP%d.version"
 
   } // namespace StationCU

MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.cc

@@ -21,6 +21,7 @@
 //#  $Id: RSPMonitor.cc 10505 2007-09-07 17:14:57Z overeem $
 #include <lofar_config.h>
 #include <Common/LofarLogger.h>
+#include <Common/LofarConstants.h>
 
 #include <GCF/PVSS/GCF_PVTypes.h>
 #include <MACIO/MACServiceInfo.h>

MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc

@@ -21,6 +21,7 @@
 //#  $Id: TBBMonitor.cc 10505 2007-09-07 17:14:57Z overeem $
 #include <lofar_config.h>
 #include <Common/LofarLogger.h>
+#include <Common/LofarConstants.h>
 #include <Common/lofar_datetime.h>
 
 #include <GCF/PVSS/GCF_PVTypes.h>