diff --git a/.gitattributes b/.gitattributes
index 2488a001864952cd8c01d07856c0adf694915aa6..1d2873f4b02fa6b5a22f03d51d1cb1dd510de4ef 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -876,6 +876,8 @@ MAC/APL/PAC/ICAL_Protocol/src/SpectralWindow.cc -text
MAC/APL/PAC/ICAL_Protocol/src/SubArray.cc -text
MAC/APL/PAC/ITRFBeamServer/CMakeLists.txt -text
MAC/APL/PAC/ITRFBeamServer/src/CMakeLists.txt -text
+MAC/APL/PAC/ITRFBeamServer/src/StatCal.cc -text
+MAC/APL/PAC/ITRFBeamServer/src/StatCal.h -text
MAC/APL/PAC/ITRFBeamServer/src/iBeamServer.conf.in -text
MAC/APL/PAC/ITRFBeamServer/src/ibeamctl.conf.in -text
MAC/APL/PAC/ITRFBeamServer/test/AntennaField.conf -text
@@ -887,6 +889,7 @@ MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc -text
MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.log_prop -text
MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc -text
MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.log_prop -text
+MAC/APL/PAC/ITRFBeamServer/test/tStatCal.cc -text
MAC/APL/PAC/ITRFCalServer/CMakeLists.txt -text
MAC/APL/PAC/ITRFCalServer/src/ACC.cc -text
MAC/APL/PAC/ITRFCalServer/src/ACC.h -text
@@ -992,11 +995,14 @@ MAC/Deployment/data/Coordinates/ETRF_FILES/CS004/cs004-antenna-positions-etrs.cs
MAC/Deployment/data/Coordinates/ETRF_FILES/CS005/cs005-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/CS006/cs006-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/CS007/cs007-antenna-positions-etrs.csv -text
+MAC/Deployment/data/Coordinates/ETRF_FILES/CS011/cs011-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/CS017/cs017-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/CS021/cs021-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/CS024/cs024-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/CS026/cs026-antenna-positions-etrs.csv -text
+MAC/Deployment/data/Coordinates/ETRF_FILES/CS028/cs028-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/CS030/cs030-antenna-positions-etrs.csv -text
+MAC/Deployment/data/Coordinates/ETRF_FILES/CS031/cs031-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/CS032/cs032-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/CS101/cs101-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/CS103/cs103-antenna-positions-etrs.csv -text
@@ -1005,17 +1011,21 @@ MAC/Deployment/data/Coordinates/ETRF_FILES/CS301/cs301-antenna-positions-etrs.cs
MAC/Deployment/data/Coordinates/ETRF_FILES/CS302/cs302-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/CS401/cs401-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/CS501/cs501-antenna-positions-etrs.csv -text
-MAC/Deployment/data/Coordinates/ETRF_FILES/Chillbolton/uk608-antenna-positions-etrs.csv -text
-MAC/Deployment/data/Coordinates/ETRF_FILES/Effelsberg/de601-antenna-positions-etrs.csv -text
-MAC/Deployment/data/Coordinates/ETRF_FILES/Nancay/fr606-wiring-etrs.csv -text
-MAC/Deployment/data/Coordinates/ETRF_FILES/Potsdam/de604-antenna-positions-etrs.csv -text
+MAC/Deployment/data/Coordinates/ETRF_FILES/DE601/de601-antenna-positions-etrs.csv -text
+MAC/Deployment/data/Coordinates/ETRF_FILES/DE602/de602-antenna-positions-etrs.csv -text
+MAC/Deployment/data/Coordinates/ETRF_FILES/DE603/de603-antenna-positions-etrs.csv -text
+MAC/Deployment/data/Coordinates/ETRF_FILES/DE604/de604-antenna-positions-etrs.csv -text
+MAC/Deployment/data/Coordinates/ETRF_FILES/DE605/de605-antenna-positions-etrs.csv -text
+MAC/Deployment/data/Coordinates/ETRF_FILES/FR606/fr606-wiring-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/RS106/rs106-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/RS205/rs205-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/RS208/rs208-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/RS306/rs306-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/RS307/rs307-antenna-positions-etrs.csv -text
+MAC/Deployment/data/Coordinates/ETRF_FILES/RS406/rs406-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/RS503/rs503-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/RS509/rs509-antenna-positions-etrs.csv -text
+MAC/Deployment/data/Coordinates/ETRF_FILES/UK608/uk608-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/HBADeltas_default.conf -text
MAC/Deployment/data/Coordinates/LOFAR-ECEF-RD-01.csv -text
MAC/Deployment/data/Coordinates/add_field_rotation_func.sql -text
@@ -1069,11 +1079,15 @@ MAC/Deployment/data/Coordinates/vectors-and-matrices/CS006/cs006-lba-core-soluti
MAC/Deployment/data/Coordinates/vectors-and-matrices/CS007/cs007-hba0-core-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/CS007/cs007-hba1-core-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/CS007/cs007-lba-core-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/CS011/cs011-core-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/CS013/cs013-core-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/CS017/cs017-core-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/CS021/cs021-core-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/CS024/cs024-core-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/CS026/cs026-core-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/CS028/cs028-core-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/CS030/cs030-core-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/CS031/cs031-core-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/CS032/cs032-core-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/CS101/cs101-core-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/CS103/cs103-core-solution.lisp -text
@@ -1082,11 +1096,17 @@ MAC/Deployment/data/Coordinates/vectors-and-matrices/CS301/cs301-core-solution.l
MAC/Deployment/data/Coordinates/vectors-and-matrices/CS302/cs302-core-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/CS401/cs401-core-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/CS501/cs501-core-solution.lisp -text
-MAC/Deployment/data/Coordinates/vectors-and-matrices/Effelsberg/de601-hba-solution.lisp -text
-MAC/Deployment/data/Coordinates/vectors-and-matrices/Effelsberg/de601-lba-solution.lisp -text
-MAC/Deployment/data/Coordinates/vectors-and-matrices/Nancay/fr606-hba-solution.lisp -text
-MAC/Deployment/data/Coordinates/vectors-and-matrices/Nancay/fr606-lba-solution.lisp -text
-MAC/Deployment/data/Coordinates/vectors-and-matrices/Potsdam/de604-lba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/DE601/de601-hba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/DE601/de601-lba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/DE602/de602-hba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/DE602/de602-lba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/DE603/de603-hba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/DE603/de603-lba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/DE604/de604-lba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/DE605/de605-hba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/DE605/de605-lba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/FR606/fr606-hba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/FR606/fr606-lba-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/RS106/rs106-core-solution-hba.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/RS106/rs106-core-solution-lba.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/RS205/rs205-core-solution-hba.lisp -text
@@ -1097,12 +1117,14 @@ MAC/Deployment/data/Coordinates/vectors-and-matrices/RS306/rs306-core-solution-h
MAC/Deployment/data/Coordinates/vectors-and-matrices/RS306/rs306-core-solution-lba.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/RS307/rs307-core-solution-hba.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/RS307/rs307-core-solution-lba.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/RS406/rs406-hba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/RS406/rs406-lba-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/RS503/rs503-core-solution-hba.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/RS503/rs503-core-solution-lba.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/RS509/rs509-hba-core-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/RS509/rs509-lba-core-solution.lisp -text
-MAC/Deployment/data/Coordinates/vectors-and-matrices/Tautenburg/de603-hba-solution.lisp -text
-MAC/Deployment/data/Coordinates/vectors-and-matrices/Tautenburg/de603-lba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/UK608/uk608-hba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/UK608/uk608-lba-solution.lisp -text
MAC/Deployment/data/License/471_3031_1_Astron_Gen_I_1_38.log -text
MAC/Deployment/data/License/471_3031_2_Astron_Gen_II_1_38.log -text
MAC/Deployment/data/License/CS001C_option_lcu037.txt -text
@@ -1265,6 +1287,49 @@ MAC/Deployment/data/StaticMetaData/CableDelays/RS208-CableDelays.conf -text
MAC/Deployment/data/StaticMetaData/CableDelays/RS306-CableDelays.conf -text
MAC/Deployment/data/StaticMetaData/CableDelays/RS307-CableDelays.conf -text
MAC/Deployment/data/StaticMetaData/CableDelays/RS503-CableDelays.conf -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_001_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_002_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_003_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_003_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_004_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_004_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_005_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_005_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_006_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_006_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_007_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_007_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_017_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_017_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_021_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_021_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_024_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_024_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_030_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_030_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_032_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_032_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_101_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_101_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_103_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_103_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_106_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_106_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_205_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_205_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_208_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_208_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_301_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_301_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_302_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_302_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_306_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_307_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_307_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_401_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_501_mode1.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_501_mode3.dat -text
+MAC/Deployment/data/StaticMetaData/CalTables/CalTable_503_mode1.dat -text
MAC/Deployment/data/StaticMetaData/ControlInfo.dat -text
MAC/Deployment/data/StaticMetaData/HBADelays.conf -text
MAC/Deployment/data/StaticMetaData/HBADeltas/CS302-HBADeltas.conf -text
diff --git a/MAC/APL/CASATools/test/tCasaConverter.cc b/MAC/APL/CASATools/test/tCasaConverter.cc
index a842496365b3f3cf0730e31c15bb19c49a7b207e..d8679b2ae0a31609fd4432add73cf24ab586a04e 100644
--- a/MAC/APL/CASATools/test/tCasaConverter.cc
+++ b/MAC/APL/CASATools/test/tCasaConverter.cc
@@ -95,7 +95,7 @@ int main(int argc, char* argv[])
cout << "'J2000' is " << (j2000 ? "" : "NOT ") << "a supported conversion" << endl;
vector<string> allTypes = theConverter.validTypes();
- for (int i = 0; i < allTypes.size(); i++) {
+ for (uint i = 0; i < allTypes.size(); i++) {
cout << allTypes[i] << " ";
}
cout << endl;
diff --git a/MAC/APL/PAC/IBS_Protocol/src/IBS_Protocol.prot b/MAC/APL/PAC/IBS_Protocol/src/IBS_Protocol.prot
index d36f654a351091acf3cb0fd534348e0aa7f60964..765399ad57ae94d5882fdac8ab2acaa79ec14cbd 100644
--- a/MAC/APL/PAC/IBS_Protocol/src/IBS_Protocol.prot
+++ b/MAC/APL/PAC/IBS_Protocol/src/IBS_Protocol.prot
@@ -32,7 +32,7 @@ prelude = << PRELUDE_END
//
// The following signals are defined in the BS protocol
//
-// BEAMALLOC (beamName, antennaSet, beamletAllocationMap, RCUmask);
+// BEAMALLOC (beamName, antennaSet, beamletAllocationMap, RCUmask, ringNr, rcuMode);
// BEAMALLOCACK (beamName, antennaGroup, status);
// BEAMMODIFY (beamName, beamletAllocationMap);
// BEAMMODIFYACK (beamName, status);
@@ -150,9 +150,14 @@ event = {
param = {
name = "ringNr";
- type = "int32";
+ type = "uint32";
};
+ // NEW: temporarely(?) for selecting the right calibrationTable.
+ param = {
+ name = "rcuMode";
+ type = "uint32";
+ };
};
event = {
diff --git a/MAC/APL/PAC/ITRFBeamServer/CMakeLists.txt b/MAC/APL/PAC/ITRFBeamServer/CMakeLists.txt
index af6c4e48c0253a59c0912856cf59dbf472edd076..80b56c4327f26beadcc4a27a7fd3fb2cebcf38ad 100644
--- a/MAC/APL/PAC/ITRFBeamServer/CMakeLists.txt
+++ b/MAC/APL/PAC/ITRFBeamServer/CMakeLists.txt
@@ -1,13 +1,11 @@
# $Id: CMakeLists.txt 14697 2009-12-16 15:06:53Z loose $
# Do not split the following line, otherwise makeversion will fail!
-lofar_package(ITRFBeamServer 1.0 DEPENDS Common ApplCommon MACIO GCFTM APLCommon RTCCommon RSP_Protocol IBS_Protocol CAL_Protocol)
+lofar_package(ITRFBeamServer 1.0 DEPENDS Common ApplCommon MACIO GCFTM APLCommon RTCCommon RSP_Protocol IBS_Protocol CAL_Protocol CASATools)
include(LofarFindPackage)
lofar_find_package(Casacore COMPONENTS casa measures)
lofar_find_package(Blitz REQUIRED)
-add_definitions(-DUSE_CAL_THREAD)
-
add_subdirectory(src)
add_subdirectory(test)
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc b/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc
index edc804f8e537a1a41c2a0a7800fb4e75a046e168..06b6d15cf737a32fe968951a9c00f527a8097d67 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc
@@ -48,6 +48,7 @@ using namespace IBS_Protocol;
using namespace std;
using namespace RTC;
using namespace APLCommon;
+using namespace CASATools;
//
// AnaBeamMgr(name, subarray, nrSubbands)
@@ -256,7 +257,7 @@ void AnaBeamMgr::showAdmin() const
// calculateHBAdelays(timestamp, amcconverter, tileRelPosArray)
// result is stored in itsHBAdelays
//
-void AnaBeamMgr::calculateHBAdelays(RTC::Timestamp targetTime, J2000Converter& aJ2000Conv)
+void AnaBeamMgr::calculateHBAdelays(RTC::Timestamp targetTime, CasaConverter& aJ2000Conv)
{
#define MIN2(a,b) ((a)<(b)) ? (a) : (b)
#define MAX2(a,b) ((a)>(b)) ? (a) : (b)
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.h b/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.h
index f336ee2b9410f5df8ebc0f82bdf3502853e79d11..50fe42d206aa34f626784d6db83b0c94e38a9853 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.h
@@ -34,7 +34,7 @@
#include <blitz/array.h>
-#include "J2000Converter.h"
+#include "CASATools/CasaConverter.h"
#include "AnalogueBeam.h"
namespace LOFAR {
@@ -69,7 +69,7 @@ public:
bool currentDirection(double& angle2Pi, double& anglePi);
// Calculate delays for all 16 elements of all HBA tiles
- void calculateHBAdelays(RTC::Timestamp targetTime, J2000Converter& aJ2000Conv);
+ void calculateHBAdelays(RTC::Timestamp targetTime, CASATools::CasaConverter& aJ2000Conv);
// send the just calculated delays
void sendHBAdelays(GCF::TM::GCFPortInterface& port);
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
index c4fe69981cc1da05f4b54767d1fcea7012048dd9..8bf1652152494c9071e0cd2022269385ee460e53 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
@@ -76,6 +76,8 @@ BeamServer::BeamServer(const string& name, long timestamp) :
itsCalServer (0),
itsBeamsModified (false),
itsAnaBeamMgr (0),
+ itsCalTableMode1 (0),
+ itsCalTableMode3 (0),
itsUpdateInterval (0),
itsComputeInterval (0),
itsHBAUpdateInterval (0),
@@ -104,10 +106,15 @@ BeamServer::BeamServer(const string& name, long timestamp) :
ASSERTSTR(itsAnaHeartbeat, "Cannot allocate the analogue heartbeat timer");
ASSERTSTR(itsConnectTimer, "Cannot allocate a general purpose timer");
+ // Create casacore based converter to J2000
+ itsJ2000Converter = new CasaConverter("J2000");
+ ASSERTSTR(itsJ2000Converter, "Can't create a casacore converter to J2000");
+
// read config settings
itsSetHBAEnabled = globalParameterSet()->getBool("BeamServer.EnableSetHBA", true);
itsSetSubbandsEnabled = globalParameterSet()->getBool("BeamServer.EnableSetSubbands", true);
itsSetWeightsEnabled = globalParameterSet()->getBool("BeamServer.EnableSetWeights", true);
+ itsStaticCalEnabled = globalParameterSet()->getBool("BeamServer.EnableStaticCalibration", true);
gBeamformerGain = globalParameterSet()->getInt32("BeamServer.BeamformerGain", 8000);
if (!itsSetSubbandsEnabled) {
LOG_WARN("Setting of subbands IS DISABLED!!!");
@@ -129,6 +136,25 @@ BeamServer::BeamServer(const string& name, long timestamp) :
itsLBArcus.resize(MAX_RCUS, 0);
itsHBArcus.resize(MAX_RCUS, 0);
+ // read static calibrationtables if available
+ if (itsStaticCalEnabled) {
+ itsCalTableMode1 = new StatCal(1);
+ if (itsCalTableMode1 && !itsCalTableMode1->isValid()) {
+ delete itsCalTableMode1;
+ itsCalTableMode1 = 0;
+ LOG_WARN ("NO CALIBRATION TABLES FOUND FOR MODE 1 AND 2");
+ }
+ itsCalTableMode3 = new StatCal(3);
+ if (itsCalTableMode3 && !itsCalTableMode3->isValid()) {
+ delete itsCalTableMode3;
+ itsCalTableMode3 = 0;
+ LOG_WARN ("NO CALIBRATION TABLES FOUND FOR MODE 3 AND 4");
+ }
+ }
+ else {
+ LOG_WARN("Static calibration is disabled!");
+ }
+
}
//
@@ -448,7 +474,7 @@ GCFEvent::TResult BeamServer::enabled(GCFEvent& event, GCFPortInterface& port)
if (&port == itsAnaHeartbeat) {
GCFTimerEvent* timer = static_cast<GCFTimerEvent*>(&event);
LOG_INFO_STR("computing HBA delays " << Timestamp(timer->sec, timer->usec));
- itsAnaBeamMgr->calculateHBAdelays(Timestamp((long)timer->sec + LEADIN_TIME, 0L), itsJ2000Converter);
+ itsAnaBeamMgr->calculateHBAdelays(Timestamp((long)timer->sec + LEADIN_TIME, 0L), *itsJ2000Converter);
itsAnaBeamMgr->sendHBAdelays (*itsRSPDriver);
return (GCFEvent::HANDLED);
}
@@ -818,7 +844,7 @@ bool BeamServer::beamalloc_start(IBSBeamallocEvent& ba,
{
// allocate the beam
int beamError(IBS_NO_ERR);
- DigitalBeam* beam = checkBeam(&port, ba.beamName, ba.antennaSet, ba.allocation, ba.rcumask, ba.ringNr, &beamError);
+ DigitalBeam* beam = checkBeam(&port, ba.beamName, ba.antennaSet, ba.allocation, ba.rcumask, ba.ringNr, ba.rcuMode, &beamError);
if (!beam) {
LOG_FATAL_STR("BEAMALLOC: failed to allocate beam " << ba.beamName << " on " << ba.antennaSet);
@@ -874,7 +900,7 @@ int BeamServer::beampointto_action(IBSPointtoEvent& ptEvent,
}
// sanity check for reference system
- if (!itsJ2000Converter.isValidType(ptEvent.pointing.getType())) {
+ if (!itsJ2000Converter->isValidType(ptEvent.pointing.getType())) {
LOG_ERROR_STR(ptEvent.pointing.getType() << " is not a valid reference system, pointing rejected");
return (IBS_INVALID_TYPE_ERR);
}
@@ -996,7 +1022,8 @@ DigitalBeam* BeamServer::checkBeam(GCFPortInterface* port,
std::string antennaSetName,
IBS_Protocol::Beamlet2SubbandMap allocation,
LOFAR::bitset<LOFAR::MAX_RCUS> rcumask,
- int ringNr,
+ uint ringNr,
+ uint rcuMode,
int* beamError)
{
LOG_TRACE_FLOW_STR("checkBeam(port=" << port->getName() << ", name=" << name << ", subarray=" << antennaSetName
@@ -1027,9 +1054,9 @@ DigitalBeam* BeamServer::checkBeam(GCFPortInterface* port,
return (0);
}
if (itsSplitterOn) { // check allocation
- int ringLimit = itsMaxRCUs / 2;
- for (int r = 0; r < itsMaxRCUs; r++) {
- if (rcumask.test(r) && (ringNr != (r < ringLimit ? 0 : 1))) {
+ uint ringLimit = itsMaxRCUs / 2;
+ for (uint r = 0; r < itsMaxRCUs; r++) {
+ if (rcumask.test(r) && (ringNr != (uint)(r < ringLimit ? 0 : 1))) {
LOG_ERROR_STR("RCU's specified in the wrong ring for beam " << name << ", (rcu=" << r << ")");
*beamError = IBS_WRONG_RING_ERR;
return (0);
@@ -1048,7 +1075,7 @@ DigitalBeam* BeamServer::checkBeam(GCFPortInterface* port,
return (0);
}
- DigitalBeam* beam = new DigitalBeam(name, antennaSetName, allocation, rcumask, ringNr);
+ DigitalBeam* beam = new DigitalBeam(name, antennaSetName, allocation, rcumask, ringNr, rcuMode);
if (beam) { // register new beam
itsClientBeams[port].insert(beam);
@@ -1262,6 +1289,41 @@ void BeamServer::_logBeamAdministration()
}
}
+// -------------------- Reconstruction of calibrationfactor --------------------
+
+//
+// _getCalFactor(rcumode, rcu, subbandNr)
+//
+complex<double> BeamServer::_getCalFactor(uint rcuMode, uint rcu, uint subbandNr)
+{
+ complex<double> result(1.0, 0.0);
+
+ switch (rcuMode) {
+ case 1:
+ case 2:
+ if (itsCalTableMode1) {
+ result = itsCalTableMode1->calFactor(rcu, subbandNr);
+ }
+ break;
+
+ case 3:
+ case 4:
+ if (itsCalTableMode3) {
+ result = itsCalTableMode3->calFactor(rcu, subbandNr);
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ LOG_DEBUG_STR("calFactor(" << rcuMode << "," << rcu << "," << subbandNr << ")=" << result);
+ return (result);
+}
+
+
+// -------------------- Tracking calculations --------------------
+
//
// blitz2vector
//
@@ -1341,7 +1403,7 @@ bool BeamServer::compute_weights(Timestamp weightTime)
// convert ITRF position of all antennas to J2000 for timestamp t
blitz::Array<double,2> rcuJ2000Pos; // [rcu, xyz]
- if (!itsJ2000Converter.doConversion("ITRF", rcuPosITRF, fieldCentreITRF, weightTime, rcuJ2000Pos)) {
+ if (!itsJ2000Converter->doConversion("ITRF", rcuPosITRF, fieldCentreITRF, weightTime, rcuJ2000Pos)) {
LOG_FATAL_STR("Conversion of antennas to J2000 failed");
return(false);
}
@@ -1371,7 +1433,7 @@ bool BeamServer::compute_weights(Timestamp weightTime)
blitz::Array<double,2> curPoint(1,2); // [1, angles]
curPoint(0,0) = currentPointing.angle0();
curPoint(0,1) = currentPointing.angle1();
- if (!itsJ2000Converter.doConversion(currentPointing.getType(), curPoint, fieldCentreITRF, weightTime, sourceJ2000xyz)) {
+ if (!itsJ2000Converter->doConversion(currentPointing.getType(), curPoint, fieldCentreITRF, weightTime, sourceJ2000xyz)) {
LOG_FATAL_STR("Conversion of source to J2000 failed");
return(false);
}
@@ -1399,24 +1461,19 @@ bool BeamServer::compute_weights(Timestamp weightTime)
continue;
}
- itsWeights(rcu, beamlet) = exp(itsBeamletAllocation[beamlet+firstBeamlet].scaling *
+ complex<double> CalFactor = _getCalFactor(beamIter->second->rcuMode(), rcu,
+ itsBeamletAllocation[beamlet+firstBeamlet].subbandNr);
+ itsWeights(rcu, beamlet) = CalFactor * exp(itsBeamletAllocation[beamlet+firstBeamlet].scaling *
(rcuJ2000Pos((int)posIndex[rcu], 0) * sourceJ2000xyz(0,0) +
rcuJ2000Pos((int)posIndex[rcu], 1) * sourceJ2000xyz(0,1) +
rcuJ2000Pos((int)posIndex[rcu], 2) * sourceJ2000xyz(0,2)));
// some debugging
-// if (itsWeights(rcu, beamlet) != complex<double>(1,0)) {
-// if (rcu>9 && rcu<17 && beamlet>10 && beamlet<20) { // limit amount of data
-// stringstream str;
-// str.precision(20);
-// str << "itsWeights(" << rcu << "," << beamlet << ")=" << itsWeights(rcu, beamlet);
-// LOG_DEBUG_STR(str.str());
-// }
- if (beamlet%100==0) {
- LOG_DEBUG_STR("itsWeights(" << rcu << "," << beamlet << ")=" << itsWeights(rcu, beamlet)
- << " : rcuPos[" << posIndex[rcu] << "]=" << rcuJ2000Pos((int)posIndex[rcu],0));
- }
-// }
+ if (beamlet%100==0) {
+ LOG_DEBUG_STR("itsWeights(" << rcu << "," << beamlet << ")=" << itsWeights(rcu, beamlet)
+ << " : rcuPos[" << posIndex[rcu] << "]=" << rcuJ2000Pos((int)posIndex[rcu],0)
+ << " : CalFactor=" << CalFactor);
+ }
} // beamlets
} // rcus
} // beams
@@ -1445,7 +1502,7 @@ void BeamServer::send_weights(Timestamp time)
// select all BLPS, no subarraying
sw.rcumask.reset();
- for (int i = 0; i < itsMaxRCUs; i++) {
+ for (uint i = 0; i < itsMaxRCUs; i++) {
sw.rcumask.set(i);
}
@@ -1473,7 +1530,7 @@ void BeamServer::send_sbselection()
return;
}
- for (int ringNr = 0; ringNr <= (itsSplitterOn ? 1 : 0); ringNr++) {
+ for (uint ringNr = 0; ringNr <= (itsSplitterOn ? 1 : 0); ringNr++) {
RSPSetsubbandsEvent ss;
ss.timestamp.setNow(0);
ss.rcumask.reset();
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.h b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.h
index 45703753bdefc3d3df293e1ebcffe213583cfbf4..b069eae50c1c068744739a040a747dc5e70ec29b 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.h
@@ -24,18 +24,18 @@
#define BEAMSERVER_H_
#include <Common/lofar_string.h>
+#include <Common/lofar_set.h>
+#include <Common/lofar_map.h>
+#include <Common/lofar_list.h>
+#include <GCF/TM/GCF_Control.h>
#include <APL/IBS_Protocol/IBS_Protocol.ph>
-#include "J2000Converter.h"
+#include <CASATools/CasaConverter.h>
#include "DigitalBeam.h"
#include "AnaBeamMgr.h"
-
-#include <GCF/TM/GCF_Control.h>
-
-#include <set>
-#include <map>
-#include <list>
+#include "StatCal.h"
namespace LOFAR {
+ using namespace CASATools;
using GCF::TM::GCFTask;
using GCF::TM::GCFPort;
using GCF::TM::GCFTCPPort;
@@ -76,8 +76,9 @@ public:
// The constructor of the BeamServer task.
// @param name The name of the task.
explicit BeamServer(const string& name, long timestamp = 0);
- virtual ~BeamServer();
+ ~BeamServer();
+private:
// Method to clean up disconnected client ports.
void undertaker();
@@ -90,7 +91,8 @@ public:
string subarrayname,
IBS_Protocol::Beamlet2SubbandMap allocation,
LOFAR::bitset<LOFAR::MAX_RCUS> rcumask,
- int ringNr,
+ uint ringNr,
+ uint rcuMode,
int* beamError);
// Destroy beam of specified transaction.
@@ -168,8 +170,10 @@ public:
void _unregisterBeamRCUs (const DigitalBeam& beam);
void _logBeamAdministration();
-private:
- // --- data members ---
+ // RCU calibration
+ std::complex<double> _getCalFactor(uint rcuMode, uint rcu, uint subbandNr);
+
+ // ### data members ###
// BeamletAllocation
typedef struct BeamletAllocation {
@@ -185,10 +189,10 @@ private:
// RCU Allocations in the AntennaArrays. Remember that each RCU can participate
// in more than one beam.
- bitset<MAX_RCUS> itsLBAallocation;
- bitset<MAX_RCUS> itsHBAallocation;
- vector<uint> itsLBArcus;
- vector<uint> itsHBArcus;
+ bitset<MAX_RCUS> itsLBAallocation; // which RCUs are used for LBA
+ bitset<MAX_RCUS> itsHBAallocation; // which RCUs are used for HBA
+ vector<uint> itsLBArcus; // counter: in how many beams the RCU participates
+ vector<uint> itsHBArcus; // counter: in how many beams the RCU participates
uint itsNrLBAbeams;
uint itsNrHBAbeams;
@@ -201,7 +205,7 @@ private:
BeamTransaction itsBeamTransaction; // current beam transaction
- J2000Converter itsJ2000Converter; // casacore based converter to J2000
+ CasaConverter* itsJ2000Converter; // casacore based converter to J2000
GCFTCPPort* itsRSPDriver; // connection to RSPDriver
GCFTCPPort* itsCalServer; // connection to CalServer
GCFTimerPort* itsDigHeartbeat; // heartbeat for digital beamformer weights
@@ -211,12 +215,16 @@ private:
bool itsSplitterOn; // state of the ringsplitter
map<string, DigitalBeam*> itsBeamPool; //
AnaBeamMgr* itsAnaBeamMgr; // for managing the analogue beams
+
+ StatCal* itsCalTableMode1; // table for mode 1 and 2
+ StatCal* itsCalTableMode3; // table for mode 3 and 4
// constants
- int itsMaxRCUs; //
+ uint itsMaxRCUs; //
bool itsSetHBAEnabled; //
bool itsSetWeightsEnabled; //
bool itsSetSubbandsEnabled; //
+ bool itsStaticCalEnabled; //
long itsUpdateInterval; //
long itsComputeInterval; //
long itsHBAUpdateInterval; //
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/CMakeLists.txt b/MAC/APL/PAC/ITRFBeamServer/src/CMakeLists.txt
index 231e6a154901f1502b2a3263f58b73832f3e891d..bf2160ccaddb9bddbfffe0304576460c844bd285 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/CMakeLists.txt
+++ b/MAC/APL/PAC/ITRFBeamServer/src/CMakeLists.txt
@@ -11,7 +11,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
#include_directories(${CMAKE_BINARY_DIR}/include/MAC)
#lofar_add_bin_program(versionitrfbeamserver versionitrfbeamserver.cc)
-lofar_add_bin_program(BeamServer BeamServerMain.cc BeamServer.cc Beam.cc DigitalBeam.cc AnalogueBeam.cc AnaBeamMgr.cc J2000Converter.cc CasaConverter.cc)
+lofar_add_bin_program(BeamServer BeamServerMain.cc BeamServer.cc Beam.cc DigitalBeam.cc AnalogueBeam.cc AnaBeamMgr.cc StatCal.cc)
lofar_add_bin_program(beamctl beamctl.cc)
configure_file(
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.cc b/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.cc
index a66d8c309606f8d12b95c79d44e628162becb0e2..1926b2e6aa7210d55596d2ea2ac67ec9e028c8dc 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.cc
@@ -52,10 +52,12 @@ DigitalBeam::DigitalBeam(const string& name,
const string& antennaSet,
const Beamlet2SubbandMap& allocation,
const bitset<MAX_RCUS>& rcuMask,
- uint ringNr) :
+ uint ringNr,
+ uint rcuMode) :
Beam (name, antennaSet, rcuMask),
itsBeamletAllocation(allocation),
- itsRingNr (ringNr)
+ itsRingNr (ringNr),
+ itsRCUmode (rcuMode)
{}
//
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.h b/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.h
index 7356c63c0f5299da0117c9a3fc169029a90a3791..9d446ee4c3bdda050f616d1315a8dc2e8326fe2b 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.h
@@ -53,7 +53,8 @@ public:
const string& antenneSet,
const IBS_Protocol::Beamlet2SubbandMap& allocation,
const bitset<MAX_RCUS>& rcuMask,
- uint ringNr);
+ uint ringNr,
+ uint rcuMode);
// Default destructor.
virtual ~DigitalBeam();
@@ -69,7 +70,10 @@ public:
// const CAL::AntennaGains& getCalibration() const;
// Get number of ringSegment
- int ringNr() const { return (itsRingNr); }
+ uint ringNr() const { return (itsRingNr); }
+
+ // Get rcuMode of beam
+ uint rcuMode() const { return (itsRCUmode); }
// Set handle (=uniq ID) from the CalServer
void calibrationHandle(void *handle) { itsCShandle = handle; }
@@ -89,7 +93,10 @@ private:
IBS_Protocol::Beamlet2SubbandMap itsBeamletAllocation;
// ringSegment the beam is allocated on
- int itsRingNr;
+ uint itsRingNr;
+
+ // temp: rcumode of the beam (will become obsolete when new CalServer is used).
+ uint itsRCUmode;
// The antenna array.
// CAL::SubArray itsSubArray;
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/StatCal.cc b/MAC/APL/PAC/ITRFBeamServer/src/StatCal.cc
new file mode 100644
index 0000000000000000000000000000000000000000..10269a65a7e07a7a621a70961d6c3bbdabedb4bf
--- /dev/null
+++ b/MAC/APL/PAC/ITRFBeamServer/src/StatCal.cc
@@ -0,0 +1,101 @@
+//# StatCal.h: implementation of the StatCal class
+//#
+//# Copyright (C) 2002-2004
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//#
+//# $Id: StatCal.cc 14664 2009-12-11 09:59:34Z donker $
+
+#include <lofar_config.h>
+#include <Common/LofarLogger.h>
+#include <Common/LofarLocators.h>
+#include <Common/LofarConstants.h>
+#include <Common/LofarLocators.h>
+//#include <ApplCommon/StationConfig.h>
+#include "StatCal.h"
+
+#include <blitz/array.h>
+#include <fcntl.h>
+
+using namespace blitz;
+
+namespace LOFAR {
+ namespace BS {
+
+//
+// StatCal()
+//
+StatCal::StatCal(int mode):
+ itsNantennas(48), itsNpols(2), itsNsubbands(512), itsMode(mode), itsIsValid(false)
+{
+ itsStaticCalibration.resize(itsNantennas, itsNpols, itsNsubbands);
+ itsStaticCalibration = complex<double>(0.0,0.0);
+ _readData(mode);
+}
+
+//
+// ~StatCal
+//
+StatCal::~StatCal()
+{
+}
+
+//
+// _readData(mode)
+//
+void StatCal::_readData(uint mode)
+{
+ ConfigLocator CL;
+ char baseName[256];
+ sprintf(baseName, "CalTable_mode%d.dat", mode);
+ itsFileName = CL.locate(baseName);
+
+ complex<double> value;
+ FILE *file;
+ if (!(file = fopen(itsFileName.c_str(), "r"))) {
+ LOG_ERROR_STR("Calibrationtable " << itsFileName << " can not be opened");
+ }
+ else {
+ for (uint sb = 0; sb < itsNsubbands; sb++) {
+ for (uint ant = 0; ant < itsNantennas; ant++) {
+ for (uint pol = 0; pol < itsNpols; pol++) {
+ fread(&value, sizeof(complex<double>), 1, file);
+ itsStaticCalibration((int)ant, (int)pol, (int)sb) = value;
+ }
+ }
+ }
+ fclose(file);
+ itsIsValid = true;
+ LOG_INFO_STR("Static CalibrationTable loaded for mode " << mode);
+ }
+
+}
+
+//
+// calFactor(rcu, subband)
+//
+complex<double> StatCal::calFactor(uint rcuNr, uint subbandNr) const
+{
+ ASSERTSTR(rcuNr < itsNantennas * itsNpols, "rcuNr " << rcuNr << " out of range");
+ ASSERTSTR(subbandNr < itsNsubbands, "subbandNr " << subbandNr << " out of range");
+
+ return (itsStaticCalibration((int)rcuNr/2, (int)rcuNr%2, (int)subbandNr));
+}
+
+
+ } // namespace BS
+} // namespace LOFAR
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/StatCal.h b/MAC/APL/PAC/ITRFBeamServer/src/StatCal.h
new file mode 100644
index 0000000000000000000000000000000000000000..fed9c9aebfb8e9413035e97f1256dfd414fa761d
--- /dev/null
+++ b/MAC/APL/PAC/ITRFBeamServer/src/StatCal.h
@@ -0,0 +1,78 @@
+//# StatCal.h: interface of the StatCal class
+//#
+//# Copyright (C) 2002-2004
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//#
+//# $Id: StatCal.h $
+
+#ifndef STATCAL_H_
+#define STATCAL_H_
+
+#include <lofar_config.h>
+#include <Common/LofarConstants.h>
+#include <Common/lofar_complex.h>
+#include <time.h>
+
+#include <blitz/array.h>
+
+namespace LOFAR {
+ namespace BS {
+
+// Class representing static calibration data
+class StatCal {
+public:
+
+ // constructor and destructor
+ explicit StatCal(int rcumode);
+ ~StatCal();
+
+ std::complex<double> calFactor(uint rcuNr, uint subbandNr) const;
+ bool isValid() const { return (itsIsValid); }
+
+ const blitz::Array<std::complex<double>,3>& operator()() const;
+
+private:
+ // Don't allow copying this object.
+ StatCal();
+ StatCal (const StatCal&); // not implemented
+ StatCal& operator= (const StatCal&); // not implemented
+
+ void _readData(uint mode);
+
+ uint itsNantennas;
+ uint itsNpols;
+ uint itsNsubbands;
+ uint itsMode;
+ string itsFileName;
+ bool itsIsValid;
+
+ // two
+ blitz::Array<std::complex<double>, 3> itsStaticCalibration; //
+};
+
+//# -------------------- inline functions --------------------
+//# operator()
+inline const blitz::Array<std::complex<double>, 3>& StatCal::operator()() const
+{
+ return (itsStaticCalibration);
+}
+
+ } //# namepsace BS
+} //# namespace LOFAR
+
+#endif /* STATCAL_H_ */
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/beamctl.cc b/MAC/APL/PAC/ITRFBeamServer/src/beamctl.cc
index 2d815089d5d376d1d7471473d0bbe6ba04cb42b9..4b94f35319030b46c9cbc5d27517db0c5aa9ec02 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/beamctl.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/beamctl.cc
@@ -274,6 +274,7 @@ GCFEvent::TResult beamctl::create_beam(GCFEvent& event, GCFPortInterface& port)
// assume beamletnumbers are right so the ring can be extracted from those numbers.
// when the user did this wrong the BeamServer will complain.
alloc.ringNr = itsBeamlets.front() >= BEAMLET_RING_OFFSET;
+ alloc.rcuMode = itsRCUmode;
list<int>::iterator its = itsSubbands.begin();
list<int>::iterator itb = itsBeamlets.begin();
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/iBeamServer.conf.in b/MAC/APL/PAC/ITRFBeamServer/src/iBeamServer.conf.in
index 94ce4f8aa308946117a5e3454001b1ad439a6183..6c4313d0b8b667f3ff72115ea4af6f119b11a604 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/iBeamServer.conf.in
+++ b/MAC/APL/PAC/ITRFBeamServer/src/iBeamServer.conf.in
@@ -5,9 +5,10 @@
#
# Options to disable communication with RSP driver
#
-BeamServer.EnableSetWeights = 1
-BeamServer.EnableSetSubbands= 1
-BeamServer.EnableSetHBA = 1
+BeamServer.EnableSetWeights = 1
+BeamServer.EnableSetSubbands = 1
+BeamServer.EnableSetHBA = 1
+BeamServer.EnableStaticCalibration = 1
#
# normal HBAUpdateInterval >= 10, for testing use
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/CMakeLists.txt b/MAC/APL/PAC/ITRFBeamServer/test/CMakeLists.txt
index bafc60802cc59dcb75dc01c6696f97af9ab51faf..b8c74e2bf0a43b6b21e1e50a2b69e43b0061c40b 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/CMakeLists.txt
+++ b/MAC/APL/PAC/ITRFBeamServer/test/CMakeLists.txt
@@ -9,8 +9,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
# Tests cannot be run at this stage, because they all need to connect to a
# Service Broker, which has not been built yet. Therefore we will only build
# the test programs.
-lofar_add_executable(tLBATracking tLBATracking.cc ../src/J2000Converter.cc)
-lofar_add_executable(tHBATracking tHBATracking.cc ../src/J2000Converter.cc)
-lofar_add_executable(tAnaBeamMgr tAnaBeamMgr.cc ../src/AnaBeamMgr.cc ../src/Beam.cc ../src/AnalogueBeam.cc ../src/J2000Converter)
-lofar_add_executable(tJ2000Converter tJ2000Converter.cc
-../src/J2000Converter.cc)
+lofar_add_executable(tLBATracking tLBATracking.cc)
+lofar_add_executable(tHBATracking tHBATracking.cc)
+lofar_add_executable(tAnaBeamMgr tAnaBeamMgr.cc ../src/AnaBeamMgr.cc ../src/Beam.cc ../src/AnalogueBeam.cc)
+lofar_add_executable(tStatCal tStatCal.cc ../src/StatCal.cc)
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc b/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
index 17ddd9905748f9550f49366c2c5bd95184fe74b9..960d2fd503b4803749e20899f2c7ffe928fce197 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
@@ -30,14 +30,14 @@
#include <APL/CAL_Protocol/SpectralWindow.h>
#include <blitz/array.h>
-#include <ITRFBeamServer/J2000Converter.h>
+#include <CASATools/CasaConverter.h>
using namespace casa;
using namespace blitz;
using namespace LOFAR;
using namespace APLCommon;
using namespace RTC;
-using namespace BS;
+using namespace CASATools;
using namespace CAL;
int gBeamformerGain = 8000;
@@ -228,7 +228,7 @@ int main(int argc, char* argv[])
blitz::Array<double, 1> fieldCentreITRF = gAntField->Centre(fieldName);
LOG_DEBUG_STR("ITRF position antennaField: " << fieldCentreITRF);
- J2000Converter itsJ2000Converter;
+ CasaConverter itsJ2000Converter("J2000");
// Get the right pointing
blitz::Array<double,2> sourceJ2000xyz; // [1, xyz] target
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.log_prop b/MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.log_prop
index 8e6e7c207b7a70dedf0d6114a7f49cae22d4d94b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.log_prop
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.log_prop
@@ -1,33 +0,0 @@
-#
-# setup the right levels for logging and tracing
-#
-# Note: In production you don't want to loose any information so a daily rolling-file
-# is used and tracing is switched off.
-# For debugging purposes the daily rolling-file becomes too large so a size-based
-# rolling file is used and tracing is switched on.
-#
-# Please do not change the logger lines below, only comment them in or out.
-
-# For PRODUCTION:
-# - Select the appropriate log-level for the rootLogger (DEBUG or INFO)
-# - Leave the TRC logger on DEBUG,DUMP
-# - Comment out the rootLogger and the TRC logger in the TEST section of this file
-#log4cplus.rootLogger=DEBUG, DAILYFILE, MACCLP
-#log4cplus.logger.TRC=DEBUG, DUMP
-
-# For TESTING:
-# - Select the appropriate trace level for the TRC logger
-# - Leave the rootLogger on DEBUG, ROLFILE
-# - Comment out the rootLogger and the TRC logger in the PRODUCTION section of this file
-log4cplus.rootLogger=DEBUG, STDOUT
-log4cplus.logger.TRC=DEBUG
-
-
-# The next line should always be active.
-log4cplus.additivity.TRC=FALSE
-
-# Definitions of the output channels
-log4cplus.appender.STDOUT=log4cplus::ConsoleAppender
-log4cplus.appender.STDOUT.layout=log4cplus::PatternLayout
-log4cplus.appender.STDOUT.layout.ConversionPattern=%D{%d-%m-%y %H:%M:%S} %-5p %c{3} - %m [%.25l]%n
-
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc b/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
index a046dac805accc3721bf2889a196a02790c197b6..af0a791ecf37da5a3ca5b48b72ba90eea6aee694 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
@@ -30,14 +30,14 @@
#include <APL/CAL_Protocol/SpectralWindow.h>
#include <blitz/array.h>
-#include <ITRFBeamServer/J2000Converter.h>
+#include <CASATools/CasaConverter.h>
using namespace casa;
using namespace blitz;
using namespace LOFAR;
using namespace APLCommon;
using namespace RTC;
-using namespace BS;
+using namespace CASATools;
using namespace CAL;
int gBeamformerGain = 8000;
@@ -65,7 +65,7 @@ int main(int argc, char* argv[])
INIT_LOGGER("tLBATracking");
- J2000Converter itsJ2000Converter;
+ CasaConverter itsJ2000Converter("J2000");
Timestamp weightTime(atol(argv[1]), 0);
LOG_INFO_STR("Calculating weights for time " << weightTime);
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tStatCal.cc b/MAC/APL/PAC/ITRFBeamServer/test/tStatCal.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c862e3a4966e1f7d244ea2ef523e2d77359d5eda
--- /dev/null
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tStatCal.cc
@@ -0,0 +1,63 @@
+//# Class.cc: one_line_description
+//#
+//# Copyright (C) 2010
+//# ASTRON (Netherlands Foundation for Research in Astronomy)
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#
+//# This program is free software; you can redistribute it and/or modify
+//# it under the terms of the GNU General Public License as published by
+//# the Free Software Foundation; either version 2 of the License, or
+//# (at your option) any later version.
+//#
+//# This program is distributed in the hope that it will be useful,
+//# but WITHOUT ANY WARRANTY; without even the implied warranty of
+//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//# GNU General Public License for more details.
+//#
+//# You should have received a copy of the GNU General Public License
+//# along with this program; if not, write to the Free Software
+//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//#
+//# $Id: tJ2000Converter.cc 14866 2010-01-23 00:07:02Z overeem $
+
+//# Always #include <lofar_config.h> first!
+#include <lofar_config.h>
+
+//# Includes
+#include <Common/LofarLogger.h>
+
+#include <blitz/array.h>
+#include <ITRFBeamServer/StatCal.h>
+
+using namespace blitz;
+using namespace LOFAR;
+using namespace BS;
+
+int main(int argc, char* argv[])
+{
+ INIT_LOGGER("tCalStat");
+
+ StatCal theCalTable(1);
+ blitz::Array<std::complex<double>,3> theData = theCalTable();
+
+ cout << "RCU 5: X,Y for subband 10..15: " << endl;
+ for (int sub = 10; sub < 16; sub++) {
+ cout << "sub " << sub;
+ for (int pol = 0; pol < N_POL; pol++) {
+ cout << theData(5,pol,sub) << " ";
+ }
+ cout << endl;
+ }
+ cout << endl;
+
+ cout << "Subband 10: X,Y for RCU 5..10: " << endl;
+ for (int rcu = 5; rcu <= 10; rcu++) {
+ cout << "rcu " << rcu;
+ for (int pol = 0; pol < N_POL; pol++) {
+ cout << theData(rcu,pol,10) << " ";
+ }
+ cout << endl;
+ }
+ cout << endl;
+
+}
diff --git a/MAC/APL/StationCU/src/BeamControl/BeamControl.cc b/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
index f455b2d8e1288bf4ae87f8f940fab00f100d4292..f12753c593f217ddc1265ca51ec98691ce2cedf8 100644
--- a/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
+++ b/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
@@ -409,6 +409,35 @@ GCFEvent::TResult BeamControl::claimed_state(GCFEvent& event, GCFPortInterface&
return (status);
}
+//
+// convertFilterSelection(string) : uint8
+// NOTE: COPIED FROM CalibrationControl !!!!!!!
+//
+int32 BeamControl::convertFilterSelection(const string& filterselection, const string& antennaSet) const
+{
+ // support new filternames
+ if (antennaSet == "LBA_OUTER") {
+ if (filterselection == "LBA_10_70") { return(1); } // 160 Mhz
+ if (filterselection == "LBA_10_90") { return(1); } // 200 Mhz
+ if (filterselection == "LBA_30_70") { return(2); } // 160 Mhz
+ if (filterselection == "LBA_30_90") { return(2); } // 200 Mhz
+ }
+ if (antennaSet == "LBA_INNER") {
+ if (filterselection == "LBA_10_70") { return(3); } // 160 Mhz
+ if (filterselection == "LBA_10_90") { return(3); } // 200 Mhz
+ if (filterselection == "LBA_30_70") { return(4); } // 160 Mhz
+ if (filterselection == "LBA_30_90") { return(4); } // 200 Mhz
+ }
+ if (filterselection == "HBA_110_190") { return(5); } // 200 Mhz
+ if (filterselection == "HBA_170_230") { return(6); } // 160 Mhz
+ if (filterselection == "HBA_210_250") { return(7); } // 200 Mhz
+
+ LOG_WARN_STR ("filterselection value '" << filterselection <<
+ "' not recognized, using LBA_10_70");
+ return (1);
+}
+
+
//
// allocBeams_state(event, port)
//
@@ -443,6 +472,7 @@ GCFEvent::TResult BeamControl::allocBeams_state(GCFEvent& event, GCFPortInterfac
beamAllocEvent.rcumask = itsObs->getRCUbitset(0, 0, beamAllocEvent.antennaSet) &
globalAntennaSets()->RCUallocation(beamAllocEvent.antennaSet);
beamAllocEvent.ringNr = 0;
+ beamAllocEvent.rcuMode = convertFilterSelection(itsObs->filter, beamAllocEvent.antennaSet);
// digital part
if (!itsObs->beams.empty()) { // fill digital part if any
diff --git a/MAC/APL/StationCU/src/BeamControl/BeamControl.h b/MAC/APL/StationCU/src/BeamControl/BeamControl.h
index 4b148abb907305bc509b76eda9a5ea0512fd66c7..5909b4e6366875563433b55d6cb86a94ee17de3d 100644
--- a/MAC/APL/StationCU/src/BeamControl/BeamControl.h
+++ b/MAC/APL/StationCU/src/BeamControl/BeamControl.h
@@ -94,6 +94,7 @@ private:
void _disconnectedHandler(GCFPortInterface& port);
void setState (CTState::CTstateNr newState);
GCFEvent::TResult _defaultEventHandler(GCFEvent& event, GCFPortInterface& port);
+ int32 convertFilterSelection(const string& filterselection, const string& antennaSet) const;
RTDBPropertySet* itsPropertySet;
bool itsPropertySetInitialized;
diff --git a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
index b9e89c1a0f311c8e2c2369ec5d5d38ee14388197..1ba4dfcefeecebd8acbfef0cd789406bb0432af6 100644
--- a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
+++ b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
@@ -169,7 +169,7 @@ int32 CalibrationControl::convertFilterSelection(const string& filterselection,
if (filterselection == "HBA_210_250") { return(7); } // 200 Mhz
LOG_WARN_STR ("filterselection value '" << filterselection <<
- "' not recognized, using LBL_10_80");
+ "' not recognized, using LBA_10_70");
return (1);
}
diff --git a/MAC/Deployment/data/Coordinates/ETRF_FILES/CS011/cs011-antenna-positions-etrs.csv b/MAC/Deployment/data/Coordinates/ETRF_FILES/CS011/cs011-antenna-positions-etrs.csv
new file mode 100644
index 0000000000000000000000000000000000000000..b73741d5cb5ebe1465671a4a63598063b18f75bd
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/ETRF_FILES/CS011/cs011-antenna-positions-etrs.csv
@@ -0,0 +1,149 @@
+NAME,ETRS-X,ETRS-Y,ETRS-Z,STATION-P,STATION-Q,STATION-R,RCU-X,RCU-Y
+L0,3826667.465,461285.525,5064801.332,0.000,0.000,0.000,0,1
+L1,3826665.446,461285.282,5064802.870,0.000,2.550,0.000,2,3
+L2,3826666.127,461287.630,5064802.146,2.250,1.350,0.000,4,5
+L3,3826668.265,461287.888,5064800.518,2.250,-1.350,0.000,6,7
+L4,3826669.484,461285.768,5064799.794,0.000,-2.550,0.000,8,9
+L5,3826668.803,461283.420,5064800.518,-2.250,-1.350,0.000,10,11
+L6,3826666.665,461283.162,5064802.146,-2.250,1.350,0.000,12,13
+L7,3826669.746,461290.404,5064799.179,4.571,-3.571,0.000,14,15
+L8,3826671.814,461287.264,5064797.911,1.206,-5.673,0.000,16,17
+L9,3826671.846,461283.310,5064798.244,-2.723,-5.121,0.000,18,19
+L10,3826669.829,461280.393,5064800.021,-5.378,-2.173,0.000,20,21
+L11,3826666.706,461279.878,5064802.413,-5.516,1.792,0.000,22,23
+L12,3826663.937,461282.004,5064804.298,-3.074,4.919,0.000,24,25
+L13,3826662.820,461285.778,5064804.796,0.807,5.744,0.000,26,27
+L14,3826663.876,461289.434,5064803.673,4.310,3.881,0.000,28,29
+L15,3826666.612,461291.260,5064801.454,5.796,0.202,0.000,30,31
+L16,3826666.740,461294.819,5064801.036,9.314,-0.491,0.000,32,33
+L17,3826669.664,461294.834,5064798.840,8.979,-4.133,0.000,34,35
+L18,3826673.303,461292.417,5064796.327,6.144,-8.299,0.000,36,37
+L19,3826675.539,461285.575,5064795.267,-0.916,-10.057,0.000,38,39
+L20,3826675.330,461282.384,5064795.712,-4.059,-9.318,0.000,40,41
+L21,3826673.708,461278.724,5064797.261,-7.499,-6.750,0.000,42,43
+L22,3826670.664,461277.014,5064799.700,-8.833,-2.705,0.000,44,45
+L23,3826666.038,461276.851,5064803.187,-8.441,3.076,0.000,46,47
+L24,3826662.337,461278.333,5064805.831,-6.527,7.461,0.000,48,49
+L25,3826660.111,461281.860,5064807.184,-2.759,9.703,0.000,50,51
+L26,3826660.008,461285.793,5064806.905,1.158,9.241,0.000,52,53
+L27,3826661.138,461290.339,5064805.646,5.536,7.153,0.000,54,55
+L28,3826663.641,461293.620,5064803.471,8.494,3.546,0.000,56,57
+L29,3826667.461,461299.814,5064800.044,14.187,-2.137,0.000,58,59
+L30,3826670.518,461299.549,5064797.773,13.558,-5.902,0.000,60,61
+L31,3826672.628,461297.732,5064796.353,11.502,-8.256,0.000,62,63
+L32,3826676.692,461291.310,5064793.884,4.640,-12.351,0.000,64,65
+L33,3826678.858,461289.883,5064792.387,2.964,-14.833,0.000,66,67
+L34,3826677.977,461282.562,5064793.710,-4.199,-12.639,0.000,68,69
+L35,3826676.381,461278.019,5064795.318,-8.519,-9.972,0.000,70,71
+L36,3826674.910,461273.153,5064796.862,-13.174,-7.411,0.000,72,73
+L37,3826672.225,461273.132,5064798.879,-12.873,-4.067,0.000,74,75
+L38,3826668.482,461272.524,5064801.743,-13.029,0.683,0.000,76,77
+L39,3826662.934,461273.930,5064805.781,-10.970,7.378,0.000,78,79
+L40,3826660.839,461275.031,5064807.254,-9.626,9.820,0.000,80,81
+L41,3826658.295,461279.466,5064808.763,-4.919,12.322,0.000,82,83
+L42,3826655.791,461282.359,5064810.381,-1.747,15.004,0.000,84,85
+L43,3826656.814,461291.028,5064808.830,6.738,12.432,0.000,86,87
+L44,3826658.468,461294.311,5064807.291,9.799,9.881,0.000,88,89
+L45,3826661.374,461298.210,5064804.757,13.323,5.679,0.000,90,91
+L46,3826626.738,461247.856,5064835.307,-32.527,56.338,0.000,92,93
+L47,3826634.967,461338.355,5064820.950,56.338,32.527,0.000,94,95
+L48,3826662.186,461302.514,5064803.759,17.498,4.023,0.000,1,0
+L49,3826663.165,461305.257,5064802.776,20.105,2.394,0.000,3,2
+L50,3826675.517,461302.651,5064793.740,16.040,-12.590,0.000,5,4
+L51,3826682.918,461289.002,5064789.418,1.604,-19.755,0.000,7,6
+L52,3826683.924,461284.187,5064789.098,-3.297,-20.285,0.000,9,8
+L53,3826679.275,461273.884,5064793.519,-12.970,-12.954,0.000,11,10
+L54,3826670.092,461267.819,5064800.961,-17.893,-0.615,0.000,13,12
+L55,3826664.006,461265.856,5064805.706,-19.114,7.254,0.000,15,14
+L56,3826655.518,461276.176,5064811.144,-7.853,16.271,0.000,17,16
+L57,3826651.799,461283.124,5064813.308,-0.510,19.858,0.000,19,18
+L58,3826653.336,461292.747,5064811.285,8.860,16.503,0.000,21,20
+L59,3826651.003,461300.529,5064812.333,16.865,18.240,0.000,23,22
+L60,3826658.833,461308.557,5064805.730,23.899,7.291,0.000,25,24
+L61,3826668.903,461310.643,5064797.982,24.766,-5.556,0.000,27,26
+L62,3826673.864,461309.321,5064794.378,22.860,-11.532,0.000,29,28
+L63,3826680.222,461306.043,5064789.902,18.845,-18.954,0.000,31,30
+L64,3826686.151,461289.701,5064786.928,1.911,-23.884,0.000,33,32
+L65,3826686.957,461281.767,5064787.041,-6.063,-23.697,0.000,35,34
+L66,3826684.132,461268.612,5064790.351,-18.785,-18.208,0.000,37,36
+L67,3826674.554,461261.608,5064798.172,-24.593,-5.238,0.000,39,38
+L68,3826667.376,461259.587,5064803.743,-25.741,3.999,0.000,41,40
+L69,3826658.521,461264.094,5064809.982,-20.207,14.345,0.000,43,42
+L70,3826648.229,461274.479,5064816.769,-8.666,25.598,0.000,45,44
+L71,3826646.217,461292.108,5064816.686,9.077,25.459,0.000,47,46
+L72,3826644.129,461305.761,5064817.019,22.882,26.011,0.000,49,48
+L73,3826654.231,461312.987,5064808.783,28.848,12.354,0.000,51,50
+L74,3826665.368,461316.723,5064800.086,31.225,-2.068,0.000,53,52
+L75,3826671.727,461317.333,5064795.258,31.070,-10.073,0.000,55,54
+L76,3826684.892,461307.157,5064786.296,19.392,-24.933,0.000,57,56
+L77,3826693.911,461292.502,5064780.851,3.763,-33.961,0.000,59,58
+L78,3826694.622,461280.242,5064781.425,-8.494,-33.008,0.000,61,60
+L79,3826689.898,461273.311,5064785.598,-14.810,-26.089,0.000,63,62
+L80,3826686.388,461259.624,5064789.469,-27.979,-19.669,0.000,65,64
+L81,3826672.782,461252.030,5064800.368,-33.891,-1.596,0.000,67,66
+L82,3826665.609,461252.068,5064805.749,-32.995,7.326,0.000,69,68
+L83,3826653.225,461256.825,5064814.615,-26.790,22.027,0.000,71,70
+L84,3826649.356,461263.721,5064816.896,-19.481,25.808,0.000,73,72
+L85,3826641.135,461282.072,5064821.408,-0.279,33.289,0.000,75,74
+L86,3826642.916,461288.263,5064819.511,5.655,30.144,0.000,77,76
+L87,3826638.134,461290.517,5064822.897,8.465,35.758,0.000,79,78
+L88,3826652.918,461323.971,5064808.777,39.910,12.342,0.000,81,80
+L89,3826673.418,461324.280,5064793.361,37.765,-13.220,0.000,83,82
+L90,3826688.588,461316.632,5064782.665,28.357,-30.954,0.000,85,84
+L91,3826695.802,461302.874,5064778.494,13.835,-37.870,0.000,87,86
+L92,3826693.274,461258.270,5064784.423,-30.147,-28.036,0.000,89,88
+L93,3826676.866,461250.408,5064797.449,-35.989,-6.436,0.000,91,90
+L94,3826664.902,461244.541,5064806.960,-40.383,9.335,0.000,93,92
+L95,3826638.385,461273.910,5064824.210,-8.053,37.935,0.000,95,94
+H0,3826714.134,461278.012,5064766.981,-13.042,-56.959,0.000,0,1
+H1,3826714.092,461283.143,5064766.549,-7.942,-57.676,0.000,2,3
+H2,3826718.301,461272.655,5064764.337,-18.859,-61.342,0.000,4,5
+H3,3826718.258,461277.786,5064763.905,-13.759,-62.059,0.000,6,7
+H4,3826718.216,461282.918,5064763.473,-8.659,-62.776,0.000,8,9
+H5,3826718.173,461288.050,5064763.041,-3.559,-63.492,0.000,10,11
+H6,3826722.467,461267.298,5064761.694,-24.675,-65.725,0.000,12,13
+H7,3826722.425,461272.430,5064761.262,-19.575,-66.442,0.000,14,15
+H8,3826722.383,461277.561,5064760.829,-14.476,-67.159,0.000,16,17
+H9,3826722.340,461282.693,5064760.398,-9.376,-67.875,0.000,18,19
+H10,3826722.298,461287.825,5064759.966,-4.276,-68.592,0.000,20,21
+H11,3826722.256,461292.956,5064759.533,0.824,-69.309,0.000,22,23
+H12,3826726.592,461267.073,5064758.618,-25.392,-70.825,0.000,24,25
+H13,3826726.550,461272.205,5064758.186,-20.292,-71.542,0.000,26,27
+H14,3826726.508,461277.337,5064757.754,-15.192,-72.259,0.000,28,29
+H15,3826726.465,461282.469,5064757.322,-10.092,-72.975,0.000,30,31
+H16,3826726.423,461287.599,5064756.890,-4.993,-73.692,0.000,32,33
+H17,3826726.381,461292.731,5064756.458,0.107,-74.409,0.000,34,35
+H18,3826730.675,461271.980,5064755.110,-21.009,-76.642,0.000,36,37
+H19,3826730.632,461277.112,5064754.679,-15.909,-77.358,0.000,38,39
+H20,3826730.590,461282.243,5064754.246,-10.809,-78.075,0.000,40,41
+H21,3826730.547,461287.375,5064753.814,-5.709,-78.792,0.000,42,43
+H22,3826734.756,461276.886,5064751.603,-16.626,-82.458,0.000,44,45
+H23,3826734.714,461282.018,5064751.171,-11.526,-83.175,0.000,46,47
+H24,3826619.445,461232.975,5064842.126,-46.429,67.646,0.000,48,49
+H25,3826619.403,461238.106,5064841.694,-41.329,66.929,0.000,50,51
+H26,3826623.612,461227.618,5064839.483,-52.246,63.263,0.000,52,53
+H27,3826623.570,461232.749,5064839.051,-47.146,62.546,0.000,54,55
+H28,3826623.528,461237.881,5064838.618,-42.046,61.829,0.000,56,57
+H29,3826623.485,461243.013,5064838.187,-36.946,61.113,0.000,58,59
+H30,3826627.779,461222.261,5064836.839,-58.062,58.880,0.000,60,61
+H31,3826627.737,461227.393,5064836.407,-52.962,58.163,0.000,62,63
+H32,3826627.695,461232.524,5064835.975,-47.863,57.446,0.000,64,65
+H33,3826627.652,461237.656,5064835.543,-42.763,56.730,0.000,66,67
+H34,3826627.610,461242.788,5064835.111,-37.663,56.013,0.000,68,69
+H35,3826627.567,461247.919,5064834.679,-32.563,55.296,0.000,70,71
+H36,3826631.903,461222.036,5064833.764,-58.779,53.780,0.000,72,73
+H37,3826631.861,461227.168,5064833.331,-53.679,53.063,0.000,74,75
+H38,3826631.819,461232.300,5064832.899,-48.579,52.346,0.000,76,77
+H39,3826631.776,461237.432,5064832.467,-43.479,51.630,0.000,78,79
+H40,3826631.734,461242.562,5064832.035,-38.380,50.913,0.000,80,81
+H41,3826631.692,461247.694,5064831.603,-33.280,50.196,0.000,82,83
+H42,3826635.986,461226.943,5064830.256,-54.396,47.963,0.000,84,85
+H43,3826635.943,461232.075,5064829.824,-49.296,47.247,0.000,86,87
+H44,3826635.901,461237.206,5064829.392,-44.196,46.530,0.000,88,89
+H45,3826635.859,461242.338,5064828.960,-39.096,45.813,0.000,90,91
+H46,3826640.068,461231.849,5064826.748,-50.013,42.147,0.000,92,93
+H47,3826640.026,461236.981,5064826.316,-44.913,41.430,0.000,94,95
+CLBA,3826667.465,461285.525,5064801.332,0.000,0.000,0.000,-1,-1
+CHBA0,3826637.817,461227.021,5064828.874,-54.537,45.672,0.000,-1,-1
+CHBA1,3826649.357,461353.917,5064808.743,70.067,12.284,0.000,-1,-1
+CHBA,3826643.587,461290.469,5064818.809,7.765,28.978,0.000,-1,-1
diff --git a/MAC/Deployment/data/Coordinates/ETRF_FILES/CS028/cs028-antenna-positions-etrs.csv b/MAC/Deployment/data/Coordinates/ETRF_FILES/CS028/cs028-antenna-positions-etrs.csv
new file mode 100644
index 0000000000000000000000000000000000000000..038adb8195928b3c96d3c93e12c42906e4a137f4
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/ETRF_FILES/CS028/cs028-antenna-positions-etrs.csv
@@ -0,0 +1,149 @@
+NAME,ETRS-X,ETRS-Y,ETRS-Z,STATION-P,STATION-Q,STATION-R,RCU-X,RCU-Y
+L0,3825600.841,461260.269,5065604.065,0.000,0.000,0.000,0,1
+L1,3825598.822,461260.026,5065605.603,0.000,2.550,0.000,2,3
+L2,3825599.503,461262.374,5065604.879,2.250,1.350,0.000,4,5
+L3,3825601.641,461262.632,5065603.251,2.250,-1.350,0.000,6,7
+L4,3825602.860,461260.512,5065602.527,0.000,-2.550,0.000,8,9
+L5,3825602.179,461258.164,5065603.251,-2.250,-1.350,0.000,10,11
+L6,3825600.041,461257.906,5065604.879,-2.250,1.350,0.000,12,13
+L7,3825599.988,461266.005,5065604.187,5.797,0.202,0.000,14,15
+L8,3825603.123,461265.147,5065601.912,4.570,-3.571,0.000,16,17
+L9,3825605.190,461262.008,5065600.644,1.206,-5.673,0.000,18,19
+L10,3825605.222,461258.054,5065600.977,-2.723,-5.121,0.000,20,21
+L11,3825603.205,461255.137,5065602.754,-5.378,-2.173,0.000,22,23
+L12,3825600.082,461254.622,5065605.146,-5.516,1.792,0.000,24,25
+L13,3825597.313,461256.748,5065607.031,-3.074,4.919,0.000,26,27
+L14,3825596.196,461260.522,5065607.529,0.807,5.744,0.000,28,29
+L15,3825597.252,461264.178,5065606.406,4.310,3.881,0.000,30,31
+L16,3825595.506,461267.130,5065607.449,7.450,5.611,0.000,32,33
+L17,3825597.638,461269.487,5065605.636,9.535,2.605,0.000,34,35
+L18,3825601.547,461270.468,5065602.613,10.041,-2.408,0.000,36,37
+L19,3825606.720,461266.781,5065599.064,5.762,-8.293,0.000,38,39
+L20,3825608.216,461264.058,5065598.187,2.880,-9.747,0.000,40,41
+L21,3825608.922,461259.826,5065598.040,-1.406,-9.991,0.000,42,43
+L22,3825607.579,461256.016,5065599.392,-5.028,-7.749,0.000,44,45
+L23,3825604.281,461252.179,5065602.214,-8.443,-3.069,0.000,46,47
+L24,3825600.809,461250.398,5065604.981,-9.796,1.520,0.000,48,49
+L25,3825597.357,461251.438,5065607.478,-8.351,5.660,0.000,50,51
+L26,3825595.250,461254.506,5065608.783,-5.053,7.823,0.000,52,53
+L27,3825593.726,461259.052,5065609.516,-0.357,9.038,0.000,54,55
+L28,3825593.860,461263.687,5065608.996,4.228,8.176,0.000,56,57
+L29,3825593.452,461271.709,5065608.578,12.242,7.482,0.000,58,59
+L30,3825595.824,461273.947,5065606.595,14.180,4.194,0.000,60,61
+L31,3825598.306,461274.184,5065604.710,14.118,1.069,0.000,62,63
+L32,3825604.598,461272.298,5065600.158,11.493,-6.479,0.000,64,65
+L33,3825606.919,461272.892,5065598.361,11.805,-9.458,0.000,66,67
+L34,3825610.060,461266.323,5065596.598,4.908,-12.382,0.000,68,69
+L35,3825611.241,461261.405,5065596.156,-0.116,-13.115,0.000,70,71
+L36,3825612.680,461256.329,5065595.534,-5.328,-14.145,0.000,72,73
+L37,3825610.728,461254.161,5065597.196,-7.247,-11.390,0.000,74,75
+L38,3825608.305,461250.674,5065599.329,-10.419,-7.852,0.000,76,77
+L39,3825603.521,461247.351,5065603.221,-13.146,-1.399,0.000,78,79
+L40,3825601.420,461246.554,5065604.870,-13.686,1.336,0.000,80,81
+L41,3825597.268,461248.066,5065607.850,-11.688,6.277,0.000,82,83
+L42,3825593.942,461248.375,5065610.319,-10.983,10.370,0.000,84,85
+L43,3825590.208,461256.138,5065612.420,-2.829,13.854,0.000,86,87
+L44,3825589.720,461260.092,5065612.429,1.155,13.868,0.000,88,89
+L45,3825589.829,461265.546,5065611.854,6.556,12.915,0.000,90,91
+L46,3825593.061,461324.856,5065604.067,65.054,0.000,0.000,92,93
+L47,3825652.361,461266.476,5065564.832,0.000,-65.054,0.000,94,95
+L48,3825588.199,461269.642,5065612.707,10.818,14.330,0.000,1,0
+L49,3825587.496,461272.623,5065612.965,13.862,14.757,0.000,3,2
+L50,3825597.876,461280.439,5065604.467,20.380,0.666,0.000,5,4
+L51,3825610.344,461275.442,5065595.560,13.927,-14.103,0.000,7,6
+L52,3825613.568,461272.391,5065593.416,10.513,-17.658,0.000,9,8
+L53,3825615.495,461260.414,5065593.053,-1.609,-18.260,0.000,11,10
+L54,3825611.915,461248.195,5065596.844,-13.312,-11.973,0.000,13,12
+L55,3825608.480,461241.746,5065600.006,-19.304,-6.730,0.000,15,14
+L56,3825596.937,461243.206,5065608.537,-16.474,7.417,0.000,17,16
+L57,3825590.626,461245.788,5065613.041,-13.155,14.885,0.000,19,18
+L58,3825586.776,461254.726,5065615.124,-3.821,18.337,0.000,21,20
+L59,3825581.047,461259.088,5065619.029,1.195,24.813,0.000,23,22
+L60,3825582.623,461271.794,5065616.698,13.622,20.947,0.000,25,24
+L61,3825588.908,461281.538,5065611.099,22.544,11.663,0.000,27,26
+L62,3825593.219,461284.456,5065607.600,24.925,5.860,0.000,29,28
+L63,3825599.564,461286.927,5065602.614,26.619,-2.407,0.000,31,30
+L64,3825612.346,461278.593,5065593.773,16.816,-17.067,0.000,33,32
+L65,3825617.037,461272.885,5065590.767,10.588,-22.050,0.000,35,34
+L66,3825621.771,461260.085,5065588.371,-2.686,-26.023,0.000,37,36
+L67,3825618.389,461246.798,5065592.111,-15.473,-19.821,0.000,39,38
+L68,3825614.184,461239.426,5065595.934,-22.289,-13.482,0.000,41,40
+L69,3825605.379,461235.937,5065602.858,-24.700,-2.000,0.000,43,42
+L70,3825592.484,461236.003,5065612.531,-23.092,14.039,0.000,45,44
+L71,3825581.901,461248.508,5065619.345,-9.411,25.337,0.000,47,46
+L72,3825573.316,461257.767,5065624.952,0.809,34.634,0.000,49,48
+L73,3825576.968,461271.653,5065620.955,14.158,28.006,0.000,51,50
+L74,3825583.180,461283.573,5065615.215,25.249,18.487,0.000,53,52
+L75,3825587.515,461289.158,5065611.457,30.276,12.255,0.000,55,54
+L76,3825602.402,461291.562,5065600.065,30.882,-6.635,0.000,57,56
+L77,3825616.573,461287.055,5065589.835,24.712,-23.597,0.000,59,58
+L78,3825623.431,461277.808,5065585.523,14.711,-30.746,0.000,61,60
+L79,3825623.560,461268.470,5065586.271,5.425,-29.506,0.000,63,62
+L80,3825628.068,461254.696,5065584.132,-8.790,-33.052,0.000,65,64
+L81,3825622.044,461237.707,5065590.189,-24.936,-23.007,0.000,67,66
+L82,3825616.779,461231.987,5065594.658,-29.985,-15.597,0.000,69,68
+L83,3825605.263,461225.870,5065603.855,-34.681,-0.346,0.000,71,70
+L84,3825598.870,461228.292,5065608.434,-31.512,7.247,0.000,73,72
+L85,3825583.372,461236.396,5065619.335,-21.612,25.322,0.000,75,74
+L86,3825581.474,461242.783,5065620.182,-15.044,26.726,0.000,77,76
+L87,3825576.811,461240.754,5065623.866,-16.500,32.834,0.000,79,78
+L88,3825570.329,461279.397,5065625.239,22.640,35.108,0.000,81,80
+L89,3825585.160,461296.077,5065612.599,37.427,14.148,0.000,83,82
+L90,3825600.207,461302.114,5065600.759,41.620,-5.484,0.000,85,84
+L91,3825612.594,461296.879,5065591.934,34.941,-20.117,0.000,87,86
+L92,3825633.802,461259.131,5065579.427,-5.073,-40.854,0.000,89,88
+L93,3825625.868,461239.682,5065587.140,-23.433,-28.063,0.000,91,90
+L94,3825620.153,461225.393,5065592.722,-36.936,-18.807,0.000,93,92
+L95,3825585.580,461227.656,5065618.468,-30.553,23.884,0.000,95,94
+H0,3825650.249,461264.368,5065566.608,-1.841,-62.109,0.000,0,1
+H1,3825653.644,461267.051,5065563.817,0.417,-66.737,0.000,2,3
+H2,3825649.194,461257.305,5065568.039,-8.727,-59.737,0.000,4,5
+H3,3825652.590,461259.987,5065565.247,-6.470,-64.366,0.000,6,7
+H4,3825655.986,461262.671,5065562.455,-4.212,-68.995,0.000,8,9
+H5,3825659.382,461265.354,5065559.664,-1.954,-73.624,0.000,10,11
+H6,3825648.140,461250.241,5065569.468,-15.614,-57.366,0.000,12,13
+H7,3825651.536,461252.924,5065566.677,-13.356,-61.995,0.000,14,15
+H8,3825654.931,461255.608,5065563.885,-11.098,-66.624,0.000,16,17
+H9,3825658.327,461258.290,5065561.094,-8.841,-71.253,0.000,18,19
+H10,3825661.723,461260.974,5065558.303,-6.583,-75.881,0.000,20,21
+H11,3825665.119,461263.656,5065555.511,-4.326,-80.510,0.000,22,23
+H12,3825650.481,461245.862,5065568.106,-20.242,-59.624,0.000,24,25
+H13,3825653.877,461248.544,5065565.315,-17.985,-64.253,0.000,26,27
+H14,3825657.272,461251.227,5065562.524,-15.727,-68.881,0.000,28,29
+H15,3825660.669,461253.910,5065559.732,-13.470,-73.510,0.000,30,31
+H16,3825664.064,461256.593,5065556.941,-11.212,-78.139,0.000,32,33
+H17,3825667.460,461259.277,5065554.149,-8.954,-82.768,0.000,34,35
+H18,3825656.218,461244.164,5065563.954,-22.614,-66.510,0.000,36,37
+H19,3825659.614,461246.847,5065561.162,-20.356,-71.139,0.000,38,39
+H20,3825663.010,461249.531,5065558.370,-18.098,-75.768,0.000,40,41
+H21,3825666.406,461252.213,5065555.579,-15.841,-80.397,0.000,42,43
+H22,3825661.956,461242.467,5065559.800,-24.985,-73.397,0.000,44,45
+H23,3825665.351,461245.150,5065557.009,-22.727,-78.025,0.000,46,47
+H24,3825555.560,461219.331,5065641.754,-35.228,62.496,0.000,48,49
+H25,3825558.955,461222.014,5065638.963,-32.970,57.868,0.000,50,51
+H26,3825554.505,461212.268,5065643.184,-42.114,64.868,0.000,52,53
+H27,3825557.901,461214.950,5065640.393,-39.857,60.239,0.000,54,55
+H28,3825561.297,461217.634,5065637.601,-37.599,55.610,0.000,56,57
+H29,3825564.693,461220.317,5065634.809,-35.341,50.981,0.000,58,59
+H30,3825553.451,461205.204,5065644.614,-49.001,67.239,0.000,60,61
+H31,3825556.847,461207.887,5065641.822,-46.743,62.610,0.000,62,63
+H32,3825560.243,461210.571,5065639.031,-44.485,57.981,0.000,64,65
+H33,3825563.639,461213.253,5065636.239,-42.228,53.352,0.000,66,67
+H34,3825567.034,461215.937,5065633.448,-39.970,48.724,0.000,68,69
+H35,3825570.430,461218.619,5065630.656,-37.713,44.095,0.000,70,71
+H36,3825555.793,461200.825,5065643.252,-53.629,64.981,0.000,72,73
+H37,3825559.189,461203.507,5065640.460,-51.372,60.352,0.000,74,75
+H38,3825562.584,461206.190,5065637.669,-49.114,55.724,0.000,76,77
+H39,3825565.980,461208.873,5065634.878,-46.857,51.095,0.000,78,79
+H40,3825569.376,461211.556,5065632.086,-44.599,46.466,0.000,80,81
+H41,3825572.772,461214.240,5065629.295,-42.341,41.837,0.000,82,83
+H42,3825561.530,461199.127,5065639.099,-56.001,58.095,0.000,84,85
+H43,3825564.926,461201.810,5065636.307,-53.743,53.466,0.000,86,87
+H44,3825568.322,461204.494,5065633.516,-51.485,48.837,0.000,88,89
+H45,3825571.718,461207.176,5065630.724,-49.228,44.208,0.000,90,91
+H46,3825567.268,461197.430,5065634.946,-58.372,51.208,0.000,92,93
+H47,3825570.663,461200.113,5065632.155,-56.114,46.580,0.000,94,95
+CLBA,3825600.841,461260.269,5065604.065,0.000,0.000,0.000,-1,-1
+CHBA0,3825573.530,461324.283,5065618.779,66.821,24.395,0.000,-1,-1
+CHBA1,3825656.679,461242.425,5065563.765,-24.395,-66.822,0.000,-1,-1
+CHBA,3825615.105,461283.354,5065591.272,21.213,-21.214,0.000,-1,-1
diff --git a/MAC/Deployment/data/Coordinates/ETRF_FILES/CS031/cs031-antenna-positions-etrs.csv b/MAC/Deployment/data/Coordinates/ETRF_FILES/CS031/cs031-antenna-positions-etrs.csv
new file mode 100644
index 0000000000000000000000000000000000000000..0cfabb0e8e3bc8664e28f2b860500635f30c4601
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/ETRF_FILES/CS031/cs031-antenna-positions-etrs.csv
@@ -0,0 +1,149 @@
+NAME,ETRS-X,ETRS-Y,ETRS-Z,STATION-P,STATION-Q,STATION-R,RCU-X,RCU-Y
+L0,3826440.392,460273.509,5065063.334,0.000,0.000,0.000,0,1
+L1,3826438.373,460273.266,5065064.872,0.000,2.550,0.000,2,3
+L2,3826439.054,460275.614,5065064.148,2.250,1.350,0.000,4,5
+L3,3826441.192,460275.872,5065062.520,2.250,-1.350,0.000,6,7
+L4,3826442.411,460273.752,5065061.796,0.000,-2.550,0.000,8,9
+L5,3826441.730,460271.404,5065062.520,-2.250,-1.350,0.000,10,11
+L6,3826439.592,460271.146,5065064.148,-2.250,1.350,0.000,12,13
+L7,3826444.773,460271.294,5065060.246,-2.723,-5.121,0.000,14,15
+L8,3826442.756,460268.377,5065062.023,-5.378,-2.173,0.000,16,17
+L9,3826439.633,460267.862,5065064.415,-5.516,1.792,0.000,18,19
+L10,3826436.864,460269.988,5065066.300,-3.074,4.919,0.000,20,21
+L11,3826435.747,460273.762,5065066.798,0.807,5.744,0.000,22,23
+L12,3826436.803,460277.418,5065065.675,4.310,3.881,0.000,24,25
+L13,3826439.539,460279.244,5065063.456,5.796,0.202,0.000,26,27
+L14,3826442.674,460278.387,5065061.181,4.570,-3.571,0.000,28,29
+L15,3826444.741,460275.248,5065059.913,1.206,-5.673,0.000,30,31
+L16,3826447.588,460275.518,5065057.751,1.134,-9.258,0.000,32,33
+L17,3826448.263,460271.928,5065057.568,-2.511,-9.560,0.000,34,35
+L18,3826447.175,460267.169,5065058.816,-7.106,-7.492,0.000,36,37
+L19,3826442.264,460263.599,5065062.825,-10.063,-0.844,0.000,38,39
+L20,3826439.690,460263.471,5065064.768,-9.882,2.379,0.000,40,41
+L21,3826436.422,460265.024,5065067.081,-7.949,6.213,0.000,42,43
+L22,3826434.377,460268.557,5065068.297,-4.197,8.229,0.000,44,45
+L23,3826433.199,460274.217,5065068.669,1.563,8.847,0.000,46,47
+L24,3826433.532,460278.942,5065067.992,6.215,7.724,0.000,48,49
+L25,3826435.820,460282.101,5065065.989,9.077,4.402,0.000,50,51
+L26,3826438.912,460282.699,5065063.614,9.301,0.464,0.000,52,53
+L27,3826442.768,460281.859,5065060.796,8.006,-4.209,0.000,54,55
+L28,3826445.936,460279.180,5065058.660,4.967,-7.750,0.000,56,57
+L29,3826451.708,460275.234,5065054.684,0.359,-14.343,0.000,58,59
+L30,3826452.191,460271.448,5065054.663,-3.458,-14.377,0.000,60,61
+L31,3826451.232,460268.638,5065055.638,-6.133,-12.761,0.000,62,63
+L32,3826447.068,460262.873,5065059.285,-11.358,-6.714,0.000,64,65
+L33,3826446.429,460260.041,5065060.020,-14.093,-5.495,0.000,66,67
+L34,3826440.431,460260.242,5065064.504,-13.176,1.941,0.000,68,69
+L35,3826436.471,460261.655,5065067.349,-11.300,6.658,0.000,70,71
+L36,3826432.283,460262.877,5065070.382,-9.586,11.687,0.000,72,73
+L37,3826431.658,460266.172,5065070.553,-6.240,11.971,0.000,74,75
+L38,3826430.327,460270.695,5065071.143,-1.590,12.949,0.000,76,77
+L39,3826430.180,460277.678,5065070.622,5.361,12.085,0.000,78,79
+L40,3826430.577,460280.384,5065070.080,8.000,11.185,0.000,80,81
+L41,3826433.512,460284.042,5065067.546,11.280,6.984,0.000,82,83
+L42,3826435.235,460287.464,5065065.943,14.472,4.326,0.000,84,85
+L43,3826442.333,460287.253,5065060.634,13.413,-4.477,0.000,86,87
+L44,3826445.308,460285.616,5065058.550,11.432,-7.934,0.000,88,89
+L45,3826449.057,460282.516,5065056.016,7.906,-12.135,0.000,90,91
+L46,3826391.885,460300.427,5065097.311,32.527,56.338,0.000,92,93
+L47,3826459.414,460332.546,5065043.720,56.338,-32.527,0.000,94,95
+L48,3826452.648,460282.037,5065053.364,7.001,-16.533,0.000,1,0
+L49,3826455.043,460281.166,5065051.645,5.849,-19.383,0.000,3,2
+L50,3826455.784,460265.680,5065052.489,-9.614,-17.983,0.000,5,4
+L51,3826446.653,460254.948,5065060.312,-19.177,-5.010,0.000,7,6
+L52,3826443.067,460253.134,5065063.167,-20.549,-0.275,0.000,9,8
+L53,3826433.852,460257.604,5065069.680,-15.009,10.524,0.000,11,10
+L54,3826426.965,460268.151,5065073.897,-3.713,17.515,0.000,13,12
+L55,3826424.030,460275.389,5065075.446,3.824,20.083,0.000,15,14
+L56,3826430.276,460287.056,5065069.702,14.660,10.559,0.000,17,16
+L57,3826434.936,460292.460,5065065.717,19.468,3.950,0.000,19,18
+L58,3826442.904,460291.730,5065059.801,17.790,-5.859,0.000,21,20
+L59,3826448.539,460295.534,5065055.228,20.892,-13.442,0.000,23,22
+L60,3826456.674,460286.883,5065049.904,11.330,-22.270,0.000,25,24
+L61,3826460.612,460274.766,5065048.043,-1.171,-25.355,0.000,27,26
+L62,3826460.690,460268.514,5065048.549,-7.387,-24.515,0.000,29,28
+L63,3826459.537,460260.310,5065050.156,-15.394,-21.850,0.000,31,30
+L64,3826447.940,460251.062,5065059.697,-23.189,-6.029,0.000,33,32
+L65,3826441.840,460249.117,5065064.452,-24.390,1.855,0.000,35,34
+L66,3826430.780,460251.004,5065072.583,-21.194,15.337,0.000,37,36
+L67,3826423.059,460261.923,5065077.391,-9.429,23.310,0.000,39,38
+L68,3826419.830,460270.497,5065079.041,-0.531,26.044,0.000,41,40
+L69,3826421.389,460281.914,5065076.838,10.618,22.391,0.000,43,42
+L70,3826427.278,460295.804,5065071.162,23.704,12.979,0.000,45,44
+L71,3826440.783,460300.397,5065060.610,26.648,-4.518,0.000,47,46
+L72,3826451.123,460304.605,5065052.469,29.589,-18.018,0.000,49,48
+L73,3826459.139,460293.067,5065047.495,17.175,-26.265,0.000,51,50
+L74,3826464.625,460279.839,5065044.572,3.386,-31.110,0.000,53,52
+L75,3826466.551,460272.103,5065043.826,-4.525,-32.347,0.000,55,54
+L76,3826461.479,460254.709,5065049.205,-21.187,-23.427,0.000,57,56
+L77,3826451.919,460241.869,5065057.542,-32.792,-9.603,0.000,59,58
+L78,3826442.371,460239.520,5065064.921,-33.982,2.633,0.000,61,60
+L79,3826435.809,460244.487,5065069.397,-28.265,10.055,0.000,63,62
+L80,3826424.173,460247.151,5065077.890,-24.229,24.138,0.000,65,64
+L81,3826415.071,460262.947,5065083.295,-7.457,33.099,0.000,67,66
+L82,3826413.473,460271.761,5065083.698,1.485,33.766,0.000,69,68
+L83,3826414.431,460287.545,5065081.552,17.041,30.208,0.000,71,70
+L84,3826419.014,460293.126,5065077.608,22.033,23.667,0.000,73,72
+L85,3826431.682,460305.431,5065066.987,32.735,6.055,0.000,75,74
+L86,3826436.990,460303.989,5065063.133,30.668,-0.335,0.000,77,76
+L87,3826437.689,460310.134,5065062.052,36.685,-2.127,0.000,79,78
+L88,3826467.539,460296.003,5065040.924,19.085,-37.161,0.000,81,80
+L89,3826472.437,460270.862,5065039.520,-6.461,-39.487,0.000,83,82
+L90,3826469.822,460251.311,5065043.249,-25.559,-33.302,0.000,85,84
+L91,3826460.563,460240.795,5065051.150,-34.892,-20.201,0.000,87,86
+L92,3826424.663,460238.531,5065078.302,-32.845,24.821,0.000,89,88
+L93,3826414.714,460257.737,5065084.034,-12.587,34.325,0.000,91,90
+L94,3826407.351,460271.725,5065088.296,2.181,41.391,0.000,93,92
+L95,3826424.594,460307.826,5065072.091,35.960,14.518,0.000,95,94
+H0,3826487.151,460271.872,5065028.384,-7.219,-57.953,0.000,0,1
+H1,3826488.922,460276.385,5065026.647,-2.950,-60.833,0.000,2,3
+H2,3826489.107,460264.906,5065027.545,-14.369,-59.343,0.000,4,5
+H3,3826490.878,460269.420,5065025.808,-10.099,-62.223,0.000,6,7
+H4,3826492.648,460273.934,5065024.072,-5.829,-65.103,0.000,8,9
+H5,3826494.417,460278.447,5065022.335,-1.560,-67.982,0.000,10,11
+H6,3826491.063,460257.941,5065026.707,-21.518,-60.733,0.000,12,13
+H7,3826492.833,460262.455,5065024.970,-17.248,-63.612,0.000,14,15
+H8,3826494.603,460266.968,5065023.234,-12.979,-66.492,0.000,16,17
+H9,3826496.373,460271.482,5065021.497,-8.709,-69.372,0.000,18,19
+H10,3826498.143,460275.995,5065019.760,-4.440,-72.252,0.000,20,21
+H11,3826499.913,460280.509,5065018.024,-0.170,-75.132,0.000,22,23
+H12,3826494.789,460255.489,5065024.132,-24.398,-65.002,0.000,24,25
+H13,3826496.559,460260.003,5065022.395,-20.128,-67.882,0.000,26,27
+H14,3826498.329,460264.516,5065020.658,-15.859,-70.762,0.000,28,29
+H15,3826500.099,460269.030,5065018.922,-11.589,-73.642,0.000,30,31
+H16,3826501.869,460273.543,5065017.185,-7.320,-76.522,0.000,32,33
+H17,3826503.639,460278.057,5065015.449,-3.050,-79.401,0.000,34,35
+H18,3826500.285,460257.551,5065019.820,-23.008,-72.152,0.000,36,37
+H19,3826502.054,460262.064,5065018.084,-18.739,-75.031,0.000,38,39
+H20,3826503.824,460266.578,5065016.347,-14.469,-77.911,0.000,40,41
+H21,3826505.595,460271.092,5065014.610,-10.199,-80.791,0.000,42,43
+H22,3826505.780,460259.613,5065015.509,-21.618,-79.301,0.000,44,45
+H23,3826507.550,460264.126,5065013.772,-17.349,-82.181,0.000,46,47
+H24,3826392.463,460226.835,5065103.529,-40.606,66.652,0.000,48,49
+H25,3826394.233,460231.348,5065101.792,-36.337,63.772,0.000,50,51
+H26,3826394.419,460219.869,5065102.691,-47.756,65.262,0.000,52,53
+H27,3826396.189,460224.383,5065100.954,-43.486,62.382,0.000,54,55
+H28,3826397.959,460228.897,5065099.217,-39.216,59.502,0.000,56,57
+H29,3826399.729,460233.410,5065097.481,-34.947,56.623,0.000,58,59
+H30,3826396.375,460212.903,5065101.852,-54.905,63.872,0.000,60,61
+H31,3826398.144,460217.418,5065100.116,-50.635,60.993,0.000,62,63
+H32,3826399.914,460221.931,5065098.379,-46.366,58.113,0.000,64,65
+H33,3826401.684,460226.445,5065096.642,-42.096,55.233,0.000,66,67
+H34,3826403.455,460230.958,5065094.906,-37.827,52.353,0.000,68,69
+H35,3826405.225,460235.472,5065093.169,-33.557,49.473,0.000,70,71
+H36,3826400.100,460210.451,5065099.277,-57.785,59.603,0.000,72,73
+H37,3826401.870,460214.966,5065097.541,-53.515,56.723,0.000,74,75
+H38,3826403.640,460219.479,5065095.804,-49.246,53.843,0.000,76,77
+H39,3826405.411,460223.993,5065094.067,-44.976,50.963,0.000,78,79
+H40,3826407.181,460228.506,5065092.330,-40.707,48.083,0.000,80,81
+H41,3826408.950,460233.020,5065090.594,-36.437,45.204,0.000,82,83
+H42,3826405.596,460212.514,5065094.965,-56.395,52.453,0.000,84,85
+H43,3826407.366,460217.027,5065093.229,-52.126,49.574,0.000,86,87
+H44,3826409.136,460221.541,5065091.493,-47.856,46.694,0.000,88,89
+H45,3826410.906,460226.055,5065089.756,-43.586,43.814,0.000,90,91
+H46,3826411.092,460214.576,5065090.654,-55.005,45.304,0.000,92,93
+H47,3826412.862,460219.089,5065088.917,-50.736,42.424,0.000,94,95
+CLBA,3826440.392,460273.509,5065063.334,0.000,0.000,0.000,-1,-1
+CHBA0,3826383.433,460279.019,5065105.590,12.284,70.067,0.000,-1,-1
+CHBA1,3826478.121,460324.057,5065030.445,45.672,-54.537,0.000,-1,-1
+CHBA,3826430.777,460301.538,5065068.018,28.978,7.765,0.000,-1,-1
diff --git a/MAC/Deployment/data/Coordinates/ETRF_FILES/Effelsberg/de601-antenna-positions-etrs.csv b/MAC/Deployment/data/Coordinates/ETRF_FILES/DE601/de601-antenna-positions-etrs.csv
similarity index 100%
rename from MAC/Deployment/data/Coordinates/ETRF_FILES/Effelsberg/de601-antenna-positions-etrs.csv
rename to MAC/Deployment/data/Coordinates/ETRF_FILES/DE601/de601-antenna-positions-etrs.csv
diff --git a/MAC/Deployment/data/Coordinates/ETRF_FILES/DE602/de602-antenna-positions-etrs.csv b/MAC/Deployment/data/Coordinates/ETRF_FILES/DE602/de602-antenna-positions-etrs.csv
new file mode 100644
index 0000000000000000000000000000000000000000..651a88e5c0ea203698533f0d9aaa1eba0fd00d4a
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/ETRF_FILES/DE602/de602-antenna-positions-etrs.csv
@@ -0,0 +1,195 @@
+NAME,ETRS-X,ETRS-Y,ETRS-Z,STATION-P,STATION-Q,STATION-R,RCU-X,RCU-Y
+L0,4152561.412,828854.349,4754358.699,-13.920,2.404,0.000,0,1
+L1,4152555.686,828858.040,4754363.277,-9.569,9.363,0.000,2,3
+L2,4152558.894,828852.782,4754361.185,-15.175,6.064,0.000,4,5
+L3,4152553.957,828855.786,4754365.159,-11.601,12.099,0.000,6,7
+L4,4152557.628,828888.963,4754356.960,20.913,0.952,0.000,8,9
+L5,4152553.020,828891.170,4754360.757,23.657,6.695,0.000,10,11
+L6,4152561.697,828894.662,4754352.474,26.087,-5.560,0.000,12,13
+L7,4152558.409,828897.374,4754355.015,29.174,-1.675,0.000,14,15
+L8,4152561.275,828848.251,4754359.725,-19.961,3.734,0.000,16,17
+L9,4152565.467,828843.539,4754356.671,-25.143,-0.983,0.000,18,19
+L10,4152564.315,828840.005,4754358.226,-28.515,1.222,0.000,20,21
+L11,4152561.228,828839.912,4754361.003,-28.238,5.366,0.000,22,23
+L12,4152560.317,828873.367,4754356.863,5.101,0.290,0.000,24,25
+L13,4152557.786,828869.123,4754359.757,1.188,4.472,0.000,26,27
+L14,4152555.457,828870.826,4754361.589,3.158,7.265,0.000,28,29
+L15,4152555.687,828875.541,4754360.685,7.814,6.071,0.000,30,31
+L16,4152553.088,828869.550,4754363.898,2.174,10.671,0.000,32,33
+L17,4152552.667,828864.655,4754365.000,-2.637,12.155,0.000,34,35
+L18,4152547.655,828870.761,4754368.581,4.027,17.705,0.000,36,37
+L19,4152546.719,828866.415,4754370.062,-0.177,19.774,0.000,38,39
+L20,4152576.939,828869.272,4754342.593,-0.956,-21.157,0.000,40,41
+L21,4152578.815,828860.467,4754342.218,-9.926,-22.009,0.000,42,43
+L22,4152583.857,828869.453,4754336.374,-1.604,-30.439,0.000,44,45
+L23,4152582.783,828857.702,4754339.076,-13.147,-26.793,0.000,46,47
+L24,4152566.682,828856.841,4754353.614,-12.076,-5.109,0.000,48,49
+L25,4152565.848,828852.997,4754354.930,-15.794,-3.271,0.000,50,51
+L26,4152569.843,828855.747,4754350.947,-13.540,-9.128,0.000,52,53
+L27,4152572.265,828852.992,4754349.187,-16.567,-11.848,0.000,54,55
+L28,4152570.704,828883.244,4754346.104,13.668,-15.451,0.000,56,57
+L29,4152571.427,828886.908,4754344.914,17.221,-17.107,0.000,58,59
+L30,4152577.237,828879.998,4754340.738,9.662,-23.573,0.000,60,61
+L31,4152578.257,828885.650,4754338.988,15.154,-25.999,0.000,62,63
+L32,4152545.611,828873.792,4754369.962,7.283,19.868,0.000,64,65
+L33,4152545.153,828880.329,4754369.403,13.830,19.250,0.000,66,67
+L34,4152538.067,828884.175,4754375.175,18.498,27.998,0.000,68,69
+L35,4152537.976,828877.761,4754376.207,12.139,29.327,0.000,70,71
+L36,4152563.840,828874.286,4754353.574,5.592,-4.591,0.000,72,73
+L37,4152560.543,828878.359,4754355.921,10.032,-0.951,0.000,74,75
+L38,4152565.692,828877.162,4754351.490,8.227,-7.608,0.000,76,77
+L39,4152563.995,828880.288,4754352.546,11.535,-5.927,0.000,78,79
+L40,4152552.043,828847.500,4754368.099,-19.602,16.215,0.000,80,81
+L41,4152546.856,828855.407,4754371.571,-11.127,21.662,0.000,82,83
+L42,4152546.206,828846.523,4754373.467,-19.874,24.201,0.000,84,85
+L43,4152541.604,828855.583,4754376.244,-10.324,28.648,0.000,86,87
+L44,4152566.718,828868.681,4754351.828,-0.320,-7.384,0.000,88,89
+L45,4152568.829,828871.241,4754349.560,1.970,-10.687,0.000,90,91
+L46,4152568.770,828864.515,4754350.608,-4.703,-9.344,0.000,92,93
+L47,4152571.223,828868.268,4754347.857,-1.269,-13.328,0.000,94,95
+L48,4152554.091,828884.430,4754360.797,16.834,6.532,0.000,96,97
+L49,4152574.876,828875.673,4754343.491,5.649,-19.604,0.000,98,99
+L50,4152549.957,828894.370,4754363.024,27.202,10.188,0.000,100,101
+L51,4152547.248,828882.124,4754367.262,15.363,16.112,0.000,102,103
+L52,4152576.560,828852.079,4754345.478,-17.988,-17.417,0.000,104,105
+L53,4152583.147,828877.088,4754335.880,6.064,-30.925,0.000,106,107
+L54,4152543.970,828888.675,4754369.226,22.262,19.262,0.000,108,109
+L55,4152558.690,828876.179,4754357.902,8.088,1.936,0.000,110,111
+L56,4152554.834,828841.372,4754366.508,-26.022,13.637,0.000,112,113
+L57,4152575.004,828858.799,4754345.876,-11.127,-16.601,0.000,114,115
+L58,4152566.365,828849.090,4754355.046,-19.736,-3.227,0.000,116,117
+L59,4152573.037,828893.136,4754342.551,23.214,-20.430,0.000,118,119
+L60,4152571.810,828876.220,4754346.155,6.559,-15.608,0.000,120,121
+L61,4152573.699,828862.366,4754346.516,-7.428,-15.527,0.000,122,123
+L62,4152549.415,828857.675,4754368.944,-9.181,17.815,0.000,124,125
+L63,4152557.070,828864.958,4754361.015,-2.863,6.213,0.000,126,127
+L64,4152558.529,828883.422,4754356.974,15.302,0.789,0.000,128,129
+L65,4152561.504,828860.762,4754357.667,-7.561,1.075,0.000,130,131
+L66,4152567.327,828889.259,4754348.235,20.047,-12.069,0.000,132,133
+L67,4152566.824,828881.790,4754349.792,12.688,-9.991,0.000,134,135
+L68,4152571.362,828847.816,4754350.762,-21.600,-9.667,0.000,136,137
+L69,4152570.313,828844.937,4754352.127,-24.334,-7.723,0.000,138,139
+L70,4152563.809,828864.872,4754354.996,-3.755,-2.779,0.000,140,141
+L71,4152554.148,828851.004,4754365.696,-16.373,12.743,0.000,142,143
+L72,4152569.052,828874.859,4754348.824,5.537,-11.666,0.000,144,145
+L73,4152550.380,828878.773,4754364.956,11.659,12.556,0.000,146,147
+L74,4152560.830,828884.852,4754354.703,16.447,-2.555,0.000,148,149
+L75,4152546.162,828890.473,4754366.998,23.785,15.993,0.000,150,151
+L76,4152564.934,828859.806,4754354.739,-8.921,-3.330,0.000,152,153
+L77,4152573.132,828871.261,4754345.705,1.475,-16.443,0.000,154,155
+L78,4152559.018,828846.239,4754362.043,-21.689,7.129,0.000,156,157
+L79,4152543.445,828862.812,4754373.526,-3.364,24.828,0.000,158,159
+L80,4152549.459,828863.003,4754368.116,-3.894,16.754,0.000,160,161
+L81,4152551.506,828887.364,4754362.675,20.058,9.435,0.000,162,163
+L82,4152550.225,828872.187,4754366.070,5.136,14.002,0.000,164,165
+L83,4152560.148,828864.056,4754358.393,-4.127,2.267,0.000,166,167
+L84,4152580.318,828871.996,4754339.166,1.345,-26.186,0.000,168,169
+L85,4152564.442,828870.813,4754353.549,2.070,-4.743,0.000,170,171
+L86,4152565.748,828898.848,4754348.229,29.760,-11.761,0.000,172,173
+L87,4152564.772,828889.798,4754350.442,20.888,-8.755,0.000,174,175
+L88,4152555.078,828863.105,4754363.072,-4.465,9.224,0.000,176,177
+L89,4152537.863,828865.648,4754378.102,0.121,31.756,0.000,178,179
+L90,4152560.459,828857.749,4754359.049,-10.429,3.038,0.000,180,181
+L91,4152578.894,828852.677,4754343.301,-17.673,-20.649,0.000,182,183
+L92,4152542.937,828870.748,4754372.805,4.579,24.014,0.000,184,185
+L93,4152566.050,828862.834,4754353.292,-6.047,-5.391,0.000,186,187
+L94,4152570.334,828861.531,4754349.650,-7.854,-10.873,0.000,188,189
+L95,4152553.621,828877.818,4754362.196,10.323,8.403,0.000,190,191
+H0,4152549.580,828803.784,4754375.705,17.150,21.795,0.000,0,1
+H1,4152552.503,828806.726,4754372.653,19.725,17.335,0.000,2,3
+H2,4152555.427,828809.669,4754369.601,22.300,12.875,0.000,4,5
+H3,4152558.351,828812.611,4754366.549,24.875,8.415,0.000,6,7
+H4,4152561.275,828815.554,4754363.497,27.450,3.955,0.000,8,9
+H5,4152549.254,828796.668,4754377.222,10.115,23.680,0.000,10,11
+H6,4152552.177,828799.610,4754374.170,12.690,19.220,0.000,12,13
+H7,4152555.101,828802.553,4754371.118,15.265,14.760,0.000,14,15
+H8,4152558.025,828805.495,4754368.066,17.840,10.300,0.000,16,17
+H9,4152560.949,828808.438,4754365.014,20.415,5.840,0.000,18,19
+H10,4152563.872,828811.380,4754361.962,22.990,1.380,0.000,20,21
+H11,4152566.796,828814.323,4754358.909,25.565,-3.080,0.000,22,23
+H12,4152548.928,828789.552,4754378.740,3.080,25.565,0.000,24,25
+H13,4152551.851,828792.494,4754375.687,5.655,21.105,0.000,26,27
+H14,4152554.775,828795.437,4754372.635,8.230,16.645,0.000,28,29
+H15,4152557.699,828798.379,4754369.583,10.805,12.185,0.000,30,31
+H16,4152560.623,828801.322,4754366.531,13.380,7.725,0.000,32,33
+H17,4152563.546,828804.264,4754363.479,15.955,3.265,0.000,34,35
+H18,4152566.470,828807.207,4754360.427,18.530,-1.195,0.000,36,37
+H19,4152569.394,828810.149,4754357.374,21.105,-5.655,0.000,38,39
+H20,4152572.318,828813.092,4754354.322,23.680,-10.115,0.000,40,41
+H21,4152548.602,828782.436,4754380.257,-3.955,27.450,0.000,42,43
+H22,4152551.526,828785.378,4754377.204,-1.380,22.990,0.000,44,45
+H23,4152554.449,828788.321,4754374.152,1.195,18.530,0.000,46,47
+H24,4152557.373,828791.263,4754371.100,3.770,14.070,0.000,48,49
+H25,4152560.297,828794.206,4754368.048,6.345,9.610,0.000,50,51
+H26,4152563.220,828797.148,4754364.996,8.920,5.150,0.000,52,53
+H27,4152566.144,828800.091,4754361.944,11.495,0.690,0.000,54,55
+H28,4152569.068,828803.033,4754358.892,14.070,-3.770,0.000,56,57
+H29,4152571.992,828805.976,4754355.839,16.645,-8.230,0.000,58,59
+H30,4152574.915,828808.919,4754352.787,19.220,-12.690,0.000,60,61
+H31,4152577.839,828811.861,4754349.735,21.795,-17.150,0.000,62,63
+H32,4152551.200,828778.262,4754378.722,-8.415,24.875,0.000,64,65
+H33,4152554.123,828781.205,4754375.669,-5.840,20.415,0.000,66,67
+H34,4152557.047,828784.147,4754372.617,-3.265,15.955,0.000,68,69
+H35,4152559.971,828787.090,4754369.565,-0.690,11.495,0.000,70,71
+H36,4152562.894,828790.033,4754366.513,1.885,7.035,0.000,72,73
+H37,4152565.818,828792.975,4754363.461,4.460,2.575,0.000,74,75
+H38,4152568.742,828795.918,4754360.409,7.035,-1.885,0.000,76,77
+H39,4152571.666,828798.860,4754357.357,9.610,-6.345,0.000,78,79
+H40,4152574.589,828801.803,4754354.304,12.185,-10.805,0.000,80,81
+H41,4152577.513,828804.745,4754351.252,14.760,-15.265,0.000,82,83
+H42,4152580.437,828807.688,4754348.200,17.335,-19.725,0.000,84,85
+H43,4152553.797,828774.089,4754377.187,-12.875,22.300,0.000,86,87
+H44,4152556.721,828777.032,4754374.134,-10.300,17.840,0.000,88,89
+H45,4152559.645,828779.974,4754371.082,-7.725,13.380,0.000,90,91
+H46,4152562.569,828782.917,4754368.030,-5.150,8.920,0.000,92,93
+H47,4152565.492,828785.859,4754364.978,-2.575,4.460,0.000,94,95
+H48,4152571.340,828791.744,4754358.874,2.575,-4.460,0.000,96,97
+H49,4152574.263,828794.687,4754355.821,5.150,-8.920,0.000,98,99
+H50,4152577.187,828797.629,4754352.769,7.725,-13.380,0.000,100,101
+H51,4152580.111,828800.572,4754349.717,10.300,-17.840,0.000,102,103
+H52,4152583.035,828803.514,4754346.665,12.875,-22.300,0.000,104,105
+H53,4152556.395,828769.916,4754375.652,-17.335,19.725,0.000,106,107
+H54,4152559.319,828772.858,4754372.599,-14.760,15.265,0.000,108,109
+H55,4152562.243,828775.801,4754369.547,-12.185,10.805,0.000,110,111
+H56,4152565.166,828778.743,4754366.495,-9.610,6.345,0.000,112,113
+H57,4152568.090,828781.686,4754363.443,-7.035,1.885,0.000,114,115
+H58,4152571.014,828784.628,4754360.391,-4.460,-2.575,0.000,116,117
+H59,4152573.938,828787.571,4754357.339,-1.885,-7.035,0.000,118,119
+H60,4152576.861,828790.513,4754354.286,0.690,-11.495,0.000,120,121
+H61,4152579.785,828793.456,4754351.234,3.265,-15.955,0.000,122,123
+H62,4152582.709,828796.398,4754348.182,5.840,-20.415,0.000,124,125
+H63,4152585.632,828799.341,4754345.130,8.415,-24.875,0.000,126,127
+H64,4152558.993,828765.742,4754374.117,-21.795,17.150,0.000,128,129
+H65,4152561.917,828768.685,4754371.064,-19.220,12.690,0.000,130,131
+H66,4152564.840,828771.627,4754368.012,-16.645,8.230,0.000,132,133
+H67,4152567.764,828774.570,4754364.960,-14.070,3.770,0.000,134,135
+H68,4152570.688,828777.512,4754361.908,-11.495,-0.690,0.000,136,137
+H69,4152573.612,828780.455,4754358.856,-8.920,-5.150,0.000,138,139
+H70,4152576.535,828783.397,4754355.804,-6.345,-9.610,0.000,140,141
+H71,4152579.459,828786.340,4754352.751,-3.770,-14.070,0.000,142,143
+H72,4152582.383,828789.282,4754349.699,-1.195,-18.530,0.000,144,145
+H73,4152585.306,828792.225,4754346.647,1.380,-22.990,0.000,146,147
+H74,4152588.230,828795.167,4754343.595,3.955,-27.450,0.000,148,149
+H75,4152564.514,828764.511,4754369.529,-23.680,10.115,0.000,150,151
+H76,4152567.438,828767.454,4754366.477,-21.105,5.655,0.000,152,153
+H77,4152570.362,828770.396,4754363.425,-18.530,1.195,0.000,154,155
+H78,4152573.286,828773.339,4754360.373,-15.955,-3.265,0.000,156,157
+H79,4152576.209,828776.281,4754357.321,-13.380,-7.725,0.000,158,159
+H80,4152579.133,828779.224,4754354.269,-10.805,-12.185,0.000,160,161
+H81,4152582.057,828782.166,4754351.216,-8.230,-16.645,0.000,162,163
+H82,4152584.981,828785.109,4754348.164,-5.655,-21.105,0.000,164,165
+H83,4152587.904,828788.051,4754345.112,-3.080,-25.565,0.000,166,167
+H84,4152570.036,828763.280,4754364.942,-25.565,3.080,0.000,168,169
+H85,4152572.960,828766.223,4754361.890,-22.990,-1.380,0.000,170,171
+H86,4152575.883,828769.165,4754358.838,-20.415,-5.840,0.000,172,173
+H87,4152578.807,828772.108,4754355.786,-17.840,-10.300,0.000,174,175
+H88,4152581.731,828775.050,4754352.734,-15.265,-14.760,0.000,176,177
+H89,4152584.655,828777.993,4754349.681,-12.690,-19.220,0.000,178,179
+H90,4152587.578,828780.935,4754346.629,-10.115,-23.680,0.000,180,181
+H91,4152575.557,828762.049,4754360.355,-27.450,-3.955,0.000,182,183
+H92,4152578.481,828764.992,4754357.303,-24.875,-8.415,0.000,184,185
+H93,4152581.405,828767.934,4754354.251,-22.300,-12.875,0.000,186,187
+H94,4152584.329,828770.877,4754351.198,-19.725,-17.335,0.000,188,189
+H95,4152587.252,828773.820,4754348.146,-17.150,-21.795,0.000,190,191
+CLBA,4152561.241,828868.343,4754356.780,0.000,0.000,0.000,-1,-1
+CHBA,4152568.416,828788.802,4754361.926,0.000,0.000,0.000,-1,-1
diff --git a/MAC/Deployment/data/Coordinates/ETRF_FILES/DE603/de603-antenna-positions-etrs.csv b/MAC/Deployment/data/Coordinates/ETRF_FILES/DE603/de603-antenna-positions-etrs.csv
new file mode 100644
index 0000000000000000000000000000000000000000..1fef929fea28882133a9de8ab9a372a381d03473
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/ETRF_FILES/DE603/de603-antenna-positions-etrs.csv
@@ -0,0 +1,195 @@
+NAME,ETRS-X,ETRS-Y,ETRS-Z,STATION-P,STATION-Q,STATION-R,RCU-X,RCU-Y
+H0,3940273.976,816723.846,4932410.789,3.955,27.450,0.000,0,1
+H1,3940275.409,816728.510,4932409.140,8.415,24.875,0.000,2,3
+H2,3940276.842,816733.174,4932407.491,12.875,22.300,0.000,4,5
+H3,3940278.275,816737.837,4932405.842,17.335,19.725,0.000,6,7
+H4,3940279.708,816742.501,4932404.194,21.795,17.150,0.000,8,9
+H5,3940276.400,816717.054,4932409.770,-3.080,25.565,0.000,10,11
+H6,3940277.833,816721.718,4932408.121,1.380,22.990,0.000,12,13
+H7,3940279.266,816726.382,4932406.472,5.840,20.415,0.000,14,15
+H8,3940280.699,816731.045,4932404.823,10.300,17.840,0.000,16,17
+H9,3940282.132,816735.709,4932403.174,14.760,15.265,0.000,18,19
+H10,3940283.564,816740.373,4932401.526,19.220,12.690,0.000,20,21
+H11,3940284.997,816745.037,4932399.877,23.680,10.115,0.000,22,23
+H12,3940278.824,816710.262,4932408.751,-10.115,23.680,0.000,24,25
+H13,3940280.257,816714.926,4932407.102,-5.655,21.105,0.000,26,27
+H14,3940281.690,816719.590,4932405.453,-1.195,18.530,0.000,28,29
+H15,3940283.123,816724.253,4932403.804,3.265,15.955,0.000,30,31
+H16,3940284.555,816728.917,4932402.155,7.725,13.380,0.000,32,33
+H17,3940285.988,816733.581,4932400.507,12.185,10.805,0.000,34,35
+H18,3940287.421,816738.245,4932398.858,16.645,8.230,0.000,36,37
+H19,3940288.854,816742.908,4932397.209,21.105,5.655,0.000,38,39
+H20,3940290.287,816747.572,4932395.560,25.565,3.080,0.000,40,41
+H21,3940281.248,816703.470,4932407.732,-17.150,21.795,0.000,42,43
+H22,3940282.681,816708.134,4932406.083,-12.690,19.220,0.000,44,45
+H23,3940284.114,816712.798,4932404.434,-8.230,16.645,0.000,46,47
+H24,3940285.546,816717.462,4932402.785,-3.770,14.070,0.000,48,49
+H25,3940286.979,816722.125,4932401.136,0.690,11.495,0.000,50,51
+H26,3940288.412,816726.789,4932399.487,5.150,8.920,0.000,52,53
+H27,3940289.845,816731.453,4932397.839,9.610,6.345,0.000,54,55
+H28,3940291.278,816736.116,4932396.190,14.070,3.770,0.000,56,57
+H29,3940292.711,816740.780,4932394.541,18.530,1.195,0.000,58,59
+H30,3940294.144,816745.444,4932392.892,22.990,-1.380,0.000,60,61
+H31,3940295.577,816750.107,4932391.243,27.450,-3.955,0.000,62,63
+H32,3940285.105,816701.342,4932405.064,-19.725,17.335,0.000,64,65
+H33,3940286.538,816706.006,4932403.415,-15.265,14.760,0.000,66,67
+H34,3940287.970,816710.670,4932401.766,-10.805,12.185,0.000,68,69
+H35,3940289.403,816715.333,4932400.117,-6.345,9.610,0.000,70,71
+H36,3940290.836,816719.997,4932398.468,-1.885,7.035,0.000,72,73
+H37,3940292.269,816724.661,4932396.819,2.575,4.460,0.000,74,75
+H38,3940293.702,816729.324,4932395.171,7.035,1.885,0.000,76,77
+H39,3940295.135,816733.988,4932393.522,11.495,-0.690,0.000,78,79
+H40,3940296.568,816738.652,4932391.873,15.955,-3.265,0.000,80,81
+H41,3940298.000,816743.315,4932390.224,20.415,-5.840,0.000,82,83
+H42,3940299.433,816747.979,4932388.575,24.875,-8.415,0.000,84,85
+H43,3940288.961,816699.214,4932402.396,-22.300,12.875,0.000,86,87
+H44,3940290.394,816703.878,4932400.747,-17.840,10.300,0.000,88,89
+H45,3940291.827,816708.541,4932399.098,-13.380,7.725,0.000,90,91
+H46,3940293.260,816713.205,4932397.449,-8.920,5.150,0.000,92,93
+H47,3940294.693,816717.869,4932395.800,-4.460,2.575,0.000,94,95
+H48,3940297.559,816727.196,4932392.503,4.460,-2.575,0.000,96,97
+H49,3940298.991,816731.860,4932390.854,8.920,-5.150,0.000,98,99
+H50,3940300.424,816736.524,4932389.205,13.380,-7.725,0.000,100,101
+H51,3940301.857,816741.187,4932387.556,17.840,-10.300,0.000,102,103
+H52,3940303.290,816745.851,4932385.907,22.300,-12.875,0.000,104,105
+H53,3940292.818,816697.086,4932399.728,-24.875,8.415,0.000,106,107
+H54,3940294.251,816701.749,4932398.079,-20.415,5.840,0.000,108,109
+H55,3940295.684,816706.413,4932396.430,-15.955,3.265,0.000,110,111
+H56,3940297.117,816711.077,4932394.781,-11.495,0.690,0.000,112,113
+H57,3940298.550,816715.740,4932393.132,-7.035,-1.885,0.000,114,115
+H58,3940299.983,816720.404,4932391.484,-2.575,-4.460,0.000,116,117
+H59,3940301.415,816725.068,4932389.835,1.885,-7.035,0.000,118,119
+H60,3940302.848,816729.732,4932388.186,6.345,-9.610,0.000,120,121
+H61,3940304.281,816734.395,4932386.537,10.805,-12.185,0.000,122,123
+H62,3940305.714,816739.059,4932384.888,15.265,-14.760,0.000,124,125
+H63,3940307.147,816743.723,4932383.239,19.725,-17.335,0.000,126,127
+H64,3940296.675,816694.957,4932397.060,-27.450,3.955,0.000,128,129
+H65,3940298.108,816699.621,4932395.411,-22.990,1.380,0.000,130,131
+H66,3940299.541,816704.285,4932393.762,-18.530,-1.195,0.000,132,133
+H67,3940300.974,816708.949,4932392.113,-14.070,-3.770,0.000,134,135
+H68,3940302.406,816713.612,4932390.465,-9.610,-6.345,0.000,136,137
+H69,3940303.839,816718.276,4932388.816,-5.150,-8.920,0.000,138,139
+H70,3940305.272,816722.940,4932387.167,-0.690,-11.495,0.000,140,141
+H71,3940306.705,816727.603,4932385.518,3.770,-14.070,0.000,142,143
+H72,3940308.138,816732.267,4932383.869,8.230,-16.645,0.000,144,145
+H73,3940309.571,816736.931,4932382.220,12.690,-19.220,0.000,146,147
+H74,3940311.004,816741.594,4932380.571,17.150,-21.795,0.000,148,149
+H75,3940301.965,816697.493,4932392.743,-25.565,-3.080,0.000,150,151
+H76,3940303.397,816702.157,4932391.094,-21.105,-5.655,0.000,152,153
+H77,3940304.830,816706.820,4932389.445,-16.645,-8.230,0.000,154,155
+H78,3940306.263,816711.484,4932387.797,-12.185,-10.805,0.000,156,157
+H79,3940307.696,816716.148,4932386.148,-7.725,-13.380,0.000,158,159
+H80,3940309.129,816720.811,4932384.499,-3.265,-15.955,0.000,160,161
+H81,3940310.562,816725.475,4932382.850,1.195,-18.530,0.000,162,163
+H82,3940311.995,816730.139,4932381.201,5.655,-21.105,0.000,164,165
+H83,3940313.428,816734.802,4932379.552,10.115,-23.680,0.000,166,167
+H84,3940307.254,816700.028,4932388.426,-23.680,-10.115,0.000,168,169
+H85,3940308.687,816704.692,4932386.778,-19.220,-12.690,0.000,170,171
+H86,3940310.120,816709.356,4932385.129,-14.760,-15.265,0.000,172,173
+H87,3940311.553,816714.019,4932383.480,-10.300,-17.840,0.000,174,175
+H88,3940312.986,816718.683,4932381.831,-5.840,-20.415,0.000,176,177
+H89,3940314.419,816723.347,4932380.182,-1.380,-22.990,0.000,178,179
+H90,3940315.851,816728.011,4932378.533,3.080,-25.565,0.000,180,181
+H91,3940312.544,816702.564,4932384.110,-21.795,-17.150,0.000,182,183
+H92,3940313.977,816707.227,4932382.461,-17.335,-19.725,0.000,184,185
+H93,3940315.410,816711.891,4932380.812,-12.875,-22.300,0.000,186,187
+H94,3940316.842,816716.555,4932379.163,-8.415,-24.875,0.000,188,189
+H95,3940318.275,816721.219,4932377.514,-3.955,-27.450,0.000,190,191
+CHBA,3940296.126,816722.532,4932394.152,0.000,0.000,0.000,-1,-1
+L0,3940273.761,816802.363,4932401.485,1.743,14.390,0.001,0,1
+L1,3940276.046,816809.794,4932398.856,8.850,10.284,0.001,2,3
+L2,3940272.191,816805.812,4932402.260,5.356,15.771,0.002,4,5
+L3,3940274.016,816812.232,4932400.101,11.514,12.410,0.001,6,7
+L4,3940301.253,816805.439,4932380.267,1.509,-20.473,-0.001,8,9
+L5,3940302.476,816811.461,4932378.613,7.343,-23.015,-0.002,10,11
+L6,3940306.349,816799.681,4932377.096,-4.819,-25.871,-0.003,12,13
+L7,3940308.140,816803.916,4932375.228,-0.828,-28.821,-0.002,14,15
+L8,3940268.819,816802.894,4932405.168,2.862,20.474,0.002,16,17
+L9,3940265.523,816797.567,4932408.310,-2.034,25.488,0.002,18,19
+L10,3940262.531,816799.307,4932410.369,0.052,28.933,0.003,20,21
+L11,3940262.080,816803.434,4932410.213,4.205,28.802,0.002,22,23
+L12,3940288.986,816802.739,4932389.894,0.295,-4.694,-0.001,24,25
+L13,3940285.252,816806.360,4932392.289,4.338,-0.639,0.000,26,27
+L14,3940286.343,816809.371,4932391.099,7.198,-2.508,0.000,28,29
+L15,3940290.179,816808.795,4932388.259,6.167,-7.204,-0.001,30,31
+L16,3940285.025,816812.605,4932391.708,10.567,-1.406,0.000,32,33
+L17,3940281.021,816813.447,4932394.643,11.882,3.454,0.000,34,35
+L18,3940285.344,816819.788,4932390.600,17.662,-3.014,-0.001,36,37
+L19,3940281.721,816821.285,4932393.167,19.582,1.261,0.000,38,39
+L20,3940287.697,816780.787,4932393.519,-21.351,0.611,0.001,40,41
+L21,3940280.815,816778.785,4932398.979,-22.515,9.546,0.002,42,43
+L22,3940288.684,816771.543,4932393.885,-30.649,0.934,0.001,44,45
+L23,3940279.064,816773.646,4932400.926,-27.409,12.598,0.002,46,47
+L24,3940276.414,816795.186,4932400.339,-5.701,12.284,0.002,48,49
+L25,3940273.208,816796.520,4932402.609,-3.993,16.064,0.002,50,51
+L26,3940275.914,816791.031,4932401.218,-9.768,13.607,0.001,52,53
+L27,3940273.983,816787.954,4932403.054,-12.592,16.537,0.002,54,55
+L28,3940298.223,816788.311,4932384.630,-15.138,-13.805,-0.001,56,57
+L29,3940301.269,816787.137,4932382.461,-16.669,-17.413,-0.001,58,59
+L30,3940296.395,816779.776,4932387.045,-23.395,-10.085,0.000,60,61
+L31,3940301.084,816778.094,4932383.693,-25.627,-15.659,0.000,62,63
+L32,3940287.543,816822.344,4932388.624,19.937,-6.191,-0.001,64,65
+L33,3940292.765,816822.581,4932384.636,19.548,-12.755,-0.001,66,67
+L34,3940295.012,816831.819,4932381.818,28.453,-17.117,-0.002,68,69
+L35,3940289.821,816832.307,4932385.695,29.559,-10.714,-0.002,70,71
+L36,3940290.156,816797.985,4932389.581,-4.566,-5.355,0.000,72,73
+L37,3940293.044,816802.152,4932386.888,-0.773,-9.665,-0.001,74,75
+L38,3940292.703,816795.347,4932387.967,-7.490,-8.093,-0.001,76,77
+L39,3940295.021,816797.435,4932385.957,-5.694,-11.341,-0.001,78,79
+L40,3940267.093,816815.259,4932404.986,15.348,20.549,0.002,80,81
+L41,3940272.848,816821.731,4932399.841,21.087,12.270,0.000,82,83
+L42,3940265.594,816823.106,4932405.176,23.320,21.101,0.001,84,85
+L43,3940272.353,816828.730,4932399.373,28.097,11.711,0.001,86,87
+L44,3940285.979,816794.463,4932393.173,-7.564,0.456,0.001,88,89
+L45,3940288.302,816791.499,4932391.768,-10.785,-1.948,0.000,90,91
+L46,3940282.864,816791.962,4932395.836,-9.675,4.768,0.001,92,93
+L47,3940286.192,816788.474,4932393.733,-13.537,1.197,0.000,94,95
+L48,3940297.163,816810.417,4932382.767,6.942,-16.202,-0.002,96,97
+L49,3940292.615,816783.175,4932389.501,-19.568,-5.935,0.000,98,99
+L50,3940304.688,816815.368,4932376.464,10.958,-26.436,-0.003,100,101
+L51,3940294.470,816819.683,4932383.692,16.466,-14.397,-0.002,102,103
+L52,3940273.767,816782.273,4932403.902,-18.208,17.763,0.001,104,105
+L53,3940294.763,816772.056,4932389.214,-30.867,-6.747,0.001,106,107
+L54,3940299.362,816823.684,4932379.500,19.854,-21.182,-0.003,108,109
+L55,3940291.059,816804.750,4932388.080,2.044,-7.622,0.000,110,111
+L56,3940262.484,816811.883,4932408.888,12.547,26.875,0.002,112,113
+L57,3940279.005,816783.967,4932399.727,-17.153,10.935,0.002,114,115
+L58,3940270.116,816796.053,4932405.009,-4.087,20.005,0.001,116,117
+L59,3940306.494,816784.632,4932378.801,-19.781,-23.519,-0.002,118,119
+L60,3940292.685,816787.237,4932388.959,-15.542,-6.706,0.000,120,121
+L61,3940281.726,816785.506,4932397.477,-15.950,7.276,0.001,122,123
+L62,3940274.990,816818.187,4932398.645,17.311,10.191,0.001,124,125
+L63,3940281.801,816807.553,4932394.762,5.936,3.472,0.000,126,127
+L64,3940296.888,816804.552,4932383.683,1.150,-14.871,-0.002,128,129
+L65,3940278.951,816801.875,4932397.608,0.638,7.988,0.001,130,131
+L66,3940302.670,816792.475,4932380.755,-11.535,-20.062,-0.002,132,133
+L67,3940296.577,816793.574,4932385.243,-9.715,-12.635,-0.001,134,135
+L68,3940269.694,816789.455,4932406.125,-10.589,21.643,0.002,136,137
+L69,3940267.242,816791.021,4932407.796,-8.740,24.443,0.003,138,139
+L70,3940282.549,816798.564,4932395.279,-3.081,4.050,0.001,140,141
+L71,3940270.178,816812.250,4932403.010,11.991,17.202,0.002,142,143
+L72,3940291.251,816790.994,4932389.593,-11.640,-5.547,0.000,144,145
+L73,3940292.144,816815.694,4932385.937,12.783,-10.820,-0.001,146,147
+L74,3940298.322,816801.399,4932382.976,-2.153,-16.132,-0.002,148,149
+L75,3940301.080,816820.656,4932378.563,16.641,-22.818,-0.002,150,151
+L76,3940278.596,816797.351,4932398.423,-3.812,9.193,0.001,152,153
+L77,3940288.841,816785.754,4932392.052,-16.555,-1.654,0.000,154,155
+L78,3940266.922,816806.021,4932406.230,6.194,22.318,0.002,156,157
+L79,3940278.414,816825.861,4932395.123,24.522,4.622,0.000,158,159
+L80,3940279.297,816817.824,4932395.422,16.435,4.871,0.000,160,161
+L81,3940299.219,816813.700,4932380.813,9.956,-19.323,-0.002,162,163
+L82,3940286.807,816816.276,4932389.914,13.999,-4.250,-0.001,164,165
+L83,3940281.446,816803.495,4932395.520,1.948,4.598,0.000,166,167
+L84,3940290.307,816776.122,4932392.102,-26.296,-1.865,0.000,168,169
+L85,3940287.424,816797.379,4932391.725,-4.841,-1.841,0.000,170,171
+L86,3940310.221,816794.036,4932374.841,-10.888,-29.758,-0.002,172,173
+L87,3940302.796,816795.854,4932380.253,-8.195,-20.787,-0.001,174,175
+L88,3940280.063,816810.317,4932395.747,8.888,5.178,0.001,176,177
+L89,3940280.025,816833.150,4932393.022,31.568,1.382,-0.001,178,179
+L90,3940276.391,816803.441,4932399.361,2.499,10.923,0.001,180,181
+L91,3940274.534,816779.125,4932403.701,-21.426,17.335,0.002,182,183
+L92,3940284.760,816826.085,4932390.283,23.985,-3.344,-0.001,184,185
+L93,3940281.177,816795.688,4932396.666,-5.773,6.248,0.001,186,187
+L94,3940280.644,816790.045,4932397.751,-11.313,7.864,0.001,188,189
+L95,3940291.767,816811.421,4932386.738,8.584,-9.630,-0.001,190,191
+CLBA,3940285.041,816801.792,4932393.000,0.000,0.000,0.000,-1,-1
diff --git a/MAC/Deployment/data/Coordinates/ETRF_FILES/Potsdam/de604-antenna-positions-etrs.csv b/MAC/Deployment/data/Coordinates/ETRF_FILES/DE604/de604-antenna-positions-etrs.csv
similarity index 100%
rename from MAC/Deployment/data/Coordinates/ETRF_FILES/Potsdam/de604-antenna-positions-etrs.csv
rename to MAC/Deployment/data/Coordinates/ETRF_FILES/DE604/de604-antenna-positions-etrs.csv
diff --git a/MAC/Deployment/data/Coordinates/ETRF_FILES/DE605/de605-antenna-positions-etrs.csv b/MAC/Deployment/data/Coordinates/ETRF_FILES/DE605/de605-antenna-positions-etrs.csv
new file mode 100644
index 0000000000000000000000000000000000000000..88781f19524b78ae38a2d4e72f18f0cf93b4646c
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/ETRF_FILES/DE605/de605-antenna-positions-etrs.csv
@@ -0,0 +1,195 @@
+NAME,ETRS-X,ETRS-Y,ETRS-Z,STATION-P,STATION-Q,STATION-R,RCU-X,RCU-Y
+L0,4005672.111,450976.288,4926464.967,9.042,10.853,0.000,0,1
+L1,4005677.298,450980.791,4926460.475,12.893,3.605,0.000,2,3
+L2,4005672.292,450980.133,4926464.576,12.839,10.110,0.000,4,5
+L3,4005676.647,450984.121,4926460.791,16.278,3.997,0.000,6,7
+L4,4005696.723,450960.451,4926446.024,-9.632,-18.587,0.000,8,9
+L5,4005700.395,450964.519,4926442.787,-6.031,-23.835,0.000,10,11
+L6,4005698.516,450952.384,4926445.084,-17.858,-19.812,0.000,12,13
+L7,4005701.885,450954.624,4926442.211,-16.037,-24.428,0.000,14,15
+L8,4005668.161,450980.013,4926467.932,13.214,15.420,0.000,16,17
+L9,4005663.040,450977.892,4926472.219,11.720,22.267,0.000,18,19
+L10,4005661.269,450981.299,4926473.437,15.316,24.083,0.000,20,21
+L11,4005662.695,450984.945,4926472.049,18.766,21.771,0.000,22,23
+L12,4005685.160,450966.440,4926455.016,-2.300,-4.563,0.000,24,25
+L13,4005683.584,450971.868,4926455.948,3.279,-3.265,0.000,26,27
+L14,4005685.827,450973.582,4926454.021,4.713,-6.367,0.000,28,29
+L15,4005688.821,450970.558,4926451.786,1.351,-9.803,0.000,30,31
+L16,4005686.127,450977.083,4926453.554,8.154,-7.218,0.000,32,33
+L17,4005683.108,450980.436,4926455.788,11.845,-3.794,0.000,34,35
+L18,4005689.541,450982.695,4926450.428,13.319,-12.340,0.000,36,37
+L19,4005687.131,450986.325,4926452.151,17.213,-9.734,0.000,38,39
+L20,4005674.459,450949.499,4926464.771,-17.845,11.407,0.000,40,41
+L21,4005667.759,450952.465,4926470.015,-14.098,19.601,0.000,42,43
+L22,4005671.248,450941.345,4926467.895,-25.559,16.608,0.000,44,45
+L23,4005664.028,450949.466,4926473.230,-16.630,24.782,0.000,46,47
+L24,4005671.214,450968.700,4926466.179,1.613,13.013,0.000,48,49
+L25,4005669.084,450971.919,4926467.700,5.065,15.314,0.000,50,51
+L26,4005668.972,450965.663,4926468.189,-1.135,16.290,0.000,52,53
+L27,4005665.992,450964.456,4926470.683,-1.977,20.271,0.000,54,55
+L28,4005686.661,450948.583,4926454.938,-20.215,-4.111,0.000,56,57
+L29,4005688.726,450945.599,4926453.454,-23.425,-6.360,0.000,58,59
+L30,4005681.378,450942.881,4926459.584,-25.246,3.419,0.000,60,61
+L31,4005684.610,450938.390,4926457.251,-30.093,-0.125,0.000,62,63
+L32,4005692.521,450983.301,4926447.973,13.564,-16.241,0.000,64,65
+L33,4005697.045,450980.011,4926444.516,9.756,-21.602,0.000,66,67
+L34,4005702.990,450986.005,4926439.314,14.997,-30.019,0.000,68,69
+L35,4005698.811,450989.862,4926442.456,19.328,-25.176,0.000,70,71
+L36,4005684.069,450961.806,4926456.197,-6.772,-2.547,0.000,72,73
+L37,4005688.337,450963.260,4926452.643,-5.839,-8.212,0.000,74,75
+L38,4005685.071,450957.970,4926455.629,-10.702,-3.321,0.000,76,77
+L39,4005687.946,450958.116,4926453.288,-10.901,-7.026,0.000,78,79
+L40,4005672.113,450991.191,4926464.016,23.843,8.868,0.000,80,81
+L41,4005679.817,450992.603,4926457.680,24.323,-1.195,0.000,82,83
+L42,4005674.280,450998.554,4926461.789,30.896,5.111,0.000,84,85
+L43,4005682.461,450998.608,4926455.153,29.971,-5.383,0.000,86,87
+L44,4005678.992,450961.735,4926460.316,-6.235,3.969,0.000,88,89
+L45,4005679.661,450957.783,4926460.026,-10.240,3.638,0.000,90,91
+L46,4005675.261,450961.784,4926463.338,-5.740,8.745,0.000,92,93
+L47,4005676.551,450956.736,4926462.614,-10.908,7.763,0.000,94,95
+L48,4005695.442,450967.216,4926446.631,-2.760,-17.845,0.000,96,97
+L49,4005679.668,450948.156,4926460.635,-19.802,4.910,0.000,98,99
+L50,4005703.978,450966.213,4926439.775,-4.778,-28.652,0.000,100,101
+L51,4005697.219,450976.524,4926444.597,6.272,-21.361,0.000,102,103
+L52,4005663.322,450959.993,4926473.131,-6.090,24.286,0.000,104,105
+L53,4005676.617,450937.707,4926463.775,-29.814,10.211,0.000,106,107
+L54,4005703.110,450976.507,4926439.822,5.550,-28.910,0.000,108,109
+L55,4005687.794,450966.689,4926452.865,-2.368,-7.972,0.000,110,111
+L56,4005666.734,450991.528,4926468.354,24.821,15.717,0.000,112,113
+L57,4005668.496,450957.875,4926469.072,-8.813,17.937,0.000,114,115
+L58,4005666.263,450973.601,4926469.879,7.073,18.706,0.000,116,117
+L59,4005692.050,450940.085,4926451.111,-29.300,-9.888,0.000,118,119
+L60,4005681.505,450951.404,4926458.938,-16.796,2.123,0.000,120,121
+L61,4005671.473,450957.308,4926466.695,-9.732,14.196,0.000,122,123
+L62,4005680.077,450988.301,4926457.743,20.019,-0.956,0.000,124,125
+L63,4005681.187,450975.136,4926457.683,6.812,-0.627,0.000,126,127
+L64,4005692.641,450962.643,4926449.194,-6.967,-13.646,0.000,128,129
+L65,4005676.290,450972.432,4926461.825,4.712,6.010,0.000,130,131
+L66,4005692.248,450948.993,4926450.383,-20.476,-11.326,0.000,132,133
+L67,4005687.573,450953.948,4926453.857,-14.996,-5.993,0.000,134,135
+L68,4005663.018,450968.533,4926472.834,2.428,23.540,0.000,136,137
+L69,4005661.628,450971.438,4926473.775,5.479,24.935,0.000,138,139
+L70,4005677.886,450967.347,4926460.856,-0.529,4.641,0.000,140,141
+L71,4005673.407,450986.694,4926463.253,19.222,7.808,0.000,142,143
+L72,4005681.936,450955.407,4926458.334,-12.872,1.038,0.000,144,145
+L73,4005693.504,450974.841,4926447.716,5.045,-16.375,0.000,146,147
+L74,4005692.475,450959.130,4926449.552,-10.436,-12.966,0.000,148,149
+L75,4005703.238,450972.906,4926439.948,1.958,-28.595,0.000,150,151
+L76,4005674.008,450969.000,4926463.894,1.577,9.391,0.000,152,153
+L77,4005677.602,450952.764,4926462.015,-14.978,6.944,0.000,154,155
+L78,4005667.924,450983.815,4926467.882,17.018,15.218,0.000,156,157
+L79,4005686.335,450992.241,4926452.419,23.184,-9.501,0.000,158,159
+L80,4005683.564,450985.133,4926455.118,16.456,-5.004,0.000,160,161
+L81,4005698.619,450968.507,4926443.973,-1.858,-22.089,0.000,162,163
+L82,4005689.242,450978.872,4926450.914,9.558,-11.449,0.000,164,165
+L83,4005679.110,450972.082,4926459.561,4.027,2.441,0.000,166,167
+L84,4005674.626,450943.976,4926464.988,-23.350,11.928,0.000,168,169
+L85,4005681.492,450963.136,4926458.201,-5.143,0.579,0.000,170,171
+L86,4005699.322,450945.224,4926444.888,-25.066,-19.892,0.000,172,173
+L87,4005693.833,450951.650,4926448.928,-18.027,-13.712,0.000,174,175
+L88,4005680.926,450978.536,4926457.677,10.220,-0.745,0.000,176,177
+L89,4005690.889,450997.076,4926448.418,27.441,-15.982,0.000,178,179
+L90,4005674.808,450975.409,4926462.837,7.846,7.513,0.000,180,181
+L91,4005662.593,450956.929,4926473.918,-9.046,25.629,0.000,182,183
+L92,4005691.804,450988.191,4926448.243,18.507,-15.973,0.000,184,185
+L93,4005675.465,450965.932,4926462.909,-1.645,7.932,0.000,186,187
+L94,4005672.544,450961.709,4926465.546,-5.489,12.238,0.000,188,189
+L95,4005691.315,450971.628,4926449.696,2.116,-13.142,0.000,190,191
+H0,4005697.781,451037.000,4926440.285,11.368,25.297,0.000,0,1
+H1,4005700.266,451040.902,4926438.022,14.946,21.592,0.000,2,3
+H2,4005702.752,451044.804,4926435.758,18.523,17.887,0.000,4,5
+H3,4005705.237,451048.705,4926433.495,22.100,14.183,0.000,6,7
+H4,4005707.723,451052.607,4926431.231,25.678,10.478,0.000,8,9
+H5,4005698.435,451029.747,4926440.218,4.086,25.424,0.000,10,11
+H6,4005700.920,451033.648,4926437.954,7.663,21.719,0.000,12,13
+H7,4005703.405,451037.550,4926435.691,11.241,18.015,0.000,14,15
+H8,4005705.891,451041.451,4926433.427,14.818,14.310,0.000,16,17
+H9,4005708.376,451045.353,4926431.163,18.396,10.605,0.000,18,19
+H10,4005710.861,451049.254,4926428.900,21.973,6.901,0.000,20,21
+H11,4005713.347,451053.157,4926426.636,25.551,3.196,0.000,22,23
+H12,4005699.089,451022.494,4926440.150,-3.196,25.551,0.000,24,25
+H13,4005701.574,451026.395,4926437.886,0.381,21.846,0.000,26,27
+H14,4005704.059,451030.297,4926435.623,3.959,18.142,0.000,28,29
+H15,4005706.545,451034.198,4926433.359,7.536,14.437,0.000,30,31
+H16,4005709.030,451038.100,4926431.096,11.114,10.732,0.000,32,33
+H17,4005711.515,451042.001,4926428.833,14.691,7.028,0.000,34,35
+H18,4005714.001,451045.903,4926426.569,18.269,3.323,0.000,36,37
+H19,4005716.485,451049.804,4926424.306,21.846,-0.381,0.000,38,39
+H20,4005718.971,451053.706,4926422.042,25.424,-4.086,0.000,40,41
+H21,4005699.742,451015.240,4926440.083,-10.478,25.678,0.000,42,43
+H22,4005702.228,451019.141,4926437.819,-6.901,21.973,0.000,44,45
+H23,4005704.713,451023.043,4926435.556,-3.323,18.269,0.000,46,47
+H24,4005707.198,451026.944,4926433.292,0.254,14.564,0.000,48,49
+H25,4005709.683,451030.846,4926431.029,3.832,10.860,0.000,50,51
+H26,4005712.169,451034.748,4926428.765,7.409,7.155,0.000,52,53
+H27,4005714.654,451038.650,4926426.501,10.987,3.450,0.000,54,55
+H28,4005717.139,451042.551,4926424.238,14.564,-0.254,0.000,56,57
+H29,4005719.625,451046.453,4926421.974,18.142,-3.959,0.000,58,59
+H30,4005722.110,451050.354,4926419.711,21.719,-7.663,0.000,60,61
+H31,4005724.595,451054.256,4926417.447,25.297,-11.368,0.000,62,63
+H32,4005702.882,451011.888,4926437.751,-14.183,22.100,0.000,64,65
+H33,4005705.367,451015.790,4926435.488,-10.605,18.396,0.000,66,67
+H34,4005707.852,451019.691,4926433.224,-7.028,14.691,0.000,68,69
+H35,4005710.337,451023.593,4926430.961,-3.450,10.987,0.000,70,71
+H36,4005712.823,451027.494,4926428.697,0.127,7.282,0.000,72,73
+H37,4005715.308,451031.396,4926426.434,3.705,3.577,0.000,74,75
+H38,4005717.793,451035.297,4926424.171,7.282,-0.127,0.000,76,77
+H39,4005720.279,451039.200,4926421.907,10.860,-3.832,0.000,78,79
+H40,4005722.764,451043.101,4926419.644,14.437,-7.536,0.000,80,81
+H41,4005725.249,451047.003,4926417.380,18.015,-11.241,0.000,82,83
+H42,4005727.735,451050.904,4926415.116,21.592,-14.946,0.000,84,85
+H43,4005706.021,451008.537,4926435.421,-17.887,18.523,0.000,86,87
+H44,4005708.506,451012.438,4926433.157,-14.310,14.818,0.000,88,89
+H45,4005710.991,451016.340,4926430.894,-10.732,11.114,0.000,90,91
+H46,4005713.477,451020.241,4926428.630,-7.155,7.409,0.000,92,93
+H47,4005715.961,451024.143,4926426.367,-3.577,3.705,0.000,94,95
+H48,4005720.933,451031.945,4926421.839,3.577,-3.705,0.000,96,97
+H49,4005723.417,451035.847,4926419.576,7.155,-7.409,0.000,98,99
+H50,4005725.903,451039.748,4926417.312,10.732,-11.114,0.000,100,101
+H51,4005728.388,451043.650,4926415.049,14.310,-14.818,0.000,102,103
+H52,4005730.873,451047.551,4926412.785,17.887,-18.523,0.000,104,105
+H53,4005709.159,451005.184,4926433.090,-21.592,14.946,0.000,106,107
+H54,4005711.645,451009.085,4926430.826,-18.015,11.241,0.000,108,109
+H55,4005714.130,451012.987,4926428.562,-14.437,7.536,0.000,110,111
+H56,4005716.615,451016.888,4926426.299,-10.860,3.832,0.000,112,113
+H57,4005719.101,451020.791,4926424.035,-7.282,0.127,0.000,114,115
+H58,4005721.586,451024.692,4926421.772,-3.705,-3.577,0.000,116,117
+H59,4005724.071,451028.594,4926419.509,-0.127,-7.282,0.000,118,119
+H60,4005726.557,451032.495,4926417.245,3.450,-10.987,0.000,120,121
+H61,4005729.042,451036.397,4926414.982,7.028,-14.691,0.000,122,123
+H62,4005731.527,451040.298,4926412.718,10.605,-18.396,0.000,124,125
+H63,4005734.012,451044.200,4926410.455,14.183,-22.100,0.000,126,127
+H64,4005712.299,451001.832,4926430.759,-25.297,11.368,0.000,128,129
+H65,4005714.784,451005.734,4926428.495,-21.719,7.663,0.000,130,131
+H66,4005717.269,451009.635,4926426.232,-18.142,3.959,0.000,132,133
+H67,4005719.755,451013.537,4926423.968,-14.564,0.254,0.000,134,135
+H68,4005722.240,451017.438,4926421.705,-10.987,-3.450,0.000,136,137
+H69,4005724.725,451021.340,4926419.441,-7.409,-7.155,0.000,138,139
+H70,4005727.211,451025.242,4926417.177,-3.832,-10.860,0.000,140,141
+H71,4005729.696,451029.144,4926414.914,-0.254,-14.564,0.000,142,143
+H72,4005732.181,451033.045,4926412.650,3.323,-18.269,0.000,144,145
+H73,4005734.666,451036.947,4926410.387,6.901,-21.973,0.000,146,147
+H74,4005737.152,451040.848,4926408.123,10.478,-25.678,0.000,148,149
+H75,4005717.923,451002.382,4926426.164,-25.424,4.086,0.000,150,151
+H76,4005720.409,451006.284,4926423.900,-21.846,0.381,0.000,152,153
+H77,4005722.893,451010.185,4926421.637,-18.269,-3.323,0.000,154,155
+H78,4005725.379,451014.087,4926419.373,-14.691,-7.028,0.000,156,157
+H79,4005727.864,451017.988,4926417.110,-11.114,-10.732,0.000,158,159
+H80,4005730.349,451021.890,4926414.847,-7.536,-14.437,0.000,160,161
+H81,4005732.835,451025.791,4926412.583,-3.959,-18.142,0.000,162,163
+H82,4005735.320,451029.693,4926410.320,-0.381,-21.846,0.000,164,165
+H83,4005737.805,451033.594,4926408.056,3.196,-25.551,0.000,166,167
+H84,4005723.547,451002.931,4926421.570,-25.551,-3.196,0.000,168,169
+H85,4005726.033,451006.834,4926419.306,-21.973,-6.901,0.000,170,171
+H86,4005728.518,451010.735,4926417.043,-18.396,-10.605,0.000,172,173
+H87,4005731.003,451014.637,4926414.779,-14.818,-14.310,0.000,174,175
+H88,4005733.489,451018.538,4926412.515,-11.241,-18.015,0.000,176,177
+H89,4005735.974,451022.440,4926410.252,-7.663,-21.719,0.000,178,179
+H90,4005738.459,451026.341,4926407.988,-4.086,-25.424,0.000,180,181
+H91,4005729.171,451003.481,4926416.975,-25.678,-10.478,0.000,182,183
+H92,4005731.657,451007.383,4926414.711,-22.100,-14.183,0.000,184,185
+H93,4005734.142,451011.284,4926412.448,-18.523,-17.887,0.000,186,187
+H94,4005736.628,451015.186,4926410.184,-14.946,-21.592,0.000,188,189
+H95,4005739.113,451019.088,4926407.921,-11.368,-25.297,0.000,190,191
+CLBA,4005718.447,451028.044,4926424.103,0.000,0.000,0.000,-1,-1
+CHBA,4005681.407,450968.304,4926457.940,0.000,0.000,0.000,-1,-1
diff --git a/MAC/Deployment/data/Coordinates/ETRF_FILES/Nancay/fr606-wiring-etrs.csv b/MAC/Deployment/data/Coordinates/ETRF_FILES/FR606/fr606-wiring-etrs.csv
similarity index 100%
rename from MAC/Deployment/data/Coordinates/ETRF_FILES/Nancay/fr606-wiring-etrs.csv
rename to MAC/Deployment/data/Coordinates/ETRF_FILES/FR606/fr606-wiring-etrs.csv
diff --git a/MAC/Deployment/data/Coordinates/ETRF_FILES/RS406/rs406-antenna-positions-etrs.csv b/MAC/Deployment/data/Coordinates/ETRF_FILES/RS406/rs406-antenna-positions-etrs.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ad663c4c71744dc7e964c9b86ee0f1aa9e7a43eb
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/ETRF_FILES/RS406/rs406-antenna-positions-etrs.csv
@@ -0,0 +1,147 @@
+NAME,ETRS-X,ETRS-Y,ETRS-Z,STATION-P,STATION-Q,STATION-R,RCU-X,RCU-Y
+L0,3818468.029,451974.278,5071790.337,0.000,0.000,0.000,0,1
+L1,3818465.996,451974.033,5071791.857,0.000,2.550,0.000,2,3
+L2,3818466.676,451976.381,5071791.131,2.250,1.350,0.000,4,5
+L3,3818468.828,451976.640,5071789.521,2.250,-1.350,0.000,6,7
+L4,3818470.062,451974.523,5071788.817,0.000,-2.550,0.000,8,9
+L5,3818469.382,451972.175,5071789.543,-2.250,-1.350,0.000,10,11
+L6,3818467.230,451971.916,5071791.153,-2.250,1.350,0.000,12,13
+L7,3818465.466,451969.628,5071792.672,-4.310,3.881,0.000,14,15
+L8,3818463.550,451972.926,5071793.765,-0.807,5.744,0.000,16,17
+L9,3818463.730,451976.856,5071793.255,3.074,4.919,0.000,18,19
+L10,3818465.921,451979.580,5071791.379,5.516,1.792,0.000,20,21
+L11,3818469.099,451979.824,5071789.016,5.378,-2.173,0.000,22,23
+L12,3818471.775,451977.472,5071787.271,2.723,-5.121,0.000,24,25
+L13,3818472.699,451973.626,5071786.960,-1.206,-5.673,0.000,26,27
+L14,3818471.438,451970.086,5071788.230,-4.570,-3.571,0.000,28,29
+L15,3818468.582,451968.507,5071790.485,-5.796,0.202,0.000,30,31
+L16,3818468.261,451964.982,5071791.060,-9.257,1.139,0.000,32,33
+L17,3818465.311,451965.219,5071793.210,-8.669,4.749,0.000,34,35
+L18,3818461.773,451967.933,5071795.555,-5.551,8.707,0.000,36,37
+L19,3818459.884,451974.924,5071796.273,1.616,9.969,0.000,38,39
+L20,3818460.266,451978.076,5071795.688,4.699,9.013,0.000,40,41
+L21,3818462.100,451981.573,5071794.001,7.952,6.210,0.000,42,43
+L22,3818465.261,451983.009,5071791.535,9.000,2.082,0.000,44,45
+L23,3818469.933,451982.773,5071788.117,8.206,-3.657,0.000,46,47
+L24,3818473.587,451980.982,5071785.599,5.991,-7.899,0.000,48,49
+L25,3818475.642,451977.286,5071784.441,2.076,-9.872,0.000,50,51
+L26,3818475.533,451973.369,5071784.898,-1.800,-9.137,0.000,52,53
+L27,3818474.150,451968.951,5071786.342,-6.021,-6.749,0.000,54,55
+L28,3818471.450,451965.906,5071788.624,-8.721,-2.944,0.000,56,57
+L29,3818467.266,451960.081,5071792.265,-14.004,3.121,0.000,58,59
+L30,3818464.197,451960.608,5071794.474,-13.114,6.834,0.000,60,61
+L31,3818462.167,451962.594,5071795.778,-10.899,9.038,0.000,62,63
+L32,3818458.414,451969.325,5071797.894,-3.767,12.645,0.000,64,65
+L33,3818456.307,451970.930,5071799.292,-1.922,15.004,0.000,66,67
+L34,3818457.588,451978.128,5071797.656,5.071,12.316,0.000,68,69
+L35,3818459.441,451982.504,5071795.870,9.194,9.354,0.000,70,71
+L36,3818461.187,451987.211,5071794.131,13.659,6.474,0.000,72,73
+L37,3818463.895,451987.000,5071792.158,13.125,3.159,0.000,74,75
+L38,3818467.702,451987.281,5071789.327,12.949,-1.590,0.000,76,77
+L39,3818473.221,451985.408,5071785.443,10.429,-8.125,0.000,78,79
+L40,3818475.275,451984.132,5071784.053,8.917,-10.468,0.000,80,81
+L41,3818477.602,451979.508,5071782.784,4.047,-12.635,0.000,82,83
+L42,3818479.970,451976.419,5071781.337,0.697,-15.089,0.000,84,85
+L43,3818478.473,451967.893,5071783.260,-7.589,-11.931,0.000,86,87
+L44,3818476.629,451964.775,5071784.918,-10.464,-9.173,0.000,88,89
+L45,3818473.489,451961.150,5071787.579,-13.687,-4.736,0.000,90,91
+L46,3818459.207,451921.243,5071801.936,-51.600,19.040,0.000,92,93
+L47,3818424.574,451988.330,5071820.986,19.150,51.560,0.000,94,95
+L48,3818472.439,451956.945,5071788.757,-17.736,-2.793,0.000,1,0
+L49,3818471.305,451954.304,5071789.846,-20.223,-0.986,0.000,3,2
+L50,3818458.989,451957.957,5071798.564,-15.123,13.678,0.000,5,4
+L51,3818452.259,451972.154,5071802.154,-0.222,19.819,0.000,7,6
+L52,3818451.504,451977.025,5071802.242,4.704,20.005,0.000,9,8
+L53,3818456.746,451986.860,5071797.435,13.842,12.017,0.000,11,10
+L54,3818466.332,451992.095,5071789.873,17.892,-0.635,0.000,13,12
+L55,3818472.573,451993.520,5071785.139,18.561,-8.569,0.000,15,14
+L56,3818480.578,451982.537,5071780.301,6.699,-16.779,0.000,17,16
+L57,3818483.955,451975.313,5071778.509,-0.877,-19.845,0.000,19,18
+L58,3818481.888,451965.887,5071780.938,-9.989,-15.844,0.000,21,20
+L59,3818483.823,451957.953,5071780.277,-18.097,-17.019,0.000,23,22
+L60,3818475.496,451950.652,5071787.111,-24.350,-5.606,0.000,25,24
+L61,3818465.229,451949.447,5071794.788,-24.318,7.270,0.000,27,26
+L62,3818460.298,451951.188,5071798.252,-22.000,13.099,0.000,29,28
+L63,3818454.062,451954.992,5071802.478,-17.477,20.223,0.000,31,30
+L64,3818448.962,451971.739,5071804.623,-0.240,23.959,0.000,33,32
+L65,3818448.573,451979.689,5071804.144,7.700,23.220,0.000,35,34
+L66,3818452.134,451992.517,5071800.287,20.010,16.850,0.000,37,36
+L67,3818462.165,451998.651,5071792.310,24.900,3.510,0.000,39,38
+L68,3818469.516,452000.040,5071786.763,25.400,-5.790,0.000,41,40
+L69,3818478.199,451994.802,5071780.873,19.160,-15.720,0.000,43,42
+L70,3818488.019,451983.596,5071774.719,6.860,-26.140,0.000,45,44
+L71,3818489.098,451965.908,5071775.627,-10.830,-24.760,0.000,47,46
+L72,3818490.472,451952.164,5071775.937,-24.640,-24.350,0.000,49,48
+L73,3818479.897,451945.854,5071784.332,-29.640,-10.310,0.000,51,50
+L74,3818468.468,451943.097,5071793.013,-31.010,4.240,0.000,53,52
+L75,3818462.019,451943.045,5071797.768,-30.290,12.220,0.000,55,54
+L76,3818449.291,451954.283,5071806.060,-17.610,26.230,0.000,57,56
+L77,3818440.987,451969.630,5071810.698,-1.380,34.140,0.000,59,58
+L78,3818440.924,451981.870,5071809.567,10.780,32.340,0.000,61,60
+L79,3818446.067,451988.342,5071805.157,16.590,24.990,0.000,63,62
+L80,3818450.339,452001.638,5071800.732,29.280,17.670,0.000,65,64
+L81,3818464.466,452008.013,5071789.715,33.920,-0.770,0.000,67,66
+L82,3818471.699,452007.354,5071784.452,32.400,-9.610,0.000,69,68
+L83,3818483.929,452001.565,5071776.003,25.190,-23.840,0.000,71,70
+L84,3818487.458,451994.376,5071774.095,17.630,-27.100,0.000,73,72
+L85,3818494.767,451975.445,5071770.535,-2.040,-33.230,0.000,75,74
+L86,3818492.639,451969.447,5071772.679,-7.740,-29.680,0.000,77,76
+L87,3818497.337,451966.790,5071769.474,-10.940,-35.080,0.000,79,78
+L88,3818480.633,451934.833,5071784.850,-40.670,-9.530,0.000,81,80
+L89,3818459.945,451936.289,5071799.945,-36.750,15.820,0.000,83,82
+L90,3818445.055,451945.192,5071810.054,-26.130,32.860,0.000,85,84
+L91,3818438.525,451959.483,5071813.488,-11.160,38.740,0.000,87,86
+L92,3818443.472,452003.580,5071805.602,32.030,25.860,0.000,89,88
+L93,3818460.436,452009.975,5071792.494,36.350,3.910,0.000,91,90
+L94,3818472.817,452014.771,5071782.915,39.630,-12.130,0.000,93,92
+L95,3818497.972,451983.315,5071767.417,5.390,-38.400,0.000,95,94
+H0,3818415.172,452035.617,5071823.360,16.774,10.158,0.000,0,1
+H1,3818419.148,452036.818,5071820.316,17.491,5.059,0.000,2,3
+H2,3818423.124,452038.019,5071817.272,18.208,-0.041,0.000,4,5
+H3,3818427.101,452039.220,5071814.228,18.925,-5.141,0.000,6,7
+H4,3818416.370,452030.625,5071822.958,11.675,9.442,0.000,8,9
+H5,3818420.347,452031.826,5071819.913,12.391,4.342,0.000,10,11
+H6,3818424.324,452033.027,5071816.869,13.108,-0.758,0.000,12,13
+H7,3818428.301,452034.228,5071813.825,13.825,-5.858,0.000,14,15
+H8,3818409.616,452023.230,5071828.643,5.141,18.925,0.000,16,17
+H9,3818413.593,452024.432,5071825.599,5.858,13.825,0.000,18,19
+H10,3818417.570,452025.633,5071822.554,6.575,8.725,0.000,20,21
+H11,3818421.547,452026.833,5071819.510,7.291,3.625,0.000,22,23
+H12,3818425.523,452028.035,5071816.466,8.008,-1.475,0.000,24,25
+H13,3818429.500,452029.236,5071813.422,8.725,-6.575,0.000,26,27
+H14,3818433.477,452030.437,5071810.378,9.442,-11.675,0.000,28,29
+H15,3818437.453,452031.637,5071807.335,10.158,-16.774,0.000,30,31
+H16,3818410.816,452018.238,5071828.240,0.041,18.208,0.000,32,33
+H17,3818414.793,452019.439,5071825.195,0.758,13.108,0.000,34,35
+H18,3818418.769,452020.641,5071822.151,1.475,8.008,0.000,36,37
+H19,3818422.746,452021.842,5071819.107,2.192,2.908,0.000,38,39
+H20,3818426.723,452023.042,5071816.063,2.908,-2.192,0.000,40,41
+H21,3818430.699,452024.244,5071813.020,3.625,-7.291,0.000,42,43
+H22,3818434.676,452025.445,5071809.976,4.342,-12.391,0.000,44,45
+H23,3818438.652,452026.646,5071806.931,5.059,-17.491,0.000,46,47
+H24,3818412.016,452013.246,5071827.837,-5.059,17.491,0.000,48,49
+H25,3818415.992,452014.447,5071824.792,-4.342,12.391,0.000,50,51
+H26,3818419.969,452015.648,5071821.748,-3.625,7.291,0.000,52,53
+H27,3818423.945,452016.850,5071818.705,-2.908,2.192,0.000,54,55
+H28,3818427.922,452018.050,5071815.661,-2.192,-2.908,0.000,56,57
+H29,3818431.899,452019.251,5071812.617,-1.475,-8.008,0.000,58,59
+H30,3818435.875,452020.453,5071809.573,-0.758,-13.108,0.000,60,61
+H31,3818439.852,452021.654,5071806.528,-0.041,-18.208,0.000,62,63
+H32,3818413.215,452008.255,5071827.433,-10.158,16.774,0.000,64,65
+H33,3818417.191,452009.455,5071824.390,-9.442,11.675,0.000,66,67
+H34,3818421.168,452010.656,5071821.346,-8.725,6.575,0.000,68,69
+H35,3818425.145,452011.857,5071818.302,-8.008,1.475,0.000,70,71
+H36,3818429.121,452013.059,5071815.258,-7.291,-3.625,0.000,72,73
+H37,3818433.098,452014.259,5071812.214,-6.575,-8.725,0.000,74,75
+H38,3818437.075,452015.460,5071809.169,-5.858,-13.825,0.000,76,77
+H39,3818441.052,452016.662,5071806.125,-5.141,-18.925,0.000,78,79
+H40,3818422.367,452005.664,5071820.943,-13.825,5.858,0.000,80,81
+H41,3818426.344,452006.865,5071817.899,-13.108,0.758,0.000,82,83
+H42,3818430.321,452008.066,5071814.855,-12.391,-4.342,0.000,84,85
+H43,3818434.298,452009.267,5071811.810,-11.675,-9.442,0.000,86,87
+H44,3818423.567,452000.672,5071820.540,-18.925,5.141,0.000,88,89
+H45,3818427.544,452001.873,5071817.496,-18.208,0.041,0.000,90,91
+H46,3818431.520,452003.074,5071814.452,-17.491,-5.059,0.000,92,93
+H47,3818435.496,452004.275,5071811.408,-16.774,-10.158,0.000,94,95
+CLBA,3818468.029,451974.278,5071790.337,0.000,0.000,0.000,-1,-1
+CHBA,3818425.334,452019.946,5071817.384,0.000,0.000,0.000,-1,-1
diff --git a/MAC/Deployment/data/Coordinates/ETRF_FILES/Chillbolton/uk608-antenna-positions-etrs.csv b/MAC/Deployment/data/Coordinates/ETRF_FILES/UK608/uk608-antenna-positions-etrs.csv
similarity index 100%
rename from MAC/Deployment/data/Coordinates/ETRF_FILES/Chillbolton/uk608-antenna-positions-etrs.csv
rename to MAC/Deployment/data/Coordinates/ETRF_FILES/UK608/uk608-antenna-positions-etrs.csv
diff --git a/MAC/Deployment/data/Coordinates/data/hba-rotations.csv b/MAC/Deployment/data/Coordinates/data/hba-rotations.csv
index e41d9d73c776a47ecba7fbe62d1219ee45059ef5..d5a97d94e47fa32efd578ff26a26cf1051b0ee0a 100644
--- a/MAC/Deployment/data/Coordinates/data/hba-rotations.csv
+++ b/MAC/Deployment/data/Coordinates/data/hba-rotations.csv
@@ -7,6 +7,7 @@ CS005,66,46
CS006,76,52
CS007,82,16
CS012,4,4
+CS013,54,54
CS016,54,54
CS017,38,38
CS018,86,86
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/CS011/cs011-core-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/CS011/cs011-core-solution.lisp
new file mode 100644
index 0000000000000000000000000000000000000000..39503cffa8396d0cef4e6bc3913aac84f84fe6a6
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/CS011/cs011-core-solution.lisp
@@ -0,0 +1,8 @@
+(normal-vector (0.598753 0.072099 0.797682))
+(reference-point :etrs (3826667.465 461285.525 5064801.332)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.11959510541518863d0 -0.7919544517060547d0 0.5987530018160178d0)
+ (0.9928227483621251d0 -0.09541868004821492d0 0.07209900021867627d0)
+ (3.3096921454367496d-5 0.6030782883845335d0 0.7976820024193695d0)))
+
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/CS013/cs013-core-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/CS013/cs013-core-solution.lisp
new file mode 100644
index 0000000000000000000000000000000000000000..e176b2c8c3b71960b9dc6426d994b890bfad5eae
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/CS013/cs013-core-solution.lisp
@@ -0,0 +1,8 @@
+(normal-vector (0.598753 0.072099 0.797682))
+(reference-point :etrs (3826346.661 460791.787 5065086.876)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.11959510541518863d0 -0.7919544517060547d0 0.5987530018160178d0)
+ (0.9928227483621251d0 -0.09541868004821492d0 0.07209900021867627d0)
+ (3.3096921454367496d-5 0.6030782883845335d0 0.7976820024193695d0)))
+
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/CS028/cs028-core-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/CS028/cs028-core-solution.lisp
new file mode 100644
index 0000000000000000000000000000000000000000..affe5920347f5d04229e9bd22e03fb234e31d09d
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/CS028/cs028-core-solution.lisp
@@ -0,0 +1,8 @@
+(normal-vector (0.598753 0.072099 0.797682))
+(reference-point :etrs (3825600.841 461260.269 5065604.065)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.11959510541518863d0 -0.7919544517060547d0 0.5987530018160178d0)
+ (0.9928227483621251d0 -0.09541868004821492d0 0.07209900021867627d0)
+ (3.3096921454367496d-5 0.6030782883845335d0 0.7976820024193695d0)))
+
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/CS031/cs031-core-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/CS031/cs031-core-solution.lisp
new file mode 100644
index 0000000000000000000000000000000000000000..784dce36929b614efbd4a02929a30a7cf1533ef3
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/CS031/cs031-core-solution.lisp
@@ -0,0 +1,8 @@
+(normal-vector (0.598753 0.072099 0.797682))
+(reference-point :etrs (3826440.392 460273.509 5065063.334)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.11959510541518863d0 -0.7919544517060547d0 0.5987530018160178d0)
+ (0.9928227483621251d0 -0.09541868004821492d0 0.07209900021867627d0)
+ (3.3096921454367496d-5 0.6030782883845335d0 0.7976820024193695d0)))
+
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/Effelsberg/de601-hba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE601/de601-hba-solution.lisp
similarity index 100%
rename from MAC/Deployment/data/Coordinates/vectors-and-matrices/Effelsberg/de601-hba-solution.lisp
rename to MAC/Deployment/data/Coordinates/vectors-and-matrices/DE601/de601-hba-solution.lisp
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/Effelsberg/de601-lba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE601/de601-lba-solution.lisp
similarity index 100%
rename from MAC/Deployment/data/Coordinates/vectors-and-matrices/Effelsberg/de601-lba-solution.lisp
rename to MAC/Deployment/data/Coordinates/vectors-and-matrices/DE601/de601-lba-solution.lisp
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE602/de602-hba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE602/de602-hba-solution.lisp
new file mode 100644
index 0000000000000000000000000000000000000000..5abe6067d763263d25e59e4a45ee661c5ce4f3c7
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE602/de602-hba-solution.lisp
@@ -0,0 +1,12 @@
+(discarded-points
+ NIL)
+(reduced-chi-squared 0.0032295348190660034)
+(normal-vector (0.6497822 0.1297031 0.7489728))
+(normal-vector-uncertainties (0.0000045 0.0000059 0.0000038))
+(normal-vector-direction-uncertainties-arcsec :max 1.22 :rms 1.00 :avg 0.98)
+(reference-point :etrs (4152568.416 828788.802 4754361.926)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.15298745762707106 -0.744565623188293 0.6497821716352598)
+ (0.9874864006471825 -0.08970903417596171 0.12970311377946345)
+ (-0.038281148698510147 0.6614940074962472 0.7489727843525941)))
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE602/de602-lba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE602/de602-lba-solution.lisp
new file mode 100644
index 0000000000000000000000000000000000000000..34f4b61d73c714666e229f9dca432a800fe2e587
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE602/de602-lba-solution.lisp
@@ -0,0 +1,12 @@
+(discarded-points
+ NIL)
+(reduced-chi-squared 7.079028358164548)
+(normal-vector (0.6628865 0.1096938 0.7406408))
+(normal-vector-uncertainties (0.0000201 0.0000265 0.0000177))
+(normal-vector-direction-uncertainties-arcsec :max 5.47 :rms 4.49 :avg 4.42)
+(reference-point :etrs (4152561.241 828868.343 4754356.780)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.13931024326571673 -0.735645434113131 0.6628864543719006)
+ (0.9900056752226666 -0.08863428465533096 0.1096937856514667)
+ (-0.021941265874123858 0.6715428198202561 0.7406408184806588)))
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/Tautenburg/de603-hba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE603/de603-hba-solution.lisp
similarity index 100%
rename from MAC/Deployment/data/Coordinates/vectors-and-matrices/Tautenburg/de603-hba-solution.lisp
rename to MAC/Deployment/data/Coordinates/vectors-and-matrices/DE603/de603-hba-solution.lisp
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/Tautenburg/de603-lba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE603/de603-lba-solution.lisp
similarity index 100%
rename from MAC/Deployment/data/Coordinates/vectors-and-matrices/Tautenburg/de603-lba-solution.lisp
rename to MAC/Deployment/data/Coordinates/vectors-and-matrices/DE603/de603-lba-solution.lisp
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/Potsdam/de604-lba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE604/de604-lba-solution.lisp
similarity index 100%
rename from MAC/Deployment/data/Coordinates/vectors-and-matrices/Potsdam/de604-lba-solution.lisp
rename to MAC/Deployment/data/Coordinates/vectors-and-matrices/DE604/de604-lba-solution.lisp
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE605/de605-hba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE605/de605-hba-solution.lisp
new file mode 100644
index 0000000000000000000000000000000000000000..17ef40526ebade1fcba38a7d4dae216ca3839305
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE605/de605-hba-solution.lisp
@@ -0,0 +1,13 @@
+(discarded-points
+ NIL)
+(reduced-chi-squared 0.00007637772135123098)
+(normal-vector (0.6289655 0.0494715 0.7758576))
+(normal-vector-uncertainties (0.0000081 0.0000112 0.0000066))
+(normal-vector-direction-uncertainties-arcsec :max 2.31 :rms 1.82 :avg 1.78)
+(reference-point :etrs (4005681.407 450968.304 4926457.940)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.10322622237573512 -0.7705496189382696 0.6289655251030241)
+ (0.9944512868056747 -0.09283971747662387 0.04947145671393139)
+ (0.020272769533860202 0.630582327387113 0.775857553422327)))
+
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE605/de605-lba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE605/de605-lba-solution.lisp
new file mode 100644
index 0000000000000000000000000000000000000000..cedf5d020cfbf8ac70775c18c6078d85ab8ddbfc
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/DE605/de605-lba-solution.lisp
@@ -0,0 +1,13 @@
+(discarded-points
+ NIL)
+(reduced-chi-squared 0.00006292228122027776)
+(normal-vector (0.6289823 0.0494684 0.7758441))
+(normal-vector-uncertainties (0.0000064 0.0000088 0.0000052))
+(normal-vector-direction-uncertainties-arcsec :max 1.82 :rms 1.44 :avg 1.40)
+(reference-point :etrs (4005718.447 451028.044 4926424.103)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.10322260722367654 -0.7705364038207051 0.6289823079745582)
+ (0.9944515889182843 -0.09283812525238423 0.049468371688609306)
+ (0.020276357065468757 0.6305987098675971 0.7758441444371902)))
+
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/Nancay/fr606-hba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/FR606/fr606-hba-solution.lisp
similarity index 100%
rename from MAC/Deployment/data/Coordinates/vectors-and-matrices/Nancay/fr606-hba-solution.lisp
rename to MAC/Deployment/data/Coordinates/vectors-and-matrices/FR606/fr606-hba-solution.lisp
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/Nancay/fr606-lba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/FR606/fr606-lba-solution.lisp
similarity index 100%
rename from MAC/Deployment/data/Coordinates/vectors-and-matrices/Nancay/fr606-lba-solution.lisp
rename to MAC/Deployment/data/Coordinates/vectors-and-matrices/FR606/fr606-lba-solution.lisp
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS406/rs406-hba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS406/rs406-hba-solution.lisp
new file mode 100644
index 0000000000000000000000000000000000000000..9f407ccce0a543879d487def1b00153eacb638e7
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS406/rs406-hba-solution.lisp
@@ -0,0 +1,13 @@
+(discarded-points
+ ("460;3818487.164406881;452003.00475287694;5071773.427486328;0.03"
+ "435;3818478.590701283;452011.7617690027;5071778.898525228;0.03"))
+(reduced-chi-squared 0.33546190121343933)
+(normal-vector (0.5912056 0.0772401 0.8028137))
+(normal-vector-uncertainties (0.0000193 0.0000226 0.0000141))
+(normal-vector-direction-uncertainties-arcsec :max 4.66 :rms 3.92 :avg 3.85)
+(reference-point :etrs (3818425.334 452019.946 5071817.384)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.1231490036018062 -0.7970634976013384 0.5912056357168828)
+ (0.9923766348790071 -0.09603424375214199 0.07724013576614376)
+ (-0.0047893066408895985 0.5962107050518929 0.802813712964237)))
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS406/rs406-lba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS406/rs406-lba-solution.lisp
new file mode 100644
index 0000000000000000000000000000000000000000..fbc224625006f5323d5f2c2d58728ec3d6e535e1
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS406/rs406-lba-solution.lisp
@@ -0,0 +1,13 @@
+(discarded-points
+ ("460;3818487.164406881;452003.00475287694;5071773.427486328;0.03"
+ "435;3818478.590701283;452011.7617690027;5071778.898525228;0.03"))
+(reduced-chi-squared 0.33546190121343933)
+(normal-vector (0.5912056 0.0772401 0.8028137))
+(normal-vector-uncertainties (0.0000193 0.0000226 0.0000141))
+(normal-vector-direction-uncertainties-arcsec :max 4.66 :rms 3.92 :avg 3.85)
+(reference-point :etrs (3818468.029 451974.278 5071790.337)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.1231490036018062 -0.7970634976013384 0.5912056357168828)
+ (0.9923766348790071 -0.09603424375214199 0.07724013576614376)
+ (-0.0047893066408895985 0.5962107050518929 0.802813712964237)))
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/UK608/uk608-hba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/UK608/uk608-hba-solution.lisp
new file mode 100644
index 0000000000000000000000000000000000000000..1efa8cb6ba3d25fca3bb667549ef6f5dd142e00a
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/UK608/uk608-hba-solution.lisp
@@ -0,0 +1,13 @@
+(discarded-points
+ NIL)
+(reduced-chi-squared 0.00000012127041229819412)
+(normal-vector (0.6275061 -.0143324 0.7784797))
+(normal-vector-uncertainties (0.0000052 0.0000276 0.0000042))
+(normal-vector-direction-uncertainties-arcsec :max 5.69 :rms 3.38 :avg 2.55)
+(reference-point :etrs (4008462.280 -100376.948 4943716.600)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.06384383509552043 -0.7759896971869363 0.6275061390775574)
+ (0.9955165670977708 -0.0934951656336846 -0.014332433045352455)
+ (0.06979061078802525 0.6237777199154011 0.778479689383723)))
+
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/UK608/uk608-lba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/UK608/uk608-lba-solution.lisp
new file mode 100644
index 0000000000000000000000000000000000000000..129f6ee560b7081493a2c72fd184e4da7031f02b
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/UK608/uk608-lba-solution.lisp
@@ -0,0 +1,13 @@
+(discarded-points
+ NIL)
+(reduced-chi-squared 0.0000044917579807222815)
+(normal-vector (0.6268450 -.0149605 0.7790003))
+(normal-vector-uncertainties (0.0000235 0.0001692 0.0000190))
+(normal-vector-direction-uncertainties-arcsec :max 34.90 :rms 20.47 :avg 14.56)
+(reference-point :etrs (4008438.427 -100309.565 4943735.859)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.06356355422523652 -0.7765468618042841 0.6268449935958438)
+ (0.9955010194968978 -0.09356229564632912 -0.014960515165793279)
+ (0.07026659771820778 0.6230738866742105 0.7790003446660346)))
+
diff --git a/MAC/Deployment/data/StaticMetaData/CMakeLists.txt b/MAC/Deployment/data/StaticMetaData/CMakeLists.txt
index 203281d5afae51a55a8a01c8e08a70bf09ff11cd..cfa193f72ec7915f79f4db99524ef580ccee30bb 100644
--- a/MAC/Deployment/data/StaticMetaData/CMakeLists.txt
+++ b/MAC/Deployment/data/StaticMetaData/CMakeLists.txt
@@ -20,8 +20,8 @@ file(GLOB staticmeta_data
CableDelays/*.conf
HBADeltas/*.conf
iHBADeltas/*.conf
- AntennaFields/*.conf)
+ AntennaFields/*.conf
+ CalTables/*.dat)
install(FILES
${staticmeta_data}
DESTINATION etc/StaticMetaData)
-
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_001_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_001_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..c0983d0b4cd98423151c6a246603a1962cfe65dd
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_001_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_002_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_002_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..701bea31a017089c695d70a13d495d755208c939
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_002_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_003_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_003_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..2b620f54ce0bb16ae2411c65f988b2e41c0025e9
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_003_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_003_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_003_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..ee850d241752fcb60623283cc9839c920db6d521
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_003_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_004_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_004_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..94f2aeb4052a33e2610c8eb50e8bd5b07daacae6
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_004_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_004_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_004_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..e8db92167f5bc54f5a919b403e15915a8659456d
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_004_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_005_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_005_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..8c5b6ca1ab97751e7fc2094138fb55ab17056a85
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_005_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_005_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_005_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..57cb15557dd4c96b39beaea8a231e5bcfd12e54f
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_005_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_006_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_006_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..78bfffc546d2aa4b3f8ec6f48ef7e3d67eb0d057
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_006_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_006_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_006_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..747e527b43d1dc63f862d364073cb489c225b162
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_006_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_007_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_007_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..e358eff7fc5503a6117d61296921c4b64add5c92
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_007_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_007_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_007_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..6d272e09bf4bb07fcae2dead4d6227232e7a7293
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_007_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_017_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_017_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..49544f88d2213f7bcbe802ccb06ced019778134e
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_017_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_017_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_017_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..51da25d6399be83924162e52cded4bc57d9f782b
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_017_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_021_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_021_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..6ef1f38dde63c1a431b1e0a26a830f72d3a1c821
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_021_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_021_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_021_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..23c0ea73aacba2e0fcf8a4c28fe9faf8f6310847
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_021_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_024_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_024_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..b9951f769a859eaa227d68ae9e0a9ea797baae26
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_024_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_024_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_024_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..ea90cf3604e9b3fe5f4dce6fb33146a5555cf369
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_024_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_030_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_030_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..501e860aa1e81fe580ab2e68ff787a7ab31d138d
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_030_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_030_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_030_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..0042c366071aeee24e45e75008b2b785702abf1b
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_030_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_032_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_032_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..09e0dc9ba38b54355664f67274cf297ba9cc104e
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_032_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_032_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_032_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..e85f57a9c71bcca8aeb1a9818d78ffe3e39fdea6
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_032_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_101_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_101_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..cab35e4ba354f4965ac6dc495dffbd1bf0f56bf4
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_101_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_101_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_101_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..554ca23571459974fafbdb6bcbe6b1f10e22a281
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_101_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_103_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_103_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..ef4ae3690aa7b9a6c331cdb368d2dd7b449b6622
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_103_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_103_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_103_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..32f58c60d88a9f5d063feeb34760c5679b4190e2
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_103_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_106_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_106_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..253ff7e2ea4fbb7be114f018836c693a51a216f5
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_106_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_106_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_106_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..89c169d5c542faeb6868e057b21bc2b1c4c7e6ad
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_106_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_205_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_205_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..cbc9a850a0c167555c06fe5fe9aee4a1e6f661b4
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_205_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_205_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_205_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..0db3b048b1acc192a42cd6c021f89bd8cd9b3b11
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_205_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_208_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_208_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..d71487af21076e444d7687a9a919882c9947634e
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_208_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_208_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_208_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..9068126fd2bd92ee63e42146ab6239e804967591
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_208_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_301_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_301_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..7eb373511a461232a6f561c94e2b626fa0315fcc
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_301_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_301_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_301_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..b599d4e88d02a1b1388f614832f631c0deab1aab
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_301_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_302_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_302_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..a73384834433ff0639bcb9be40a9059b33abbeed
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_302_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_302_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_302_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..c2a528555a9717ea5024abd6adbdacd54a0ae63d
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_302_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_306_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_306_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..89dc2fe0a8f1df6e0d167b2bf7bdb3d387b5544c
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_306_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_307_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_307_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..5e7a65cf4eac17396fdcea2b6f786727682cc669
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_307_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_307_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_307_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..2ff37635ddedf3802559019a928ed5cf1f18d781
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_307_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_401_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_401_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..32aeb4c7135e2b87ced6320353569c649f544807
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_401_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_501_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_501_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..ab4b25d2e84681943e9890b4a4957046d04861e4
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_501_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_501_mode3.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_501_mode3.dat
new file mode 100644
index 0000000000000000000000000000000000000000..c7292c0f60eaa40761f5e699a78ba953b35e49c0
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_501_mode3.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_503_mode1.dat b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_503_mode1.dat
new file mode 100644
index 0000000000000000000000000000000000000000..81c9c578f8d70a5394d04e647e986a1aa099488c
Binary files /dev/null and b/MAC/Deployment/data/StaticMetaData/CalTables/CalTable_503_mode1.dat differ
diff --git a/MAC/Deployment/data/StaticMetaData/createFiles b/MAC/Deployment/data/StaticMetaData/createFiles
index edeb95f5c77fbc0d5f8fe78c2173b9e520f0c2a1..a532527f69a8f2ce74bbba119dd43b07a95b9a5d 100755
--- a/MAC/Deployment/data/StaticMetaData/createFiles
+++ b/MAC/Deployment/data/StaticMetaData/createFiles
@@ -475,6 +475,25 @@ def createiHBADeltasFile(resultDir, stationName, dataDir):
print command
os.system(command)
+def createCalTableFile(resultDir, stationName, dataDir):
+ """
+ Copies the right Caltables for this station
+ """
+ # Copy file CalTable_<stationnumber>_mode<x>.dat to
+ # /opt/lofar/etc/CalTable_mode<x>.dat
+
+ # stationName is in lowercase!
+ srcFileRoot = dataDir + "/CalTable_" + stationName[2:5] + "_mode"
+ for mode in range(7):
+ srcFile = srcFileRoot + str(mode+1) + ".dat"
+ if (os.access(srcFile,os.F_OK) == False):
+ print "Cannot find or open file ",srcFile
+ else:
+ destFile = resultDir + "CalTable_mode" + str(mode+1) + ".dat"
+ command = "cp -f "+srcFile+ " " + destFile
+ os.system(command)
+
+
def createHardwareMonitorFile(resultDir, stationName, dataDir):
"""
Creates the right HardwareMonitor.conf file for this station
@@ -553,6 +572,7 @@ if (sys.argv[1] == "localhost"):
createCableDelaysFile (resultDir, stationName, dataDir)
createHBADeltasFile (resultDir, stationName, dataDir)
createiHBADeltasFile (resultDir, stationName, dataDir)
+ createCalTableFile (resultDir, stationName, dataDir)
createHardwareMonitorFile(resultDir, stationName, dataDir)
de601Exceptions (resultDir, stationName, dataDir)
else:
@@ -601,6 +621,7 @@ else:
createHBADeltasFile (resultDir, stationName, dataDir)
createiHBADeltasFile (resultDir, stationName, dataDir)
createHardwareMonitorFile(resultDir, stationName, dataDir)
+ createCalTableFile (resultDir, stationName, dataDir)
de601Exceptions (resultDir, stationName, dataDir)
if len(warnings) > 0:
diff --git a/MAC/GCF/TM/src/Port/GCF_RawPort.cc b/MAC/GCF/TM/src/Port/GCF_RawPort.cc
index 56fb34cdd9372fa71613e21d821cca02c5460083..b9676238e9c8e5902e2e76b9c7f5224e17f509fe 100644
--- a/MAC/GCF/TM/src/Port/GCF_RawPort.cc
+++ b/MAC/GCF/TM/src/Port/GCF_RawPort.cc
@@ -273,7 +273,7 @@ GCFEvent::TResult GCFRawPort::recvEvent()
memcpy(event_buf + GCFEvent::sizeSignal, &newEvent->length, GCFEvent::sizeLength);
// read the payload right behind the just memcopied basic event struct
- if (recv(event_buf + GCFEvent::sizePackedGCFEvent, newEvent->length) != newEvent->length) {
+ if (recv(event_buf + GCFEvent::sizePackedGCFEvent, newEvent->length) != (ssize_t)newEvent->length) {
error = true;
}
}