From 1ed24bb17ab5a926ee28b1a24352396dbb32d31d Mon Sep 17 00:00:00 2001
From: Arthur Coolen <coolen@astron.nl>
Date: Thu, 6 Dec 2012 09:48:40 +0000
Subject: [PATCH] Task #3705: merged 1.9 changes with trunk for the NDeployment
---
.gitattributes | 5 +
.../RS310/rs310-antenna-positions-etrs.csv | 149 +++++++++++++++
.../RS407/rs407-antenna-positions-etrs.csv | 2 +-
.../data/Coordinates/data/normal_vectors.dat | 172 ++++++++---------
.../Coordinates/data/rotation_matrices.dat | 172 ++++++++---------
.../RS310/rs310-hba-solution.lisp | 14 ++
.../RS310/rs310-lba-solution.lisp | 13 ++
MAC/Deployment/data/PVSS/data/CEPbase.dpdef | 8 +-
MAC/Deployment/data/PVSS/data/IONode.dpdef | 9 +
MAC/Deployment/data/PVSS/data/MCUbase.dpdef | 8 +-
MAC/Deployment/data/PVSS/data/PVSSbase.dpdef | 55 ++++--
.../data/PVSS/data/SoftwareMonitor.dpdef | 9 +
.../data/PVSS/data/StationInfo.dpdef | 16 +-
.../data/PVSS/data/Stationbase.dpdef | 8 +-
.../AntennaFields/RS310-AntennaField.conf | 179 ++++++++++++++++++
.../AntennaFields/RS407-AntennaField.conf | 5 +-
.../iHBADeltas/RS310-iHBADeltas.conf | 23 +++
.../iHBADeltas/RS407-iHBADeltas.conf | 2 +-
18 files changed, 641 insertions(+), 208 deletions(-)
create mode 100644 MAC/Deployment/data/Coordinates/ETRF_FILES/RS310/rs310-antenna-positions-etrs.csv
create mode 100644 MAC/Deployment/data/Coordinates/vectors-and-matrices/RS310/rs310-hba-solution.lisp
create mode 100644 MAC/Deployment/data/Coordinates/vectors-and-matrices/RS310/rs310-lba-solution.lisp
create mode 100644 MAC/Deployment/data/StaticMetaData/AntennaFields/RS310-AntennaField.conf
create mode 100644 MAC/Deployment/data/StaticMetaData/iHBADeltas/RS310-iHBADeltas.conf
diff --git a/.gitattributes b/.gitattributes
index 09c29eea06c..4b9e62c211c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2635,6 +2635,7 @@ MAC/Deployment/data/Coordinates/ETRF_FILES/RS208/rs208-antenna-positions-etrs.cs
MAC/Deployment/data/Coordinates/ETRF_FILES/RS305/rs305-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/RS310/rs310-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/RS406/rs406-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/RS407/rs407-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/RS409/rs409-antenna-positions-etrs.csv -text
@@ -2740,6 +2741,8 @@ 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/RS310/rs310-hba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/RS310/rs310-lba-solution.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/RS407/rs407-hba-core-solution.lisp -text
@@ -2949,6 +2952,7 @@ MAC/Deployment/data/StaticMetaData/AntennaFields/RS208-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/RS305-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/RS306-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/RS307-AntennaField.conf -text
+MAC/Deployment/data/StaticMetaData/AntennaFields/RS310-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/RS407-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/RS409-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/RS503-AntennaField.conf -text
@@ -3016,6 +3020,7 @@ MAC/Deployment/data/StaticMetaData/iHBADeltas/RS208-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/RS305-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/RS306-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/RS307-iHBADeltas.conf -text
+MAC/Deployment/data/StaticMetaData/iHBADeltas/RS310-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/RS407-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/RS409-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/RS503-iHBADeltas.conf -text
diff --git a/MAC/Deployment/data/Coordinates/ETRF_FILES/RS310/rs310-antenna-positions-etrs.csv b/MAC/Deployment/data/Coordinates/ETRF_FILES/RS310/rs310-antenna-positions-etrs.csv
new file mode 100644
index 00000000000..8ff53a0a6a7
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/ETRF_FILES/RS310/rs310-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,3845433.443,413580.563,5054755.909,0.000,0.000,0.000,0,1
+L1,3845431.428,413580.320,5054757.453,0.000,2.550,0.000,2,3
+L2,3845432.117,413582.669,5054756.740,2.250,1.350,0.000,4,5
+L3,3845434.251,413582.927,5054755.105,2.250,-1.350,0.000,6,7
+L4,3845435.458,413580.806,5054754.365,0.000,-2.550,0.000,8,9
+L5,3845434.769,413578.457,5054755.078,-2.250,-1.350,0.000,10,11
+L6,3845432.635,413578.199,5054756.713,-2.250,1.350,0.000,12,13
+L7,3845431.434,413575.478,5054757.843,-4.808,3.243,0.000,14,15
+L8,3845429.221,413578.444,5054759.274,-1.599,5.575,0.000,16,17
+L9,3845428.984,413582.402,5054759.131,2.359,5.299,0.000,18,19
+L10,3845430.833,413585.499,5054757.480,5.213,2.543,0.000,20,21
+L11,3845433.904,413586.287,5054755.093,5.628,-1.403,0.000,22,23
+L12,3845436.759,413584.396,5054753.089,3.409,-4.692,0.000,24,25
+L13,3845438.062,413580.712,5054752.404,-0.405,-5.786,0.000,26,27
+L14,3845437.204,413576.958,5054753.359,-4.029,-4.172,0.000,28,29
+L15,3845434.586,413574.891,5054755.508,-5.768,-0.606,0.000,30,31
+L16,3845434.643,413571.315,5054755.756,-9.325,-0.160,0.000,32,33
+L17,3845431.744,413571.047,5054757.971,-9.245,3.497,0.000,34,35
+L18,3845428.012,413573.152,5054760.621,-6.708,7.850,0.000,36,37
+L19,3845425.440,413579.813,5054762.022,0.213,10.096,0.000,38,39
+L20,3845425.482,413583.027,5054761.728,3.399,9.579,0.000,40,41
+L21,3845426.902,413586.835,5054760.343,7.010,7.256,0.000,42,43
+L22,3845429.832,413588.813,5054757.967,8.623,3.314,0.000,44,45
+L23,3845434.408,413589.376,5054754.460,8.635,-2.479,0.000,46,47
+L24,3845438.156,413588.213,5054751.721,7.032,-6.988,0.000,48,49
+L25,3845440.545,413584.872,5054750.187,3.429,-9.487,0.000,50,51
+L26,3845440.850,413580.941,5054750.277,-0.511,-9.299,0.000,52,53
+L27,3845439.965,413576.290,5054751.326,-5.023,-7.522,0.000,54,55
+L28,3845437.653,413572.785,5054753.360,-8.226,-4.129,0.000,56,57
+L29,3845434.187,413566.248,5054756.515,-14.302,1.142,0.000,58,59
+L30,3845431.142,413566.248,5054758.817,-13.937,4.942,0.000,60,61
+L31,3845428.956,413567.886,5054760.336,-12.050,7.433,0.000,62,63
+L32,3845424.593,413573.967,5054763.139,-5.490,11.998,0.000,64,65
+L33,3845422.373,413575.209,5054764.717,-3.991,14.590,0.000,66,67
+L34,3845422.867,413582.620,5054763.738,3.307,12.901,0.000,68,69
+L35,3845424.214,413587.309,5054762.337,7.802,10.542,0.000,70,71
+L36,3845425.421,413592.312,5054761.016,12.625,8.312,0.000,72,73
+L37,3845428.082,413592.566,5054758.984,12.558,4.955,0.000,74,75
+L38,3845431.761,413593.499,5054756.125,13.045,0.228,0.000,76,77
+L39,3845437.336,413592.573,5054751.985,11.458,-6.595,0.000,78,79
+L40,3845439.470,413591.650,5054750.447,10.287,-9.125,0.000,80,81
+L41,3845442.221,413587.429,5054748.711,5.767,-11.948,0.000,82,83
+L42,3845444.853,413584.748,5054746.940,2.790,-14.845,0.000,84,85
+L43,3845444.288,413575.974,5054748.083,-5.854,-12.871,0.000,86,87
+L44,3845442.818,413572.541,5054749.474,-9.086,-10.540,0.000,88,89
+L45,3845440.139,413568.382,5054751.840,-12.895,-6.595,0.000,90,91
+L46,3845401.766,413544.548,5054782.800,-31.968,44.740,0.000,92,93
+L47,3845403.056,413621.932,5054775.511,44.708,31.940,0.000,94,95
+L48,3845439.556,413564.001,5054752.638,-17.175,-5.234,0.000,1,0
+L49,3845438.728,413561.168,5054753.495,-19.889,-3.791,0.000,3,2
+L50,3845426.344,413562.707,5054762.734,-16.879,11.441,0.000,5,4
+L51,3845418.301,413575.739,5054767.753,-2.978,19.595,0.000,7,6
+L52,3845417.055,413580.476,5054768.308,1.874,20.465,0.000,9,8
+L53,3845421.131,413591.201,5054764.351,12.035,13.827,0.000,11,10
+L54,3845429.922,413598.074,5054757.143,17.807,1.862,0.000,13,12
+L55,3845435.855,413600.568,5054752.453,19.573,-5.903,0.000,15,14
+L56,3845444.804,413590.965,5054746.469,8.969,-15.683,0.000,17,16
+L57,3845448.852,413584.327,5054743.950,1.894,-19.774,0.000,19,18
+L58,3845447.825,413574.553,5054745.524,-7.687,-17.080,0.000,21,20
+L59,3845450.542,413566.959,5054744.089,-15.552,-19.372,0.000,23,22
+L60,3845443.194,413558.237,5054750.358,-23.333,-8.940,0.000,25,24
+L61,3845433.317,413555.273,5054758.068,-25.094,3.815,0.000,27,26
+L62,3845428.330,413556.168,5054761.766,-23.609,9.909,0.000,29,28
+L63,3845421.856,413558.901,5054766.438,-20.121,17.593,0.000,31,30
+L64,3845415.132,413574.758,5054770.229,-3.573,23.692,0.000,33,32
+L65,3845413.922,413582.638,5054770.501,4.395,24.062,0.000,35,34
+L66,3845416.043,413596.061,5054767.802,17.469,19.474,0.000,37,36
+L67,3845425.176,413603.909,5054760.255,24.168,6.941,0.000,39,38
+L68,3845432.189,413606.556,5054754.736,25.957,-2.194,0.000,41,40
+L69,3845441.203,413602.809,5054748.226,21.159,-12.901,0.000,43,42
+L70,3845451.944,413593.297,5054740.880,10.430,-24.931,0.000,45,44
+L71,3845454.851,413575.811,5054740.109,-7.279,-26.030,0.000,47,46
+L72,3845457.628,413562.314,5054739.110,-21.012,-27.544,0.000,49,48
+L73,3845447.985,413554.198,5054747.064,-27.916,-14.336,0.000,51,50
+L74,3845437.136,413549.488,5054755.652,-31.294,-0.115,0.000,53,52
+L75,3845430.863,413548.327,5054760.490,-31.697,7.881,0.000,55,54
+L76,3845417.283,413557.380,5054770.020,-21.084,23.520,0.000,57,56
+L77,3845407.582,413571.281,5054776.221,-6.122,33.616,0.000,59,58
+L78,3845406.243,413583.501,5054776.237,6.171,33.520,0.000,61,60
+L79,3845410.568,413590.854,5054772.366,12.954,27.059,0.000,63,62
+L80,3845413.340,413604.871,5054769.127,26.539,21.573,0.000,65,64
+L81,3845426.438,413613.659,5054758.505,33.697,3.956,0.000,67,66
+L82,3845433.552,413614.243,5054753.078,33.426,-5.007,0.000,69,68
+L83,3845446.078,413610.550,5054743.908,28.261,-20.105,0.000,71,70
+L84,3845450.270,413603.977,5054741.274,21.234,-24.386,0.000,73,72
+L85,3845459.372,413586.306,5054735.834,2.600,-33.189,0.000,75,74
+L86,3845457.925,413579.948,5054737.446,-3.539,-30.465,0.000,77,76
+L87,3845462.784,413578.105,5054733.923,-5.950,-36.262,0.000,79,78
+L88,3845449.856,413543.308,5054746.538,-38.952,-15.096,0.000,81,80
+L89,3845429.545,413541.220,5054762.067,-38.595,10.554,0.000,83,82
+L90,3845414.109,413547.567,5054773.221,-30.447,28.900,0.000,85,84
+L91,3845406.244,413560.724,5054778.095,-16.443,36.813,0.000,87,86
+L92,3845406.444,413605.631,5054774.280,28.118,30.070,0.000,89,88
+L93,3845422.305,413614.929,5054761.527,35.453,8.930,0.000,91,90
+L94,3845433.864,413621.845,5054752.222,40.936,-6.495,0.000,93,92
+L95,3845461.675,413594.721,5054733.405,10.679,-37.281,0.000,95,94
+H0,3845365.140,413630.155,5054803.676,15.197,12.394,0.000,0,1
+H1,3845368.888,413632.037,5054800.689,16.617,7.444,0.000,2,3
+H2,3845372.637,413633.919,5054797.700,18.037,2.493,0.000,4,5
+H3,3845376.386,413635.800,5054794.712,19.456,-2.457,0.000,6,7
+H4,3845366.830,413625.373,5054802.787,10.247,10.975,0.000,8,9
+H5,3845370.579,413627.254,5054799.799,11.666,6.024,0.000,10,11
+H6,3845374.328,413629.136,5054796.811,13.086,1.074,0.000,12,13
+H7,3845378.077,413631.018,5054793.822,14.506,-3.877,0.000,14,15
+H8,3845361.024,413616.827,5054807.873,2.457,19.456,0.000,16,17
+H9,3845364.772,413618.709,5054804.885,3.877,14.506,0.000,18,19
+H10,3845368.522,413620.590,5054801.897,5.296,9.555,0.000,20,21
+H11,3845372.270,413622.472,5054798.909,6.716,4.605,0.000,22,23
+H12,3845376.019,413624.354,5054795.921,8.136,-0.346,0.000,24,25
+H13,3845379.767,413626.235,5054792.933,9.555,-5.296,0.000,26,27
+H14,3845383.517,413628.117,5054789.944,10.975,-10.247,0.000,28,29
+H15,3845387.265,413629.997,5054786.956,12.394,-15.197,0.000,30,31
+H16,3845362.714,413612.045,5054806.984,-2.493,18.037,0.000,32,33
+H17,3845366.464,413613.926,5054803.995,-1.074,13.086,0.000,34,35
+H18,3845370.212,413615.808,5054801.007,0.346,8.136,0.000,36,37
+H19,3845373.961,413617.689,5054798.019,1.765,3.185,0.000,38,39
+H20,3845377.710,413619.571,5054795.031,3.185,-1.765,0.000,40,41
+H21,3845381.459,413621.453,5054792.043,4.605,-6.716,0.000,42,43
+H22,3845385.207,413623.334,5054789.055,6.024,-11.666,0.000,44,45
+H23,3845388.956,413625.216,5054786.066,7.444,-16.617,0.000,46,47
+H24,3845364.406,413607.262,5054806.094,-7.444,16.617,0.000,48,49
+H25,3845368.155,413609.144,5054803.105,-6.024,11.666,0.000,50,51
+H26,3845371.903,413611.025,5054800.117,-4.605,6.716,0.000,52,53
+H27,3845375.652,413612.907,5054797.129,-3.185,1.765,0.000,54,55
+H28,3845379.401,413614.789,5054794.141,-1.765,-3.185,0.000,56,57
+H29,3845383.150,413616.670,5054791.153,-0.346,-8.136,0.000,58,59
+H30,3845386.898,413618.552,5054788.165,1.074,-13.086,0.000,60,61
+H31,3845390.648,413620.433,5054785.176,2.493,-18.037,0.000,62,63
+H32,3845366.097,413602.481,5054805.204,-12.394,15.197,0.000,64,65
+H33,3845369.845,413604.361,5054802.216,-10.975,10.247,0.000,66,67
+H34,3845373.595,413606.243,5054799.227,-9.555,5.296,0.000,68,69
+H35,3845377.343,413608.124,5054796.239,-8.136,0.346,0.000,70,71
+H36,3845381.092,413610.006,5054793.251,-6.716,-4.605,0.000,72,73
+H37,3845384.840,413611.888,5054790.263,-5.296,-9.555,0.000,74,75
+H38,3845388.590,413613.769,5054787.275,-3.877,-14.506,0.000,76,77
+H39,3845392.338,413615.651,5054784.287,-2.457,-19.456,0.000,78,79
+H40,3845375.285,413601.460,5054798.338,-14.506,3.877,0.000,80,81
+H41,3845379.034,413603.342,5054795.349,-13.086,-1.074,0.000,82,83
+H42,3845382.783,413605.224,5054792.361,-11.666,-6.024,0.000,84,85
+H43,3845386.532,413607.105,5054789.373,-10.247,-10.975,0.000,86,87
+H44,3845376.976,413596.678,5054797.448,-19.456,2.457,0.000,88,89
+H45,3845380.725,413598.559,5054794.460,-18.037,-2.493,0.000,90,91
+H46,3845384.474,413600.441,5054791.471,-16.617,-7.444,0.000,92,93
+H47,3845388.222,413602.323,5054788.484,-15.197,-12.394,0.000,94,95
+CLBA,3845433.443,413580.563,5054755.909,0.000,0.000,0.000,-1,-1
+CHBA,3845376.681,413616.239,5054796.080,0.000,0.000,0.000,-1,-1
+0.000,0.000,0.000,0.000,0.000,0.000,0.000,-1,-1
+0.000,0.000,0.000,0.000,0.000,0.000,0.000,-1,-1
diff --git a/MAC/Deployment/data/Coordinates/ETRF_FILES/RS407/rs407-antenna-positions-etrs.csv b/MAC/Deployment/data/Coordinates/ETRF_FILES/RS407/rs407-antenna-positions-etrs.csv
index 413a9355853..bb7764221cf 100644
--- a/MAC/Deployment/data/Coordinates/ETRF_FILES/RS407/rs407-antenna-positions-etrs.csv
+++ b/MAC/Deployment/data/Coordinates/ETRF_FILES/RS407/rs407-antenna-positions-etrs.csv
@@ -137,7 +137,7 @@ H38,3811655.566,453472.344,5076723.249,11.997,-9.028,0.000,76,77
H39,3811655.380,453477.481,5076722.924,17.119,-9.567,0.000,78,79
H40,3811660.432,453451.754,5076721.458,-9.028,-11.997,0.000,80,81
H41,3811660.245,453456.889,5076721.133,-3.907,-12.535,0.000,82,83
-H41,3811660.060,453462.026,5076720.808,1.215,-13.074,0.000,84,85
+H42,3811660.060,453462.026,5076720.808,1.215,-13.074,0.000,84,85
H43,3811659.873,453467.162,5076720.484,6.337,-13.612,0.000,86,87
H44,3811664.553,453451.707,5076718.369,-9.567,-17.119,0.000,88,89
H45,3811664.366,453456.844,5076718.044,-4.445,-17.657,0.000,90,91
diff --git a/MAC/Deployment/data/Coordinates/data/normal_vectors.dat b/MAC/Deployment/data/Coordinates/data/normal_vectors.dat
index 209041f4e04..4ac30c04f16 100644
--- a/MAC/Deployment/data/Coordinates/data/normal_vectors.dat
+++ b/MAC/Deployment/data/Coordinates/data/normal_vectors.dat
@@ -1,117 +1,119 @@
#
# station, type, normal-vector(3x float)
#
-cs301, lba , 0.598753, 0.072099, 0.797682
-cs301, hba0, 0.598753, 0.072099, 0.797682
-cs301, hba1, 0.598753, 0.072099, 0.797682
-cs024, lba , 0.598753, 0.072099, 0.797682
-cs024, hba0, 0.598753, 0.072099, 0.797682
-cs024, hba1, 0.598753, 0.072099, 0.797682
+rs305, lba , 0.598460, 0.072037, 0.797907
+rs305, hba , 0.598753, 0.072099, 0.797682
+rs106, lba , 0.598753, 0.072099, 0.797682
+rs106, hba , 0.598753, 0.072099, 0.797682
+cs302, lba , 0.598753, 0.072099, 0.797682
+cs302, hba0, 0.598753, 0.072099, 0.797682
+cs302, hba1, 0.598753, 0.072099, 0.797682
+se607, lba , 0.530119, 0.108953, 0.840894
+se607, hba , 0.529311, 0.111871, 0.841020
+cs201, lba , 0.598753, 0.072099, 0.797682
+cs201, hba0, 0.598753, 0.072099, 0.797682
+cs201, hba1, 0.598753, 0.072099, 0.797682
+cs026, lba , 0.598753, 0.072099, 0.797682
+cs026, hba0, 0.598753, 0.072099, 0.797682
+cs026, hba1, 0.598753, 0.072099, 0.797682
+cs013, lba , 0.598753, 0.072099, 0.797682
+cs013, hba0, 0.598753, 0.072099, 0.797682
+cs013, hba1, 0.598753, 0.072099, 0.797682
+cs103, lba , 0.598753, 0.072099, 0.797682
+cs103, hba0, 0.598753, 0.072099, 0.797682
+cs103, hba1, 0.598753, 0.072099, 0.797682
cs007, lba , 0.598753, 0.072099, 0.797682
cs007, hba0, 0.598753, 0.072099, 0.797682
cs007, hba1, 0.598753, 0.072099, 0.797682
+rs503, lba , 0.598753, 0.072099, 0.797682
+rs503, hba , 0.598753, 0.072099, 0.797682
rs406, lba , 0.591206, 0.077240, 0.802814
rs406, hba , 0.591206, 0.077240, 0.802814
-rs205, lba , 0.598753, 0.072099, 0.797682
-rs205, hba , 0.598753, 0.072099, 0.797682
-cs201, lba , 0.598753, 0.072099, 0.797682
-cs201, hba0, 0.598753, 0.072099, 0.797682
-cs201, hba1, 0.598753, 0.072099, 0.797682
-de604, lba , 0.601156, 0.153890, 0.784175
-de604, hba , 0.601146, 0.153897, 0.784181
-cs004, lba , 0.598753, 0.072099, 0.797682
-cs004, hba0, 0.598753, 0.072099, 0.797682
-cs004, hba1, 0.598753, 0.072099, 0.797682
-cs021, lba , 0.598753, 0.072099, 0.797682
-cs021, hba0, 0.598753, 0.072099, 0.797682
-cs021, hba1, 0.598753, 0.072099, 0.797682
-cs028, lba , 0.598753, 0.072099, 0.797682
-cs028, hba0, 0.598753, 0.072099, 0.797682
-cs028, hba1, 0.598753, 0.072099, 0.797682
+rs306, lba , 0.598753, 0.072099, 0.797682
+rs306, hba , 0.598753, 0.072099, 0.797682
+rs509, lba , 0.598753, 0.072099, 0.797682
+rs509, hba , 0.598753, 0.072099, 0.797682
cs002, lba , 0.598753, 0.072099, 0.797682
cs002, hba0, 0.598753, 0.072099, 0.797682
cs002, hba1, 0.598753, 0.072099, 0.797682
-cs003, lba , 0.598753, 0.072099, 0.797682
-cs003, hba0, 0.598753, 0.072099, 0.797682
-cs003, hba1, 0.598753, 0.072099, 0.797682
+cs011, lba , 0.598753, 0.072099, 0.797682
+cs011, hba0, 0.598753, 0.072099, 0.797682
+cs011, hba1, 0.598753, 0.072099, 0.797682
+cs006, lba , 0.598753, 0.072099, 0.797682
+cs006, hba0, 0.598753, 0.072099, 0.797682
+cs006, hba1, 0.598753, 0.072099, 0.797682
+rs310, lba , 0.601869, 0.064948, 0.795949
+rs310, hba , 0.601934, 0.064739, 0.795917
rs407, lba , 0.598753, 0.072099, 0.797682
rs407, hba , 0.598753, 0.072099, 0.797682
-rs306, lba , 0.598753, 0.072099, 0.797682
-rs306, hba , 0.598753, 0.072099, 0.797682
-de605, lba , 0.628982, 0.049468, 0.775844
-de605, hba , 0.628965, 0.049472, 0.775858
rs508, lba , 0.593792, 0.070643, 0.801512
rs508, hba , 0.593792, 0.070643, 0.801512
-cs031, lba , 0.598753, 0.072099, 0.797682
-cs031, hba0, 0.598753, 0.072099, 0.797682
-cs031, hba1, 0.598753, 0.072099, 0.797682
+de604, lba , 0.601156, 0.153890, 0.784175
+de604, hba , 0.601146, 0.153897, 0.784181
+cs101, lba , 0.598753, 0.072099, 0.797682
+cs101, hba0, 0.598753, 0.072099, 0.797682
+cs101, hba1, 0.598753, 0.072099, 0.797682
cs001, lba , 0.598753, 0.072099, 0.797682
cs001, hba0, 0.598753, 0.072099, 0.797682
cs001, hba1, 0.598753, 0.072099, 0.797682
+de603, lba , 0.601391, 0.095614, 0.793213
+de603, hba , 0.601456, 0.095645, 0.793160
+cs031, lba , 0.598753, 0.072099, 0.797682
+cs031, hba0, 0.598753, 0.072099, 0.797682
+cs031, hba1, 0.598753, 0.072099, 0.797682
+cs301, lba , 0.598753, 0.072099, 0.797682
+cs301, hba0, 0.598753, 0.072099, 0.797682
+cs301, hba1, 0.598753, 0.072099, 0.797682
+cs004, lba , 0.598753, 0.072099, 0.797682
+cs004, hba0, 0.598753, 0.072099, 0.797682
+cs004, hba1, 0.598753, 0.072099, 0.797682
+cs024, lba , 0.598753, 0.072099, 0.797682
+cs024, hba0, 0.598753, 0.072099, 0.797682
+cs024, hba1, 0.598753, 0.072099, 0.797682
+de601, lba , 0.632827, 0.078099, 0.770344
+de601, hba , 0.631584, 0.076814, 0.771493
+cs032, lba , 0.598753, 0.072099, 0.797682
+cs032, hba0, 0.598753, 0.072099, 0.797682
+cs032, hba1, 0.598753, 0.072099, 0.797682
+de605, lba , 0.628982, 0.049468, 0.775844
+de605, hba , 0.628965, 0.049472, 0.775858
+cs003, lba , 0.598753, 0.072099, 0.797682
+cs003, hba0, 0.598753, 0.072099, 0.797682
+cs003, hba1, 0.598753, 0.072099, 0.797682
+uk608, lba , 0.626845, -0.014960, 0.779000
+uk608, hba , 0.627506, -0.014332, 0.778480
rs409, lba , 0.598753, 0.072099, 0.797682
rs409, hba , 0.598753, 0.072099, 0.797682
-cs026, lba , 0.598753, 0.072099, 0.797682
-cs026, hba0, 0.598753, 0.072099, 0.797682
-cs026, hba1, 0.598753, 0.072099, 0.797682
+rs208, lba , 0.601735, 0.072879, 0.795364
+rs208, hba , 0.598753, 0.072099, 0.797682
+cs501, lba , 0.598753, 0.072099, 0.797682
+cs501, hba0, 0.598753, 0.072099, 0.797682
+cs501, hba1, 0.598753, 0.072099, 0.797682
FI609, lba , 0.333971, 0.126638, 0.934037
FI609, hba , 0.334119, 0.126625, 0.933987
-cs302, lba , 0.598753, 0.072099, 0.797682
-cs302, hba0, 0.598753, 0.072099, 0.797682
-cs302, hba1, 0.598753, 0.072099, 0.797682
-rs509, lba , 0.598753, 0.072099, 0.797682
-rs509, hba , 0.598753, 0.072099, 0.797682
+cs017, lba , 0.598753, 0.072099, 0.797682
+cs017, hba0, 0.598753, 0.072099, 0.797682
+cs017, hba1, 0.598753, 0.072099, 0.797682
+cs028, lba , 0.598753, 0.072099, 0.797682
+cs028, hba0, 0.598753, 0.072099, 0.797682
+cs028, hba1, 0.598753, 0.072099, 0.797682
de602, lba , 0.662887, 0.109694, 0.740641
de602, hba , 0.649782, 0.129703, 0.748973
-de601, lba , 0.632827, 0.078099, 0.770344
-de601, hba , 0.631584, 0.076814, 0.771493
rs307, lba , 0.598753, 0.072099, 0.797682
rs307, hba , 0.598753, 0.072099, 0.797682
-cs006, lba , 0.598753, 0.072099, 0.797682
-cs006, hba0, 0.598753, 0.072099, 0.797682
-cs006, hba1, 0.598753, 0.072099, 0.797682
-rs208, lba , 0.601735, 0.072879, 0.795364
-rs208, hba , 0.598753, 0.072099, 0.797682
-cs011, lba , 0.598753, 0.072099, 0.797682
-cs011, hba0, 0.598753, 0.072099, 0.797682
-cs011, hba1, 0.598753, 0.072099, 0.797682
-cs017, lba , 0.598753, 0.072099, 0.797682
-cs017, hba0, 0.598753, 0.072099, 0.797682
-cs017, hba1, 0.598753, 0.072099, 0.797682
-cs013, lba , 0.598753, 0.072099, 0.797682
-cs013, hba0, 0.598753, 0.072099, 0.797682
-cs013, hba1, 0.598753, 0.072099, 0.797682
-se607, lba , 0.530119, 0.108953, 0.840894
-se607, hba , 0.529311, 0.111871, 0.841020
+fr606, lba , 0.677163, 0.025597, 0.735388
+fr606, hba , 0.677451, 0.025924, 0.735111
+cs030, lba , 0.598753, 0.072099, 0.797682
+cs030, hba0, 0.598753, 0.072099, 0.797682
+cs030, hba1, 0.598753, 0.072099, 0.797682
cs005, lba , 0.598753, 0.072099, 0.797682
cs005, hba0, 0.598753, 0.072099, 0.797682
cs005, hba1, 0.598753, 0.072099, 0.797682
-de603, lba , 0.601391, 0.095614, 0.793213
-de603, hba , 0.601456, 0.095645, 0.793160
-uk608, lba , 0.626845, -0.014960, 0.779000
-uk608, hba , 0.627506, -0.014332, 0.778480
-fr606, lba , 0.677163, 0.025597, 0.735388
-fr606, hba , 0.677451, 0.025924, 0.735111
-cs103, lba , 0.598753, 0.072099, 0.797682
-cs103, hba0, 0.598753, 0.072099, 0.797682
-cs103, hba1, 0.598753, 0.072099, 0.797682
-cs101, lba , 0.598753, 0.072099, 0.797682
-cs101, hba0, 0.598753, 0.072099, 0.797682
-cs101, hba1, 0.598753, 0.072099, 0.797682
-rs305, lba , 0.598460, 0.072037, 0.797907
-rs305, hba , 0.598753, 0.072099, 0.797682
+rs205, lba , 0.598753, 0.072099, 0.797682
+rs205, hba , 0.598753, 0.072099, 0.797682
+cs021, lba , 0.598753, 0.072099, 0.797682
+cs021, hba0, 0.598753, 0.072099, 0.797682
+cs021, hba1, 0.598753, 0.072099, 0.797682
cs401, lba , 0.598753, 0.072099, 0.797682
cs401, hba0, 0.598753, 0.072099, 0.797682
cs401, hba1, 0.598753, 0.072099, 0.797682
-cs501, lba , 0.598753, 0.072099, 0.797682
-cs501, hba0, 0.598753, 0.072099, 0.797682
-cs501, hba1, 0.598753, 0.072099, 0.797682
-rs503, lba , 0.598753, 0.072099, 0.797682
-rs503, hba , 0.598753, 0.072099, 0.797682
-cs030, lba , 0.598753, 0.072099, 0.797682
-cs030, hba0, 0.598753, 0.072099, 0.797682
-cs030, hba1, 0.598753, 0.072099, 0.797682
-rs106, lba , 0.598753, 0.072099, 0.797682
-rs106, hba , 0.598753, 0.072099, 0.797682
-cs032, lba , 0.598753, 0.072099, 0.797682
-cs032, hba0, 0.598753, 0.072099, 0.797682
-cs032, hba1, 0.598753, 0.072099, 0.797682
diff --git a/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat b/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat
index bde6b3b662b..5d6af60f11e 100644
--- a/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat
+++ b/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat
@@ -1,117 +1,119 @@
#
# station, type, station-pqr-to-etrs-matrix(9x float)
#
-cs301, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs301, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs301, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs024, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs024, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs024, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs305, lba , -0.1195794394, -0.7921780051, 0.5984603294, 0.9928246344, -0.0954456149, 0.0720373503, 0.0000540097, 0.6027803438, 0.7979071715
+rs305, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs106, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs106, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs302, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs302, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs302, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+se607, lba , -0.1434910187, -0.8356935828, 0.5301193858, 0.9889342437, -0.1006885919, 0.1089535179, -0.0376747812, 0.5398870652, 0.8408939099
+se607, hba , -0.1450609384, -0.8359350936, 0.5293107248, 0.9886054814, -0.1007176904, 0.1118711263, -0.0402060468, 0.5395076145, 0.8410202184
+cs201, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs201, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs201, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs026, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs026, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs026, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs013, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs013, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs013, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs103, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs103, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs103, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs007, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs007, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs007, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs503, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs503, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
rs406, lba , -0.1231490036, -0.7970634976, 0.5912056357, 0.9923766349, -0.0960342438, 0.0772401358, -0.0047893066, 0.5962107051, 0.8028137130
rs406, hba , -0.1231490036, -0.7970634976, 0.5912056357, 0.9923766349, -0.0960342438, 0.0772401358, -0.0047893066, 0.5962107051, 0.8028137130
-rs205, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs205, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs201, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs201, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs201, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-de604, lba , -0.1687911945, -0.7811027607, 0.6011555621, 0.9835959335, -0.0941112134, 0.1538899575, -0.0636283913, 0.6172694361, 0.7841746433
-de604, hba , -0.1687955875, -0.7811092351, 0.6011459161, 0.9835947185, -0.0941119935, 0.1538972464, -0.0636355199, 0.6172611243, 0.7841806074
-cs004, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs004, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs004, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs021, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs021, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs021, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs028, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs028, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs028, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs306, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs306, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs509, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs509, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs002, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs002, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs002, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs003, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs003, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs003, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs011, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs011, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs011, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs006, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs006, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs006, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs310, lba , -0.1151008123, -0.7902562310, 0.6018694978, 0.9933358105, -0.0952140698, 0.0649480442, 0.0059808478, 0.6053340980, 0.7959490305
+rs310, hba , -0.1149710136, -0.7902260105, 0.6019340000, 0.9933497978, -0.0952104287, 0.0647391200, 0.0061518565, 0.6053741212, 0.7959173300
rs407, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
rs407, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs306, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs306, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-de605, lba , -0.1032226072, -0.7705364038, 0.6289823080, 0.9944515889, -0.0928381253, 0.0494683717, 0.0202763571, 0.6305987099, 0.7758441444
-de605, hba , -0.1032262224, -0.7705496189, 0.6289655251, 0.9944512868, -0.0928397175, 0.0494714567, 0.0202727695, 0.6305823274, 0.7758575534
rs508, lba , -0.1190892356, -0.7957570796, 0.5937915663, 0.9928832966, -0.0958768399, 0.0706426986, 0.0007164314, 0.5979785128, 0.8015118121
rs508, hba , -0.1190892356, -0.7957570796, 0.5937915663, 0.9928832966, -0.0958768399, 0.0706426986, 0.0007164314, 0.5979785128, 0.8015118121
-cs031, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs031, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs031, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+de604, lba , -0.1687911945, -0.7811027607, 0.6011555621, 0.9835959335, -0.0941112134, 0.1538899575, -0.0636283913, 0.6172694361, 0.7841746433
+de604, hba , -0.1687955875, -0.7811092351, 0.6011459161, 0.9835947185, -0.0941119935, 0.1538972464, -0.0636355199, 0.6172611243, 0.7841806074
+cs101, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs101, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs101, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs001, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs001, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs001, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+de603, lba , -0.1334809156, -0.7877259031, 0.6013906773, 0.9908835110, -0.0949092031, 0.0956143863, -0.0182404188, 0.6086708016, 0.7932131759
+de603, hba , -0.1334960861, -0.7876731599, 0.6014563893, 0.9908811597, -0.0949028483, 0.0956450562, -0.0182571191, 0.6087400452, 0.7931596529
+cs031, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs031, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs031, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs301, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs301, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs301, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs004, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs004, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs004, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs024, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs024, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs024, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+de601, lba , -0.1214634323, -0.7647321881, 0.6328271882, 0.9925955423, -0.0928219139, 0.0780991312, -0.0008509017, 0.6376274561, 0.7703442292
+de601, hba , -0.1198066951, -0.7659948264, 0.6315838092, 0.9927969403, -0.0919453659, 0.0768144370, -0.0007688588, 0.6362373579, 0.7714929904
+cs032, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs032, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs032, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+de605, lba , -0.1032226072, -0.7705364038, 0.6289823080, 0.9944515889, -0.0928381253, 0.0494683717, 0.0202763571, 0.6305987099, 0.7758441444
+de605, hba , -0.1032262224, -0.7705496189, 0.6289655251, 0.9944512868, -0.0928397175, 0.0494714567, 0.0202727695, 0.6305823274, 0.7758575534
+cs003, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs003, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs003, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+uk608, lba , -0.0635635542, -0.7765468618, 0.6268449936, 0.9955010195, -0.0935622956, -0.0149605152, 0.0702665977, 0.6230738867, 0.7790003447
+uk608, hba , -0.0638438351, -0.7759896972, 0.6275061391, 0.9955165671, -0.0934951656, -0.0143324330, 0.0697906108, 0.6237777199, 0.7784796894
rs409, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
rs409, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs026, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs026, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs026, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs208, lba , -0.1198462583, -0.7896526923, 0.6017354069, 0.9927924178, -0.0951413524, 0.0728789281, -0.0002991213, 0.6061326163, 0.7953635407
+rs208, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs501, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs501, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs501, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
FI609, lba , -0.1488161195, -0.9307614981, 0.3339712506, 0.9855896004, -0.1121428554, 0.1266377496, -0.0804170519, 0.3480043299, 0.9340375175
FI609, hba , -0.1488182628, -0.9307082344, 0.3341187022, 0.9855919695, -0.1121364380, 0.1266249936, -0.0803840431, 0.3481488213, 0.9339865116
-cs302, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs302, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs302, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs509, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs509, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs017, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs017, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs017, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs028, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs028, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs028, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
de602, lba , -0.1393102433, -0.7356454341, 0.6628864544, 0.9900056752, -0.0886342847, 0.1096937857, -0.0219412659, 0.6715428198, 0.7406408185
de602, hba , -0.1529874576, -0.7445656232, 0.6497821716, 0.9874864006, -0.0897090342, 0.1297031138, -0.0382811487, 0.6614940075, 0.7489727844
-de601, lba , -0.1214634323, -0.7647321881, 0.6328271882, 0.9925955423, -0.0928219139, 0.0780991312, -0.0008509017, 0.6376274561, 0.7703442292
-de601, hba , -0.1198066951, -0.7659948264, 0.6315838092, 0.9927969403, -0.0919453659, 0.0768144370, -0.0007688588, 0.6362373579, 0.7714929904
rs307, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
rs307, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs006, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs006, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs006, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs208, lba , -0.1198462583, -0.7896526923, 0.6017354069, 0.9927924178, -0.0951413524, 0.0728789281, -0.0002991213, 0.6061326163, 0.7953635407
-rs208, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs011, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs011, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs011, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs017, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs017, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs017, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs013, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs013, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs013, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-se607, lba , -0.1434910187, -0.8356935828, 0.5301193858, 0.9889342437, -0.1006885919, 0.1089535179, -0.0376747812, 0.5398870652, 0.8408939099
-se607, hba , -0.1450609384, -0.8359350936, 0.5293107248, 0.9886054814, -0.1007176904, 0.1118711263, -0.0402060468, 0.5395076145, 0.8410202184
+fr606, lba , -0.0821044514, -0.7312384111, 0.6771626431, 0.9957823947, -0.0881033042, 0.0255974649, 0.0409424168, 0.6764083041, 0.7353880096
+fr606, hba , -0.0822838356, -0.7309509762, 0.6774511354, 0.9957770021, -0.0880686726, 0.0259243331, 0.0407128056, 0.6767234142, 0.7351107999
+cs030, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs030, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs030, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs005, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs005, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs005, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-de603, lba , -0.1334809156, -0.7877259031, 0.6013906773, 0.9908835110, -0.0949092031, 0.0956143863, -0.0182404188, 0.6086708016, 0.7932131759
-de603, hba , -0.1334960861, -0.7876731599, 0.6014563893, 0.9908811597, -0.0949028483, 0.0956450562, -0.0182571191, 0.6087400452, 0.7931596529
-uk608, lba , -0.0635635542, -0.7765468618, 0.6268449936, 0.9955010195, -0.0935622956, -0.0149605152, 0.0702665977, 0.6230738867, 0.7790003447
-uk608, hba , -0.0638438351, -0.7759896972, 0.6275061391, 0.9955165671, -0.0934951656, -0.0143324330, 0.0697906108, 0.6237777199, 0.7784796894
-fr606, lba , -0.0821044514, -0.7312384111, 0.6771626431, 0.9957823947, -0.0881033042, 0.0255974649, 0.0409424168, 0.6764083041, 0.7353880096
-fr606, hba , -0.0822838356, -0.7309509762, 0.6774511354, 0.9957770021, -0.0880686726, 0.0259243331, 0.0407128056, 0.6767234142, 0.7351107999
-cs103, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs103, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs103, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs101, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs101, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs101, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs305, lba , -0.1195794394, -0.7921780051, 0.5984603294, 0.9928246344, -0.0954456149, 0.0720373503, 0.0000540097, 0.6027803438, 0.7979071715
-rs305, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs205, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+rs205, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs021, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs021, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
+cs021, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs401, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs401, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
cs401, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs501, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs501, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs501, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs503, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs503, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs030, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs030, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs030, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs106, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-rs106, hba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs032, lba , -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs032, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
-cs032, hba1, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.0954186800, 0.0720990002, 0.0000330969, 0.6030782884, 0.7976820024
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS310/rs310-hba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS310/rs310-hba-solution.lisp
new file mode 100644
index 00000000000..a7777512a5c
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS310/rs310-hba-solution.lisp
@@ -0,0 +1,14 @@
+(discarded-points
+ ("D144;3845395.650339911;413617.8581444614;5054781.564794847;0.015"))
+(reduced-chi-squared 2.0853094076394134)
+(normal-vector (0.60193396 0.064739116 0.7959173))
+(normal-vector-uncertainties (0.0000675 0.0000893 0.0000507))
+(normal-vector-direction-uncertainties-arcsec :max 18.42 :rms 14.64 :avg 14.27)
+(reference-point :etrs (3845376.681 413616.239 5054796.080)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+#2A((-0.114971013597106d0 -0.7902260104949447d0 0.601934)
+ (0.9933497977522893d0 -0.09521042870427743d0 0.06473912)
+ (0.0061518564629060605d0 0.6053741211872138d0 0.79591733)))
+
+
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS310/rs310-lba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS310/rs310-lba-solution.lisp
new file mode 100644
index 00000000000..483fa7c2bbf
--- /dev/null
+++ b/MAC/Deployment/data/Coordinates/vectors-and-matrices/RS310/rs310-lba-solution.lisp
@@ -0,0 +1,13 @@
+(discarded-points
+ ("A269;3845455.6096987273;413595.3853607485;5054737.870879395;0.03"))
+(reduced-chi-squared 0.47506430452999376)
+(normal-vector (0.6018695 0.0649480 0.7959490))
+(normal-vector-uncertainties (0.0000277 0.0000342 0.0000209))
+(normal-vector-direction-uncertainties-arcsec :max 7.06 :rms 5.81 :avg 5.70)
+(reference-point :etrs (3845433.443 413580.563 5054755.909)
+ :station-pqr (0.0 0.0 0.0))
+(station-pqr-to-etrs-matrix
+ #2A((-0.11510081231738079 -0.7902562310190007 0.6018694977646923)
+ (0.9933358105211705 -0.09521406982594748 0.06494804418478792)
+ (0.005980847776749336 0.6053340980341546 0.7959490305396747)))
+
diff --git a/MAC/Deployment/data/PVSS/data/CEPbase.dpdef b/MAC/Deployment/data/PVSS/data/CEPbase.dpdef
index 39a2e8b7245..d5cec3c7ceb 100644
--- a/MAC/Deployment/data/PVSS/data/CEPbase.dpdef
+++ b/MAC/Deployment/data/PVSS/data/CEPbase.dpdef
@@ -1,14 +1,8 @@
# CEP PVSS Database base types
-TypeName
-ScriptInfo.ScriptInfo 1#
- paramDone 23#
-
-
# Create missing CtrlDbg internals and DP for remoteStation
# Datapoint/DpId
DpName TypeName
-scriptInfo ScriptInfo
_CtrlDebug_CTRL_5 _CtrlDebug
_CtrlDebug_CTRL_6 _CtrlDebug
_CtrlDebug_CTRL_7 _CtrlDebug
@@ -19,3 +13,5 @@ _CtrlDebug_CTRL_9 _CtrlDebug
# DpValue
ElementName TypeName _original.._value
scriptInfo.paramDone ScriptInfo 0
+_ValueArchive_2.size.maxDpElGet _ValueArchive 4000
+_ValueArchive_2.size.maxDpElSet _ValueArchive 4000
diff --git a/MAC/Deployment/data/PVSS/data/IONode.dpdef b/MAC/Deployment/data/PVSS/data/IONode.dpdef
index e561b292d58..cb448d06155 100644
--- a/MAC/Deployment/data/PVSS/data/IONode.dpdef
+++ b/MAC/Deployment/data/PVSS/data/IONode.dpdef
@@ -10,9 +10,18 @@ usedStation string
usedIP string
usedMAC string
+
+#
+# Next points are needed for dataparameterization Do not alter them unless you know what you are doing. tabs are essential in these
+#
!# DpFunction
!ElementName TypeName _dp_fct.._type _dp_fct.._param _dp_fct.._fct
!_mp_IONode.usedStation IONode 60 _mp_IONode.station0:_original.._value, _mp_IONode.station1:_original.._value, _mp_IONode.use2ndStation:_original.._value "p3?p2:p1"
!_mp_IONode.usedIP IONode 60 _mp_IONode.IP0:_original.._value, _mp_IONode.IP1:_original.._value, LOFAR_PIC_BGP.BGPSwitch:_original.._value "p3?p2:p1"
!_mp_IONode.usedMAC IONode 60 _mp_IONode.MAC0:_original.._value, _mp_IONode.MAC1:_original.._value, _mp_IONode.MACForeign:_original.._value, LOFAR_PIC_BGP.BGPSwitch:_original.._value, _mp_IONode.use2ndStation:_original.._value "p5?p3:(p4?p2:p1)"
+!
+!# DpValue
+!ElementName TypeName _original.._value
+!_dt_IONode.Leaf _DynamicDatapoints "_mp_IONode.usedStation:_dp_fct", "_mp_IONode.usedIP:_dp_fct", "_mp_IONode.usedMAC:_dp_fct"
+!_dt_IONode.DynamicAttribute _DynamicDatapoints "_da_none", "_da_none", "_da_none"
!
\ No newline at end of file
diff --git a/MAC/Deployment/data/PVSS/data/MCUbase.dpdef b/MAC/Deployment/data/PVSS/data/MCUbase.dpdef
index adac271a995..dfd22f5bcbc 100644
--- a/MAC/Deployment/data/PVSS/data/MCUbase.dpdef
+++ b/MAC/Deployment/data/PVSS/data/MCUbase.dpdef
@@ -145,9 +145,7 @@ GCFWatchDog.GCFWatchDog 1#
lastDownTime 10#
name 9#
-TypeName
-ScriptInfo.ScriptInfo 1#
- paramDone 23#
+
# create mps for NavPanelConfig , NavigatorUserSaves and NavigatorInstance
# Datapoint/DpId
@@ -166,16 +164,18 @@ __navigator Navigator
root NavPanelConfig
__gcf_cwd GCFWatchDog
rootSaves NavigatorUserSaves
-scriptInfo ScriptInfo
_CtrlDebug_CTRL_5 _CtrlDebug
_CtrlDebug_CTRL_6 _CtrlDebug
_CtrlDebug_CTRL_7 _CtrlDebug
+_CtrlDebug_CTRL_8 _CtrlDebug
#Fill some defaults
# DpValue
ElementName TypeName _original.._value
scriptInfo.paramDone ScriptInfo 0
+_ValueArchive_2.size.maxDpElGet _ValueArchive 500
+_ValueArchive_2.size.maxDpElSet _ValueArchive 500
root.LOFAR_Processes NavPanelConfig "Processes/MainCU_Processes.pnl"
root.LOFAR_Observations NavPanelConfig "Observations/Observations.pnl"
root.StnLOFAR_Hardware NavPanelConfig "Hardware/Station.pnl"
diff --git a/MAC/Deployment/data/PVSS/data/PVSSbase.dpdef b/MAC/Deployment/data/PVSS/data/PVSSbase.dpdef
index cf9934add75..0d0b747aa58 100644
--- a/MAC/Deployment/data/PVSS/data/PVSSbase.dpdef
+++ b/MAC/Deployment/data/PVSS/data/PVSSbase.dpdef
@@ -1,4 +1,4 @@
-# Common types in Station and MainCU PVSS Database
+# Common types in Station, CCU and MainCU PVSS Database
# Definition of some basic types
# DpType
@@ -80,25 +80,50 @@ ProcessStatus.ProcessStatus 1#
error 25#
currentAction 25#
+Typename
+ScriptInfo.ScriptInfo 1#
+ claim 1#
+ debug 23#
+ gcf_cwd 1#
+ debug 23#
+ monitorAlarms 1#
+ debug 23#
+ monitorStateChanges 1#
+ debug 23#
+ monitorStateReset 1#
+ debug 23#
+ monitorStationAlarms 1#
+ debug 23#
+ readStationBGPconnections 1#
+ debug 23#
+ runDone 23#
+ readStationConfigs 1#
+ debug 23#
+ runDone 23#
+ transferMPs 1#
+ debug 23#
+ runDone 23#
+
# create mp for ProcessStatus and attach an archive
-DpName TypeName ID
-_mp_ProcessStatus ProcessStatus 0
-_dt_ProcessStatus _DynamicDatapoints 0
+DpName TypeName
+_mp_ProcessStatus ProcessStatus
+_dt_ProcessStatus _DynamicDatapoints
-ElementName TypeName _original.._value _original.._status
-_dt_ProcessStatus.Leaf _DynamicDatapoints "_mp_ProcessStatus.logMsg:_archive" 0x101
-_dt_ProcessStatus.DynamicAttribute _DynamicDatapoints "_da_none" 0x101
+ElementName TypeName _original.._value
+_dt_ProcessStatus.Leaf _DynamicDatapoints "_mp_ProcessStatus.logMsg:_archive"
+_dt_ProcessStatus.DynamicAttribute _DynamicDatapoints "_da_none"
-StampSec StampMSec ElementName TypeName DetailNr _archive.._type _archive.._archive _archive.._class
-0 0 _mp_ProcessStatus.logMsg ProcessStatus 45 1
-0 0 _mp_ProcessStatus.logMsg ProcessStatus 1 15 _ValueArchive_2
+ElementName TypeName DetailNr _archive.._type _archive.._archive _archive.._class
+_mp_ProcessStatus.logMsg ProcessStatus 45 1
+_mp_ProcessStatus.logMsg ProcessStatus 1 15 _ValueArchive_2
# create datapoints for ClaimManager,NCFObjectState and lofarSpeedTest
-DpName TypeName ID
-ClaimManager ClaimManager 0
-__navObjectState NCFObjectState 0
-__resetObjectState NCFObjectState 0
-lofarSpeedTest LofarSpeedTest 0
+DpName TypeName
+ClaimManager ClaimManager
+__navObjectState NCFObjectState
+__resetObjectState NCFObjectState
+lofarSpeedTest LofarSpeedTest
+scriptInfo ScriptInfo
diff --git a/MAC/Deployment/data/PVSS/data/SoftwareMonitor.dpdef b/MAC/Deployment/data/PVSS/data/SoftwareMonitor.dpdef
index 2e2c2dd09e6..8c5118707f7 100644
--- a/MAC/Deployment/data/PVSS/data/SoftwareMonitor.dpdef
+++ b/MAC/Deployment/data/PVSS/data/SoftwareMonitor.dpdef
@@ -1,7 +1,16 @@
# SoftwareMonitor
SWLevel int
+#
+# Next points are needed for dataparameterization Do not alter them unless you know what you are doing. tabs are essential in these
+#
+
!# DbArchiveInfo
!ElementName TypeName DetailNr _archive.._type _archive.._archive _archive.._class
!_mp_SoftwareMonitor.SWLevel SoftwareMonitor 45 1
!_mp_SoftwareMonitor.SWLevel SoftwareMonitor 1 15 _ValueArchive_2
+!
+!# DpValue
+!ElementName TypeName _original.._value
+!_dt_SoftwareMonitor.Leaf _DynamicDatapoints "_mp_SoftwareMonitor.logMsg:_archive", "_mp_SoftwareMonitor.SWLevel:_archive"
+!_dt_SoftwareMonitor.DynamicAttribute _DynamicDatapoints "_da_none", "_da_none"
diff --git a/MAC/Deployment/data/PVSS/data/StationInfo.dpdef b/MAC/Deployment/data/PVSS/data/StationInfo.dpdef
index 15b693cf3b1..4192317f04b 100644
--- a/MAC/Deployment/data/PVSS/data/StationInfo.dpdef
+++ b/MAC/Deployment/data/PVSS/data/StationInfo.dpdef
@@ -46,10 +46,18 @@ LBA.RotationMatrix.Y floatArr
LBA.RotationMatrix.Z floatArr
+#
+# Next points are needed for dataparameterization Do not alter them unless you know what you are doing. tabs are essential in these
+#
+
!# DbArchiveInfo
-!ElementName TypeName DetailNr _archive.._type _archive.._archive
-!_mp_StationInfo.datastream0 SoftwareMonitor 45 1
+!ElementName TypeName DetailNr _archive.._type _archive.._archive _archive.._class
+!_mp_StationInfo.datastream0 SoftwareMonitor 45 1
!_mp_StationInfo.datastream0 SoftwareMonitor 1 15 _ValueArchive_2
-!_mp_StationInfo.datastream1 SoftwareMonitor 45 1
+!_mp_StationInfo.datastream1 SoftwareMonitor 45 1
!_mp_StationInfo.datastream1 SoftwareMonitor 1 15 _ValueArchive_2
-!
\ No newline at end of file
+!
+!# DpValue
+!ElementName TypeName _original.._value
+!_dt_StationInfo.Leaf _DynamicDatapoints "_mp_StationInfo.datastream0:_archive", "_mp_StationInfo.datastream1:_archive"
+!_dt_StationInfo.DynamicAttribute _DynamicDatapoints "_da_none", "_da_none"
diff --git a/MAC/Deployment/data/PVSS/data/Stationbase.dpdef b/MAC/Deployment/data/PVSS/data/Stationbase.dpdef
index bfc18377da7..599997c1088 100644
--- a/MAC/Deployment/data/PVSS/data/Stationbase.dpdef
+++ b/MAC/Deployment/data/PVSS/data/Stationbase.dpdef
@@ -150,10 +150,6 @@ HBAElement.HBAElement 1#
comm 1#
status 41#:ObjectStatus
-TypeName
-ScriptInfo.ScriptInfo 1#
- paramDone 23#
-
# Create missing CtrlDbg internals and DP for remoteStation
@@ -162,17 +158,19 @@ DpName TypeName
__navigator Navigator
standalone NavPanelConfig
rootSaves NavigatorUserSaves
-scriptInfo ScriptInfo
_CtrlDebug_CTRL_5 _CtrlDebug
_CtrlDebug_CTRL_6 _CtrlDebug
_CtrlDebug_CTRL_7 _CtrlDebug
_CtrlDebug_CTRL_8 _CtrlDebug
_CtrlDebug_CTRL_9 _CtrlDebug
+_CtrlDebug_CTRL_10 _CtrlDebug
#Fill some defaults
# DpValue
ElementName TypeName _original.._value
scriptInfo.paramDone ScriptInfo 0
+_ValueArchive_2.size.maxDpElGet _ValueArchive 500
+_ValueArchive_2.size.maxDpElSet _ValueArchive 500
standalone.StnLOFAR_Hardware NavPanelConfig "Hardware/Station.pnl"
standalone.StnPIC_Hardware NavPanelConfig "Hardware/Station_Cabinet.pnl"
standalone.Cabinet_Hardware NavPanelConfig "Hardware/Station_Cabinet_detailed.pnl"
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS310-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS310-AntennaField.conf
new file mode 100644
index 00000000000..d3353ad01ca
--- /dev/null
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS310-AntennaField.conf
@@ -0,0 +1,179 @@
+#
+# AntennaPositions for RS310
+# ITRF2005 target_date = 2012.5
+# Created: 2012-12-04 12:46:44
+#
+
+NORMAL_VECTOR LBA
+3 [ 0.601869 0.064948 0.795949 ]
+
+ROTATION_MATRIX LBA
+3 x 3 [
+ -0.1151010000 -0.7902560000 0.6018690000
+ 0.9933360000 -0.0952140000 0.0649480000
+ 0.0059810000 0.6053340000 0.7959490000
+]
+
+LBA
+3 [ 3845433.051930000 413580.888254000 5054756.170 ]
+96 x 2 x 3 [
+ 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
+ -2.015000 -0.243000 1.544000 -2.015000 -0.243000 1.544000
+ -1.326000 2.106000 0.831000 -1.326000 2.106000 0.831000
+ 0.808000 2.364000 -0.804000 0.808000 2.364000 -0.804000
+ 2.015000 0.243000 -1.544000 2.015000 0.243000 -1.544000
+ 1.326000 -2.106000 -0.831000 1.326000 -2.106000 -0.831000
+ -0.808000 -2.364000 0.804000 -0.808000 -2.364000 0.804000
+ -2.009000 -5.085000 1.934000 -2.009000 -5.085000 1.934000
+ -4.222000 -2.119000 3.365000 -4.222000 -2.119000 3.365000
+ -4.459000 1.839000 3.222000 -4.459000 1.839000 3.222000
+ -2.610000 4.936000 1.571000 -2.610000 4.936000 1.571000
+ 0.461000 5.724000 -0.816000 0.461000 5.724000 -0.816000
+ 3.316000 3.833000 -2.820000 3.316000 3.833000 -2.820000
+ 4.619000 0.149001 -3.505000 4.619000 0.149001 -3.505000
+ 3.761000 -3.605000 -2.550000 3.761000 -3.605000 -2.550000
+ 1.143000 -5.672000 -0.401000 1.143000 -5.672000 -0.401000
+ 1.200000 -9.248000 -0.153000 1.200000 -9.248000 -0.153000
+ -1.699000 -9.516000 2.062000 -1.699000 -9.516000 2.062000
+ -5.431000 -7.411000 4.712000 -5.431000 -7.411000 4.712000
+ -8.003000 -0.750001 6.113000 -8.003000 -0.750001 6.113000
+ -7.961000 2.463999 5.819000 -7.961000 2.463999 5.819000
+ -6.541000 6.272000 4.434000 -6.541000 6.272000 4.434000
+ -3.611000 8.250000 2.058000 -3.611000 8.250000 2.058000
+ 0.965000 8.813000 -1.449000 0.965000 8.813000 -1.449000
+ 4.713000 7.650001 -4.188000 4.713000 7.650001 -4.188000
+ 7.102000 4.309001 -5.722000 7.102000 4.309001 -5.722000
+ 7.407000 0.378001 -5.632000 7.407000 0.378001 -5.632000
+ 6.522000 -4.272999 -4.583000 6.522000 -4.272999 -4.583000
+ 4.210000 -7.777999 -2.549000 4.210000 -7.777999 -2.549000
+ 0.744000 -14.315000 0.606000 0.744000 -14.315000 0.606000
+ -2.301000 -14.315000 2.908000 -2.301000 -14.315000 2.908000
+ -4.487000 -12.677000 4.427000 -4.487000 -12.677000 4.427000
+ -8.850000 -6.596001 7.230000 -8.850000 -6.596001 7.230000
+-11.070000 -5.354001 8.808000 -11.070000 -5.354001 8.808000
+-10.576000 2.056999 7.829000 -10.576000 2.056999 7.829000
+ -9.229000 6.745999 6.428000 -9.229000 6.745999 6.428000
+ -8.022000 11.748999 5.107000 -8.022000 11.748999 5.107000
+ -5.361000 12.003000 3.075000 -5.361000 12.003000 3.075000
+ -1.682000 12.936000 0.216000 -1.682000 12.936000 0.216000
+ 3.893000 12.010000 -3.924000 3.893000 12.010000 -3.924000
+ 6.027000 11.087001 -5.462000 6.027000 11.087001 -5.462000
+ 8.778000 6.866001 -7.198000 8.778000 6.866001 -7.198000
+ 11.410000 4.185001 -8.969000 11.410000 4.185001 -8.969000
+ 10.845000 -4.588999 -7.826000 10.845000 -4.588999 -7.826000
+ 9.375000 -8.021999 -6.435000 9.375000 -8.021999 -6.435000
+ 6.696000 -12.180999 -4.069000 6.696000 -12.180999 -4.069000
+-31.677000 -36.015002 26.891000 -31.677000 -36.015002 26.891000
+-30.387010 41.368998 19.601990 -30.387010 41.368998 19.601990
+ 6.113000 -16.561999 -3.271000 6.113000 -16.561999 -3.271000
+ 5.285000 -19.394999 -2.414000 5.285000 -19.394999 -2.414000
+ -7.099000 -17.856000 6.825000 -7.099000 -17.856000 6.825000
+-15.142000 -4.824001 11.844000 -15.142000 -4.824001 11.844000
+-16.388000 -0.087001 12.399000 -16.388000 -0.087001 12.399000
+-12.312000 10.637999 8.442000 -12.312000 10.637999 8.442000
+ -3.521000 17.511000 1.234000 -3.521000 17.511000 1.234000
+ 2.412000 20.005000 -3.456000 2.412000 20.005000 -3.456000
+ 11.361000 10.402001 -9.440000 11.361000 10.402001 -9.440000
+ 15.409000 3.764001 -11.959000 15.409000 3.764001 -11.959000
+ 14.382000 -6.009999 -10.385000 14.382000 -6.009999 -10.385000
+ 17.099000 -13.603998 -11.820000 17.099000 -13.603998 -11.820000
+ 9.751000 -22.325999 -5.551000 9.751000 -22.325999 -5.551000
+ -0.126000 -25.290000 2.159000 -0.126000 -25.290000 2.159000
+ -5.113000 -24.395000 5.857000 -5.113000 -24.395000 5.857000
+-11.587000 -21.662001 10.529000 -11.587000 -21.662001 10.529000
+-18.311000 -5.805001 14.320000 -18.311000 -5.805001 14.320000
+-19.521000 2.074999 14.592000 -19.521000 2.074999 14.592000
+-17.400000 15.497999 11.893000 -17.400000 15.497999 11.893000
+ -8.267000 23.345999 4.346000 -8.267000 23.345999 4.346000
+ -1.254000 25.993000 -1.173000 -1.254000 25.993000 -1.173000
+ 7.760000 22.246001 -7.683000 7.760000 22.246001 -7.683000
+ 18.501000 12.734002 -15.029000 18.501000 12.734002 -15.029000
+ 21.408000 -4.751998 -15.800000 21.408000 -4.751998 -15.800000
+ 24.185000 -18.248998 -16.799000 24.185000 -18.248998 -16.799000
+ 14.542000 -26.364999 -8.845000 14.542000 -26.364999 -8.845000
+ 3.693000 -31.075000 -0.257000 3.693000 -31.075000 -0.257000
+ -2.580000 -32.236000 4.581000 -2.580000 -32.236000 4.581000
+-16.160000 -23.183001 14.111000 -16.160000 -23.183001 14.111000
+-25.861000 -9.282002 20.312000 -25.861000 -9.282002 20.312000
+-27.200000 2.937998 20.328000 -27.200000 2.937998 20.328000
+-22.875000 10.290998 16.457000 -22.875000 10.290998 16.457000
+-20.103000 24.307998 13.218000 -20.103000 24.307998 13.218000
+ -7.005000 33.096000 2.596000 -7.005000 33.096000 2.596000
+ 0.109000 33.680000 -2.831000 0.109000 33.680000 -2.831000
+ 12.635000 29.987001 -12.001000 12.635000 29.987001 -12.001000
+ 16.827000 23.414002 -14.635000 16.827000 23.414002 -14.635000
+ 25.929000 5.743002 -20.075000 25.929000 5.743002 -20.075000
+ 24.482000 -0.614998 -18.463000 24.482000 -0.614998 -18.463000
+ 29.341000 -2.457997 -21.986000 29.341000 -2.457997 -21.986000
+ 16.413000 -37.254998 -9.371000 16.413000 -37.254998 -9.371000
+ -3.898000 -39.343000 6.158000 -3.898000 -39.343000 6.158000
+-19.334000 -32.996001 17.312000 -19.334000 -32.996001 17.312000
+-27.199000 -19.839002 22.186000 -27.199000 -19.839002 22.186000
+-26.999000 25.067998 18.371000 -26.999000 25.067998 18.371000
+-11.138000 34.365999 5.618000 -11.138000 34.365999 5.618000
+ 0.421000 41.282000 -3.687000 0.421000 41.282000 -3.687000
+ 28.232000 14.158003 -22.504000 28.232000 14.158003 -22.504000
+]
+
+NORMAL_VECTOR HBA
+3 [ 0.601934 0.064739 0.795917 ]
+
+ROTATION_MATRIX HBA
+3 x 3 [
+ -0.1149710000 -0.7902260000 0.6019340000
+ 0.9933500000 -0.0952100000 0.0647390000
+ 0.0061520000 0.6053740000 0.7959170000
+]
+
+HBA
+3 [ 3845376.289920000 413616.564249000 5054796.341 ]
+48 x 2 x 3 [
+-11.541000 13.915999 7.596000 -11.541000 13.915999 7.596000
+ -7.793000 15.798000 4.609000 -7.793000 15.798000 4.609000
+ -4.044000 17.680000 1.620000 -4.044000 17.680000 1.620000
+ -0.295000 19.561000 -1.368000 -0.295000 19.561000 -1.368000
+ -9.851000 9.134000 6.707000 -9.851000 9.134000 6.707000
+ -6.102000 11.015000 3.719000 -6.102000 11.015000 3.719000
+ -2.353000 12.897000 0.731000 -2.353000 12.897000 0.731000
+ 1.396000 14.779000 -2.258000 1.396000 14.779000 -2.258000
+-15.657000 0.587999 11.793000 -15.657000 0.587999 11.793000
+-11.909000 2.469999 8.805000 -11.909000 2.469999 8.805000
+ -8.159000 4.351000 5.817000 -8.159000 4.351000 5.817000
+ -4.411000 6.233000 2.829000 -4.411000 6.233000 2.829000
+ -0.662000 8.115000 -0.159000 -0.662000 8.115000 -0.159000
+ 3.086000 9.996001 -3.147000 3.086000 9.996001 -3.147000
+ 6.836000 11.878001 -6.136000 6.836000 11.878001 -6.136000
+ 10.584000 13.758001 -9.124000 10.584000 13.758001 -9.124000
+-13.967000 -4.194001 10.904000 -13.967000 -4.194001 10.904000
+-10.217000 -2.313001 7.915000 -10.217000 -2.313001 7.915000
+ -6.469000 -0.431000 4.927000 -6.469000 -0.431000 4.927000
+ -2.720000 1.450000 1.939000 -2.720000 1.450000 1.939000
+ 1.029000 3.332000 -1.049000 1.029000 3.332000 -1.049000
+ 4.778000 5.214001 -4.037000 4.778000 5.214001 -4.037000
+ 8.526000 7.095001 -7.025000 8.526000 7.095001 -7.025000
+ 12.275000 8.977001 -10.014000 12.275000 8.977001 -10.014000
+-12.275000 -8.977001 10.014000 -12.275000 -8.977001 10.014000
+ -8.526000 -7.095000 7.025000 -8.526000 -7.095000 7.025000
+ -4.778000 -5.214000 4.037000 -4.778000 -5.214000 4.037000
+ -1.029000 -3.332000 1.049000 -1.029000 -3.332000 1.049000
+ 2.720000 -1.449999 -1.939000 2.720000 -1.449999 -1.939000
+ 6.469000 0.431001 -4.927000 6.469000 0.431001 -4.927000
+ 10.217000 2.313001 -7.915000 10.217000 2.313001 -7.915000
+ 13.967000 4.194002 -10.904000 13.967000 4.194002 -10.904000
+-10.584000 -13.758001 9.124000 -10.584000 -13.758001 9.124000
+ -6.836000 -11.878000 6.136000 -6.836000 -11.878000 6.136000
+ -3.086000 -9.996000 3.147000 -3.086000 -9.996000 3.147000
+ 0.662000 -8.115000 0.159000 0.662000 -8.115000 0.159000
+ 4.411000 -6.232999 -2.829000 4.411000 -6.232999 -2.829000
+ 8.159000 -4.350999 -5.817000 8.159000 -4.350999 -5.817000
+ 11.909000 -2.469999 -8.805000 11.909000 -2.469999 -8.805000
+ 15.657000 -0.587998 -11.793000 15.657000 -0.587998 -11.793000
+ -1.395990 -14.779000 2.258000 -1.395990 -14.779000 2.258000
+ 2.353010 -12.896999 -0.731000 2.353010 -12.896999 -0.731000
+ 6.102010 -11.014999 -3.719000 6.102010 -11.014999 -3.719000
+ 9.851010 -9.133999 -6.707000 9.851010 -9.133999 -6.707000
+ 0.295010 -19.561000 1.368000 0.295010 -19.561000 1.368000
+ 4.044010 -17.679999 -1.620000 4.044010 -17.679999 -1.620000
+ 7.793010 -15.797999 -4.609000 7.793010 -15.797999 -4.609000
+ 11.541010 -13.915999 -7.596000 11.541010 -13.915999 -7.596000
+]
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS407-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS407-AntennaField.conf
index 1b8b9cbf4f6..bc304d6e61f 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/RS407-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/RS407-AntennaField.conf
@@ -1,7 +1,7 @@
#
# AntennaPositions for RS407
# ITRF2005 target_date = 2012.5
-# Created: 2012-11-08 20:42:21
+# Created: 2012-11-30 15:19:23
#
NORMAL_VECTOR LBA
@@ -127,7 +127,7 @@ ROTATION_MATRIX HBA
HBA
3 [ 3811649.455090000 453459.894384000 5076728.952 ]
-47 x 2 x 3 [
+48 x 2 x 3 [
-14.143000 -7.545002 11.298000 -14.143000 -7.545002 11.298000
-14.329010 -2.408002 10.973000 -14.329010 -2.408002 10.973000
-14.515010 2.727998 10.649000 -14.515010 2.727998 10.649000
@@ -169,6 +169,7 @@ HBA
5.714990 12.772000 -5.444000 5.714990 12.772000 -5.444000
5.528990 17.909000 -5.769000 5.528990 17.909000 -5.769000
10.581000 -7.817999 -7.235000 10.581000 -7.817999 -7.235000
+ 10.394000 -2.682999 -7.560000 10.394000 -2.682999 -7.560000
10.209000 2.454001 -7.885000 10.209000 2.454001 -7.885000
10.021990 7.590001 -8.209000 10.021990 7.590001 -8.209000
14.702000 -7.864999 -10.324000 14.702000 -7.864999 -10.324000
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS310-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS310-iHBADeltas.conf
new file mode 100644
index 00000000000..88869840374
--- /dev/null
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS310-iHBADeltas.conf
@@ -0,0 +1,23 @@
+#
+# HBADeltas for RS310
+# Created: 2012-12-04 12:46:44
+#
+HBADeltas
+16 x 3 [
+ -1.980 1.056 1.412
+ -1.071 1.513 0.687
+ -0.161 1.970 -0.039
+ 0.749 2.426 -0.764
+ -1.570 -0.105 1.196
+ -0.660 0.352 0.471
+ 0.250 0.809 -0.255
+ 1.160 1.265 -0.980
+ -1.160 -1.265 0.980
+ -0.250 -0.809 0.255
+ 0.660 -0.352 -0.471
+ 1.570 0.105 -1.196
+ -0.749 -2.426 0.764
+ 0.161 -1.970 0.039
+ 1.071 -1.513 -0.687
+ 1.980 -1.056 -1.412
+]
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS407-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS407-iHBADeltas.conf
index 0b287323558..fd9699fa44c 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS407-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/RS407-iHBADeltas.conf
@@ -1,6 +1,6 @@
#
# HBADeltas for RS407
-# Created: 2012-11-08 20:42:21
+# Created: 2012-11-30 15:19:23
#
HBADeltas
16 x 3 [
--
GitLab