diff --git a/.gitattributes b/.gitattributes
index 45ab765c75c05c7494e7ce593c8a2ce4be7ab439..0a06d1036b25cd6b1dd52aea19ca2b0ff614553b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3340,6 +3340,7 @@ MAC/Deployment/data/StaticMetaData/AntennaFields/DE605-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/DE609-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/FI609-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/FR606-AntennaField.conf -text
+MAC/Deployment/data/StaticMetaData/AntennaFields/IE613-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/PL610-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/PL611-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/PL612-AntennaField.conf -text
@@ -3471,6 +3472,7 @@ MAC/Deployment/data/StaticMetaData/iHBADeltas/DE605-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/DE609-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/FI609-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/FR606-iHBADeltas.conf -text
+MAC/Deployment/data/StaticMetaData/iHBADeltas/IE613-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/PL610-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/PL611-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/PL612-iHBADeltas.conf -text
diff --git a/MAC/APL/APLCommon/src/swlevel b/MAC/APL/APLCommon/src/swlevel
index b48e5395b910ec0e815162edfe504661918d5d57..ee83b7a5b958e5c17e4ad3a2f0a75939ef1c53fa 100755
--- a/MAC/APL/APLCommon/src/swlevel
+++ b/MAC/APL/APLCommon/src/swlevel
@@ -35,6 +35,9 @@ SBINDIR=$LOFARROOT/sbin
LOGDIR=$LOFARROOT/var/log
ETCDIR=$LOFARROOT/etc
LEVELTABLE=${ETCDIR}/swlevel.conf
+# pidof is in /usr/sbin, usually; this is not added to PATH for non-interactive logins
+# (in /etc/profile) so explicitly find location of executable pidof now.
+PIDOF=`whereis -b pidof | awk '{print $2}'`
# Make sure all files are user/group/other writeable (needed for Int.
# Stations)
@@ -238,7 +241,7 @@ start_prog()
fi
# Check if program is already running
- pidof -x ${prog} 1>/dev/null 2>&1
+ $PIDOF -x ${prog} 1>/dev/null 2>&1
if [ $? -ne 0 ]; then
curdate=`date +%Y%m%dT%H%M%S`
# PVSS needs special treatment
@@ -269,7 +272,7 @@ start_prog()
fi
if [ "$prog" = "TBBDriver" ]; then
# Check if RSPDriver is already running; if not, do not start either!
- pidof RSPDriver 1>/dev/null 2>&1
+ $PIDOF RSPDriver 1>/dev/null 2>&1
if [ $? -ne 0 ]; then
echo "RSPDriver not running, so not starting TBBDriver either"
exit
@@ -321,7 +324,7 @@ stop_prog()
fi
# get processlist
- pidof -x ${prog} 1>/dev/null 2>&1
+ $PIDOF -x ${prog} 1>/dev/null 2>&1
if [ $? -ne 0 ]; then
return
fi
@@ -348,7 +351,7 @@ stop_prog()
fi
# first try normal kill
- for pid in `pidof -x ${prog}`
+ for pid in `$PIDOF -x ${prog}`
do
echo "Softly killing ${prog}(${pid})"
$asroot kill $pid 1>/dev/null 2>&1
@@ -356,7 +359,7 @@ stop_prog()
done
# when normal kill did not work, kill is with -9
- for pid in `pidof -x ${prog}`
+ for pid in `$PIDOF -x ${prog}`
do
echo "Hard killing ${prog}(${pid})"
$asroot kill -9 $pid 1>/dev/null 2>&1
@@ -364,7 +367,7 @@ stop_prog()
done
# if user0 or lofarsys, try normal kill as root
- for pid in `pidof -x ${prog}`
+ for pid in `$PIDOF -x ${prog}`
do
if [ "$user" == "user0" -o "$user" == "lofarsys" ]; then
sudo kill $pid 1>/dev/null 2>&1
@@ -373,7 +376,7 @@ stop_prog()
done
# if user0 or lofarsys, try hard kill as root
- for pid in `pidof -x ${prog}`
+ for pid in `$PIDOF -x ${prog}`
do
if [ "$user" == "user0" -o "$user" == "lofarsys" ]; then
sudo kill -9 $pid 1>/dev/null 2>&1
@@ -382,7 +385,7 @@ stop_prog()
done
# if still alive, write a message
- for pid in `pidof -x ${prog}`
+ for pid in `$PIDOF -x ${prog}`
do
echo -n "Could not kill ${prog}(${pid}); "
if [ "$user" == "user0" -o "$user" == "lofarsys" ]; then
@@ -442,9 +445,9 @@ status_prog()
# find out the processID of the possibly (running) process
obsid=()
pid_user=()
- pidof -x ${prog} 1>/dev/null 2>&1
+ $PIDOF -x ${prog} 1>/dev/null 2>&1
if [ $? -eq 0 ]; then
- pid=( `pidof -x ${prog}` )
+ pid=( `$PIDOF -x ${prog}` )
i=0
for apid in ${pid[@]}
do
@@ -522,7 +525,7 @@ goto_level()
# set rcumode to 0 (power save) when entering level 1
if [ ${newlevel} -le 1 ]; then
if [ ${curlevel} -ge 2 ]; then
- pidof RSPDriver 1>/dev/null 2>&1
+ $PIDOF RSPDriver 1>/dev/null 2>&1
if [ $? -eq 0 ]; then
status=`( rspctl --version | grep "0.0" ) >& /dev/null; echo $?`
if [ $status == 1 ]; then
diff --git a/MAC/APL/RTDBCommon/include/APL/RTDBCommon/RTDButilities.h b/MAC/APL/RTDBCommon/include/APL/RTDBCommon/RTDButilities.h
index 9c93ff2cca3d2635bcdd58de9c1e0238efe5a35d..8fc949b471d163ec5fa878c53ad5a48db9408bb3 100644
--- a/MAC/APL/RTDBCommon/include/APL/RTDBCommon/RTDButilities.h
+++ b/MAC/APL/RTDBCommon/include/APL/RTDBCommon/RTDButilities.h
@@ -56,6 +56,7 @@ enum {
RTDB_OBJ_STATE_TEST,
RTDB_OBJ_STATE_SUSPICIOUS,
RTDB_OBJ_STATE_BROKEN,
+ RTDB_OBJ_STATE_BEYOND_REPAIR,
RTDB_OBJ_STATE_NR_OF_VALUES
};
diff --git a/MAC/APL/RTDBCommon/src/RTDButilities.cc b/MAC/APL/RTDBCommon/src/RTDButilities.cc
index bb1f9e5e4713e50fcfe9e279d5f36f6883ceed0c..787ba86264e82fc87e7e8c73e7004f8cf002085b 100644
--- a/MAC/APL/RTDBCommon/src/RTDButilities.cc
+++ b/MAC/APL/RTDBCommon/src/RTDButilities.cc
@@ -43,13 +43,14 @@ typedef struct RTDBObjState {
} RTDBobjState_t;
RTDBobjState_t objStateTable[] = {
- { 0, "'Off'" },
+ { 0, "'Off'" },
{ 10, "'Operational'" },
{ 20, "'Maintenance'" },
- { 30, "'Test'" },
- { 46, "'Suspicious'" },
- { 56, "'Broken'" },
- { 60, "'Not available'" }
+ { 30, "'Test'" },
+ { 40, "'Suspicious'" },
+ { 50, "'Broken'" },
+ { 60, "'Beyond_Repair'" },
+ { 70, "'Not available'" }
};
// Every softwaremodule or hardwarecomponent has a color on the Navigator screens
diff --git a/MAC/APL/RTDBCommon/src/setObjectState.cc b/MAC/APL/RTDBCommon/src/setObjectState.cc
index a9d8c294bff9267953413fb1613baae11a7a2578..c56866c593402f62c55b6557962d97b4434522ed 100644
--- a/MAC/APL/RTDBCommon/src/setObjectState.cc
+++ b/MAC/APL/RTDBCommon/src/setObjectState.cc
@@ -212,6 +212,7 @@ int main(int argc, char* argv[])
cout << " 3 - Test" << endl;
cout << " 4 - Suspicious" << endl;
cout << " 5 - Broken" << endl;
+ cout << " 6 - Beyond_Repair" << endl;
return (1);
}
diff --git a/MAC/Deployment/data/Coordinates/CoordMenu.py b/MAC/Deployment/data/Coordinates/CoordMenu.py
index 92d24e14c2e314630c4e27983e5a99016707d358..717b37f801163be634f1cee32b5a8a36a0052c63 100755
--- a/MAC/Deployment/data/Coordinates/CoordMenu.py
+++ b/MAC/Deployment/data/Coordinates/CoordMenu.py
@@ -195,7 +195,7 @@ if __name__ == "__main__":
if sel == '9': transform_all()
if sel == '10': transform_one()
if sel == '11': make_all_conf_files()
- if sel == '12': make_one_conf_files()
+ if sel == '12': make_one_conf_file()
if sel == '0':
create_CDB()
create_CDB_objects()
diff --git a/MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql b/MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql
index 4ce7c62e32536a0db4a36eef2ca15e2604cb8c75..9ae27620e18c53e19e78cd32052c6e05dbc4502e 100644
--- a/MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql
+++ b/MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql
@@ -205,7 +205,8 @@ INSERT INTO station VALUES ('FR606', 'Nancy');
INSERT INTO station VALUES ('SE607', 'Onsala');
INSERT INTO station VALUES ('UK608', 'Chillbolton');
INSERT INTO station VALUES ('FI609', 'Kaira');
-INSERT INTO station VALUES ('PL610', '');
-INSERT INTO station VALUES ('PL611', '');
+INSERT INTO station VALUES ('PL610', 'Borowiec');
+INSERT INTO station VALUES ('PL611', 'Lazy');
INSERT INTO station VALUES ('PL612', 'Baldy');
+INSERT INTO station VALUES ('IE613', 'Birr');
diff --git a/MAC/Deployment/data/Coordinates/data/normal_vectors.dat b/MAC/Deployment/data/Coordinates/data/normal_vectors.dat
index 0bba676229bb9c33c94b94cfd4e097ac8d7a0cd5..18493be4204537ef3f37968ae47c65a8abc353cf 100644
--- a/MAC/Deployment/data/Coordinates/data/normal_vectors.dat
+++ b/MAC/Deployment/data/Coordinates/data/normal_vectors.dat
@@ -1,116 +1,82 @@
#
# 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
-cs007, lba , 0.598753, 0.072099, 0.797682
-cs007, hba0, 0.598753, 0.072099, 0.797682
-cs007, hba1, 0.598753, 0.072099, 0.797682
-rs406, lba , 0.591206, 0.077240, 0.802814
-rs406, hba , 0.591206, 0.077240, 0.802814
-pl611, lba , 0.643193, 0.307002, 0.701465
-pl611, hba , 0.590360, 0.217723, 0.777220
-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
+rs407, lba , 0.598753, 0.072099, 0.797682
+rs407, hba , 0.598753, 0.072099, 0.797682
+uk608, lba , 0.626845, -0.014960, 0.779000
+uk608, hba , 0.627506, -0.014332, 0.778480
cs028, lba , 0.598753, 0.072099, 0.797682
cs028, hba0, 0.598753, 0.072099, 0.797682
cs028, hba1, 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
-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
+cs032, lba , 0.598753, 0.072099, 0.797682
+cs032, hba0, 0.598753, 0.072099, 0.797682
+cs032, hba1, 0.598753, 0.072099, 0.797682
+rs406, lba , 0.591206, 0.077240, 0.802814
+rs406, hba , 0.591206, 0.077240, 0.802814
+fr606, lba , 0.677163, 0.025597, 0.735388
+fr606, hba , 0.677451, 0.025924, 0.735111
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
-cs001, lba , 0.598753, 0.072099, 0.797682
-cs001, hba0, 0.598753, 0.072099, 0.797682
-cs001, hba1, 0.598753, 0.072099, 0.797682
-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
-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
-de602, lba , 0.662887, 0.109694, 0.740641
-de602, hba , 0.649782, 0.129703, 0.748973
rs210, lba , 0.605061, 0.071517, 0.792961
rs210, hba , 0.605027, 0.071493, 0.792989
-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
+cs002, lba , 0.598753, 0.072099, 0.797682
+cs002, hba0, 0.598753, 0.072099, 0.797682
+cs002, 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
rs208, lba , 0.601735, 0.072879, 0.795364
rs208, hba , 0.598753, 0.072099, 0.797682
+rs306, lba , 0.598753, 0.072099, 0.797682
+rs306, 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
+ie613, lba , 0.596257, -0.085625, 0.798214
+ie613, hba , 0.596257, -0.085625, 0.798214
+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
se607, lba , 0.530119, 0.108953, 0.840894
se607, hba , 0.529311, 0.111871, 0.841020
-cs005, lba , 0.598753, 0.072099, 0.797682
-cs005, hba0, 0.598753, 0.072099, 0.797682
-cs005, hba1, 0.598753, 0.072099, 0.797682
-pl612, lba , 0.567718, 0.216143, 0.794341
-pl612, hba , 0.556866, 0.265184, 0.787133
-de603, lba , 0.601391, 0.095614, 0.793213
-de603, hba , 0.601456, 0.095645, 0.793160
-pl610, lba , 0.584455, 0.179760, 0.791264
-pl610, hba , 0.584455, 0.179760, 0.791264
+cs006, lba , 0.598753, 0.072099, 0.797682
+cs006, hba0, 0.598753, 0.072099, 0.797682
+cs006, hba1, 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
+rs409, lba , 0.598753, 0.072099, 0.797682
+rs409, hba , 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
de609, lba , 0.582686, 0.102609, 0.806194
de609, hba , 0.583126, 0.102326, 0.805912
-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
+rs205, lba , 0.598753, 0.072099, 0.797682
+rs205, hba , 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
+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
+cs026, lba , 0.598753, 0.072099, 0.797682
+cs026, hba0, 0.598753, 0.072099, 0.797682
+cs026, 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
-cs101, lba , 0.598753, 0.072099, 0.797682
-cs101, hba0, 0.598753, 0.072099, 0.797682
-cs101, hba1, 0.598753, 0.072099, 0.797682
-rs310, lba , 0.601869, 0.064948, 0.795949
-rs310, hba , 0.601934, 0.064739, 0.795917
-rs305, lba , 0.598460, 0.072037, 0.797907
-rs305, hba , 0.598753, 0.072099, 0.797682
+pl610, lba , 0.584455, 0.179760, 0.791264
+pl610, hba , 0.584455, 0.179760, 0.791264
+cs001, lba , 0.598753, 0.072099, 0.797682
+cs001, hba0, 0.598753, 0.072099, 0.797682
+cs001, hba1, 0.598753, 0.072099, 0.797682
+FI609, lba , 0.333971, 0.126638, 0.934037
+FI609, hba , 0.334119, 0.126625, 0.933987
cs401, lba , 0.598753, 0.072099, 0.797682
cs401, hba0, 0.598753, 0.072099, 0.797682
cs401, hba1, 0.598753, 0.072099, 0.797682
@@ -119,11 +85,47 @@ 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
+cs301, lba , 0.598753, 0.072099, 0.797682
+cs301, hba0, 0.598753, 0.072099, 0.797682
+cs301, 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
+cs003, lba , 0.598753, 0.072099, 0.797682
+cs003, hba0, 0.598753, 0.072099, 0.797682
+cs003, 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
+rs307, lba , 0.598753, 0.072099, 0.797682
+rs307, hba , 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
+rs310, lba , 0.601869, 0.064948, 0.795949
+rs310, hba , 0.601934, 0.064739, 0.795917
+rs509, lba , 0.598753, 0.072099, 0.797682
+rs509, hba , 0.598753, 0.072099, 0.797682
+cs031, lba , 0.598753, 0.072099, 0.797682
+cs031, hba0, 0.598753, 0.072099, 0.797682
+cs031, hba1, 0.598753, 0.072099, 0.797682
+pl612, lba , 0.567718, 0.216143, 0.794341
+pl612, hba , 0.556866, 0.265184, 0.787133
+cs302, lba , 0.598753, 0.072099, 0.797682
+cs302, hba0, 0.598753, 0.072099, 0.797682
+cs302, 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
+cs017, lba , 0.598753, 0.072099, 0.797682
+cs017, hba0, 0.598753, 0.072099, 0.797682
+cs017, hba1, 0.598753, 0.072099, 0.797682
+de603, lba , 0.601391, 0.095614, 0.793213
+de603, hba , 0.601456, 0.095645, 0.793160
+pl611, lba , 0.643193, 0.307002, 0.701465
+pl611, hba , 0.590360, 0.217723, 0.777220
+cs201, lba , 0.598753, 0.072099, 0.797682
+cs201, hba0, 0.598753, 0.072099, 0.797682
+cs201, hba1, 0.598753, 0.072099, 0.797682
+rs508, lba , 0.593792, 0.070643, 0.801512
+rs508, hba , 0.593792, 0.070643, 0.801512
diff --git a/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat b/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat
index 7d0b523f582084df4c8e2fac30a9356a84c0b7fe..97297ac7a026d6c7fcc37640fa1c121e15fb6f94 100644
--- a/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat
+++ b/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat
@@ -1,116 +1,82 @@
#
# 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
-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
-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
-pl611, lba , -0.2733681404, -0.7152432670, 0.6431927618, 0.9477993701, -0.0861761283, 0.3070016758, -0.1641530196, 0.6935421717, 0.7014649258
-pl611, hba , -0.2077537076, -0.7799441347, 0.5903605201, 0.9714761732, -0.0939716163, 0.2177231734, -0.1143347798, 0.6187539754, 0.7772200950
-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
+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
+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
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
-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
-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
+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
+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
+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
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
-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
-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
-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
-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
rs210, lba , -0.1188558802, -0.7877090479, 0.6044731058, 0.9929110100, -0.0949071723, 0.0715566554, 0.0010030083, 0.6086929313, 0.7934052618
rs210, hba , -0.1188956411, -0.7880868315, 0.6039726588, 0.9929062998, -0.0949526896, 0.0715616282, 0.0009520516, 0.6081966235, 0.7937858407
-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
+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
+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
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
+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
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
+ie613, lba , -0.0267332400, -0.8023484800, 0.5962568600, 0.9916264900, -0.0966710100, -0.0856249300, 0.1263417800, 0.5889750600, 0.7982143400
+ie613, hba , -0.0267332400, -0.8023484800, 0.5962568600, 0.9916264900, -0.0966710100, -0.0856249300, 0.1263417800, 0.5889750600, 0.7982143400
+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
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
-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
-pl612, lba , -0.2051115812, -0.7972609600, 0.5677184170, 0.9716250122, -0.0960580350, 0.2161427527, -0.1177882629, 0.5959427956, 0.7943413054
-pl612, hba , -0.2337017009, -0.7970471740, 0.5568656188, 0.9594035259, -0.0960322770, 0.2651842309, -0.1578872684, 0.5962328439, 0.7871327755
-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
-pl610, lba , -0.1841550080, -0.7902527719, 0.5844548653, 0.9790917169, -0.0952136531, 0.1797603133, -0.0864080031, 0.6053386794, 0.7912640142
-pl610, hba , -0.1841550080, -0.7902527719, 0.5844548653, 0.9790917169, -0.0952136531, 0.1797603133, -0.0864080031, 0.6053386794, 0.7912640142
+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
+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
+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
+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
de609, lba , -0.1384372791, -0.8008196430, 0.5826860382, 0.9900311803, -0.0964868032, 0.1026087664, -0.0259496026, 0.5910822245, 0.8061937869
de609, hba , -0.1382553622, -0.8005307052, 0.5831260969, 0.9900638564, -0.0964519905, 0.1023258219, -0.0256712897, 0.5914791658, 0.8059115220
-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
+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
+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
+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
+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
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
-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
-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
+pl610, lba , -0.1841550080, -0.7902527719, 0.5844548653, 0.9790917169, -0.0952136531, 0.1797603133, -0.0864080031, 0.6053386794, 0.7912640142
+pl610, hba , -0.1841550080, -0.7902527719, 0.5844548653, 0.9790917169, -0.0952136531, 0.1797603133, -0.0864080031, 0.6053386794, 0.7912640142
+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
+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
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
@@ -119,11 +85,47 @@ cs501, hba0, -0.1195951054, -0.7919544517, 0.5987530018, 0.9928227484, -0.095418
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
+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
+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
+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
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
+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
+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
+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
+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
+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
+pl612, lba , -0.2051115812, -0.7972609600, 0.5677184170, 0.9716250122, -0.0960580350, 0.2161427527, -0.1177882629, 0.5959427956, 0.7943413054
+pl612, hba , -0.2337017009, -0.7970471740, 0.5568656188, 0.9594035259, -0.0960322770, 0.2651842309, -0.1578872684, 0.5962328439, 0.7871327755
+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
+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
+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
+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
+pl611, lba , -0.2733681404, -0.7152432670, 0.6431927618, 0.9477993701, -0.0861761283, 0.3070016758, -0.1641530196, 0.6935421717, 0.7014649258
+pl611, hba , -0.2077537076, -0.7799441347, 0.5903605201, 0.9714761732, -0.0939716163, 0.2177231734, -0.1143347798, 0.6187539754, 0.7772200950
+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
+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
diff --git a/MAC/Deployment/data/Coordinates/make_all_station_file.py b/MAC/Deployment/data/Coordinates/make_all_station_file.py
index b3b27b84ebe9fdf22aee7cc3f2ac15631d914abd..9d0fb231848fb549cd16fb823ccca3a1329e0df6 100755
--- a/MAC/Deployment/data/Coordinates/make_all_station_file.py
+++ b/MAC/Deployment/data/Coordinates/make_all_station_file.py
@@ -52,7 +52,7 @@ def writeAntennaFieldHeader(frame):
return
##
-## write normal vector to antennaField file, in blitz format
+## write normal vector
##
def writeNormalVector(station, anttype):
try:
@@ -71,7 +71,7 @@ def writeNormalVector(station, anttype):
return
##
-## write rotation matrix to antennaField file, in blitz format
+## write rotation matrix
##
def writeRotationMatrix(station, anttype):
try:
@@ -95,7 +95,7 @@ def writeRotationMatrix(station, anttype):
return
##
-## write antenna positions to antennaField file, in blitz format
+## write antenna positions
##
def writeAntennaField(station, anttype, aPos):
@@ -190,11 +190,8 @@ if __name__ == '__main__':
# do something with the data
print 'Making %s-AntennaField.conf with LBA shape=%s HBA shape=%s' %(station, np.shape(aPosL), np.shape(aPosH))
-
aRef = None
-
-
-
+
# write LBA information to AntennaPos.conf
writeNormalVector(station, 'LBA')
writeRotationMatrix(station, 'LBA')
@@ -211,7 +208,6 @@ if __name__ == '__main__':
aOffset = aPosH - [[aRefH,aRefH]]
writeAntennaField(station, '', aOffset)
-
# if core station add also information for HBA0 and HBA1 fields
if station[0] == 'C':
# write information for HBA0
@@ -227,4 +223,3 @@ if __name__ == '__main__':
db1.close()
db2.close()
sys.exit(0)
-
diff --git a/MAC/Deployment/data/Coordinates/make_conf_files.py b/MAC/Deployment/data/Coordinates/make_conf_files.py
index f70c9b5e6800ef9cc853ca634d8cf91b9b172a3e..e542a8aa14e210c1e92cc958a1ac25dd43574b46 100755
--- a/MAC/Deployment/data/Coordinates/make_conf_files.py
+++ b/MAC/Deployment/data/Coordinates/make_conf_files.py
@@ -32,16 +32,18 @@ def print_help():
##
## write hba deltas to a File
+## Use new-style Blitz format (Blits 0.11) for array sizes, e.g. (0,2) x (0,3)
+## For a 3 by 4 array
##
def writeHBADeltas(station,deltas):
filename = '../StaticMetaData/iHBADeltas/%s-iHBADeltas.conf' %(str(station).upper())
f = open(filename,'w')
f.write('#\n')
- f.write('# HBADeltas for %s\n' %(str(station).upper()))
+ f.write('# iHBADeltas for %s\n' %(str(station).upper()))
f.write('# Created: %s\n' %(datetime.now().strftime("%Y-%m-%d %H:%M:%S")))
f.write('#\n')
f.write('HBADeltas\n')
- f.write('%d x %d [\n' %(np.shape(deltas)[0],np.shape(deltas)[1]))
+ f.write('(0,%d) x (0,%d) [\n' %(np.shape(deltas)[0]-1,np.shape(deltas)[1]-1))
for i in range(np.shape(deltas)[0]):
f.write(' ')
for j in range(np.shape(deltas)[1]):
@@ -72,6 +74,8 @@ def writeAntennaFieldHeader(station,frame):
##
## write normal vector to antennaField file, in blitz format
+## Use new-style Blitz format (Blits 0.11) for array sizes, e.g. (0,2) x (0,3)
+## For a 3 by 4 array
##
def writeNormalVector(station, anttype):
try:
@@ -89,9 +93,9 @@ def writeNormalVector(station, anttype):
Shape = np.shape(vector)
Dims = len(Shape)
- dataStr += str(Shape[0])
+ dataStr += '(0,' + str(Shape[0]-1) + ')'
for dim in range(1,Dims):
- dataStr += ' x ' + str(Shape[dim])
+ dataStr += ' x (0,' + str(Shape[dim]-1) + ')'
dataStr += ' [ %10.6f %10.6f %10.6f ]\n' %(vector[0], vector[1], vector[2])
@@ -103,6 +107,8 @@ def writeNormalVector(station, anttype):
##
## write rotation matrix to antennaField file, in blitz format
+## Use new-style Blitz format (Blits 0.11) for array sizes, e.g. (0,2) x (0,3)
+## For a 3 by 4 array
##
def writeRotationMatrix(station, anttype):
try:
@@ -119,9 +125,9 @@ def writeRotationMatrix(station, anttype):
Shape = np.shape(matrix)
Dims = len(Shape)
- dataStr += str(Shape[0])
+ dataStr += '(0,' + str(Shape[0]-1) + ')'
for dim in range(1,Dims):
- dataStr += ' x ' + str(Shape[dim])
+ dataStr += ' x (0,' + str(Shape[dim]-1) + ')'
dataStr += ' [\n'
for row in range(Shape[0]):
@@ -137,6 +143,8 @@ def writeRotationMatrix(station, anttype):
##
## write antenna positions to antennaField file, in blitz format
+## Use new-style Blitz format (Blits 0.11) for array sizes, e.g. (0,2) x (0,3)
+## For a 3 by 4 array
##
def writeAntennaField(station, anttype, aPos):
dataStr = ''
@@ -148,9 +156,9 @@ def writeAntennaField(station, anttype, aPos):
Shape = np.shape(aPos)
Dims = len(Shape)
- dataStr += str(Shape[0])
+ dataStr += '(0,' + str(Shape[0]-1) + ')'
for dim in range(1,Dims):
- dataStr += ' x ' + str(Shape[dim])
+ dataStr += ' x (0,' + str(Shape[dim]-1) + ')'
if Dims == 1:
dataStr += ' [ %10.9f %10.9f %10.3f ]\n' %\
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/IE613-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/IE613-AntennaField.conf
new file mode 100644
index 0000000000000000000000000000000000000000..60f3d86c8d840ff3d583747a8ad6d746348c6604
--- /dev/null
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/IE613-AntennaField.conf
@@ -0,0 +1,227 @@
+#
+# AntennaPositions for IE613
+# ITRF2005 target_date = 2015.5
+# Created: 2017-07-11 14:36:00
+#
+
+NORMAL_VECTOR LBA
+(0,2) [ 0.596257 -0.085625 0.798214 ]
+
+ROTATION_MATRIX LBA
+(0,2) x (0,2) [
+ -0.0267330000 -0.8023480000 0.5962570000
+ 0.9916260000 -0.0966710000 -0.0856250000
+ 0.1263420000 0.5889750000 0.7982140000
+]
+
+LBA
+(0,2) [ 3801633.528060000 -529021.899396000 5076997.185 ]
+(0,95) x (0,1) x (0,2) [
+ -9.760250 -7.876262 6.445900 -9.760250 -7.876262 6.445900
+-10.664460 0.134739 7.980670 -10.664460 0.134739 7.980670
+-12.417900 -6.096347 8.622060 -12.417900 -6.096347 8.622060
+-13.325980 0.714403 10.030970 -13.325980 0.714403 10.030970
+ 12.437190 14.994599 -7.681970 12.437190 14.994599 -7.681970
+ 11.169440 21.023836 -6.088220 11.169440 21.023836 -6.088220
+ 18.977830 13.845680 -12.691000 18.977830 13.845680 -12.691000
+ 18.877250 18.770990 -12.087520 18.877250 18.770990 -12.087520
+-14.165920 -11.065313 9.394790 -14.165920 -11.065313 9.394790
+-14.927220 -18.029444 9.216420 -14.927220 -18.029444 9.216420
+-18.138840 -18.751660 11.537990 -18.138840 -18.751660 11.537990
+-20.102570 -15.569965 13.346180 -20.102570 -15.569965 13.346180
+ 3.041490 3.658406 -1.879530 3.041490 3.658406 -1.879530
+ -1.521910 3.991014 1.564960 -1.521910 3.991014 1.564960
+ -1.747140 7.359291 2.094520 -1.747140 7.359291 2.094520
+ 1.734910 9.694903 -0.255990 1.734910 9.694903 -0.255990
+ -4.107040 9.142251 4.048590 -4.107040 9.142251 4.048590
+ -7.834180 6.910419 6.593320 -7.834180 6.910419 6.593320
+ -6.589270 15.492740 6.584010 -6.589270 15.492740 6.584010
+-10.243230 14.099428 9.164010 -10.243230 14.099428 9.164010
+ 10.357610 -15.983814 -9.451610 10.357610 -15.983814 -9.451610
+ 5.272620 -22.758565 -6.379920 5.272620 -22.758565 -6.379920
+ 14.739190 -23.128162 -13.490980 14.739190 -23.128162 -13.490980
+ 5.753780 -28.423950 -7.347060 5.753780 -28.423950 -7.347060
+ -4.754830 -12.034524 2.260850 -4.754830 -12.034524 2.260850
+ -7.991510 -13.260167 4.547130 -7.991510 -13.260167 4.547130
+ -3.586980 -15.940854 0.969440 -3.586980 -15.940854 0.969440
+ -4.050330 -19.983035 0.881950 -4.050330 -19.983035 0.881950
+ 16.424320 -1.822425 -12.464280 16.424320 -1.822425 -12.464280
+ 19.464880 -0.577631 -14.602010 19.464880 -0.577631 -14.602010
+ 18.140890 -10.436916 -14.670620 18.140890 -10.436916 -14.670620
+ 22.772040 -8.415510 -17.913190 22.772040 -8.415510 -17.913190
+ -5.698320 19.289975 6.325820 -5.698320 19.289975 6.325820
+ -1.348830 23.338769 3.511110 -1.348830 23.338769 3.511110
+ -2.978770 32.860055 5.750010 -2.978770 32.860055 5.750010
+ -7.579790 29.452478 8.821390 -7.579790 29.452478 8.821390
+ 5.857810 0.471990 -4.325090 5.857810 0.471990 -4.325090
+ 6.716590 6.148597 -4.357660 6.716590 6.148597 -4.357660
+ 9.034430 0.103616 -6.737510 9.034430 0.103616 -6.737510
+ 10.205870 3.588440 -7.238740 10.205870 3.588440 -7.238740
+-20.372140 -1.808883 15.023700 -20.372140 -1.808883 15.023700
+-17.959370 7.942819 14.267460 -17.959370 7.942819 14.267460
+-24.653560 3.769704 18.820290 -24.653560 3.769704 18.820290
+-21.061980 13.538086 17.185280 -21.061980 13.538086 17.185280
+ 3.655850 -5.604217 -3.332050 3.655850 -5.604217 -3.332050
+ 6.767160 -6.416204 -5.743270 6.767160 -6.416204 -5.743270
+ 1.966380 -10.027916 -2.544570 1.966380 -10.027916 -2.544570
+ 6.132320 -10.546696 -5.712130 6.132320 -10.546696 -5.712130
+ 7.051980 16.221048 -3.527720 7.051980 16.221048 -3.527720
+ 13.624540 -10.326460 -11.285100 13.624540 -10.326460 -11.285100
+ 11.553400 25.980664 -5.843310 11.553400 25.980664 -5.843310
+ 1.211390 22.127111 1.468680 1.211390 22.127111 1.468680
+ -2.056200 -24.978655 -1.143520 -2.056200 -24.978655 -1.143520
+ 19.711750 -18.214389 -16.678320 19.711750 -18.214389 -16.678320
+ 3.838120 29.137920 0.258600 3.838120 29.137920 0.258600
+ 4.033600 6.897782 -2.273140 4.033600 6.897782 -2.273140
+-22.997920 -8.078418 16.312590 -22.997920 -8.078418 16.312590
+ 1.748400 -19.678333 -3.416950 1.748400 -19.678333 -3.416950
+-10.441300 -15.936000 6.090060 -10.441300 -15.936000 6.090060
+ 24.867380 1.137775 -18.453600 24.867380 1.137775 -18.453600
+ 12.127690 -6.816918 -9.790510 12.127690 -6.816918 -9.790510
+ 3.472580 -16.362692 -4.349220 3.472580 -16.362692 -4.349220
+-14.779600 6.502378 11.737690 -14.779600 6.502378 11.737690
+ -4.913100 2.465211 3.934460 -4.913100 2.465211 3.934460
+ 9.066050 11.022894 -5.589820 9.066050 11.022894 -5.589820
+ -5.160000 -4.469774 3.374980 -5.160000 -4.469774 3.374980
+ 18.611010 4.999073 -13.365960 18.611010 4.999073 -13.365960
+ 13.008500 1.446955 -9.561990 13.008500 1.446955 -9.561990
+ -8.272300 -21.864609 3.833880 -8.272300 -21.864609 3.833880
+-10.956930 -22.338289 5.788460 -10.956930 -22.338289 5.788460
+ -0.831240 -4.638645 0.123330 -0.831240 -4.638645 0.123330
+-16.595550 -2.098006 12.171620 -16.595550 -2.098006 12.171620
+ 9.468280 -4.673100 -7.573990 9.468280 -4.673100 -7.573990
+ 0.762360 17.016200 1.255850 0.762360 17.016200 1.255850
+ 11.493400 9.395298 -7.577610 11.493400 9.395298 -7.577610
+ 6.459050 27.824143 -1.840140 6.459050 27.824143 -1.840140
+ -3.728990 -8.583160 1.864780 -3.728990 -8.583160 1.864780
+ 9.427160 -10.910775 -8.212390 9.427160 -10.910775 -8.212390
+-16.977920 -9.800423 11.631010 -16.977920 -9.800423 11.631010
+-14.808860 15.559924 12.731160 -14.808860 15.559924 12.731160
+-10.976950 9.367078 9.204450 -10.976950 9.367078 9.204450
+ 7.541920 20.531061 -3.431360 7.541920 20.531061 -3.431360
+ -3.999710 13.581258 4.444600 -3.999710 13.581258 4.444600
+ -3.659390 -1.251703 2.599250 -3.659390 -1.251703 2.599250
+ 14.364400 -18.033937 -12.664560 14.364400 -18.033937 -12.664560
+ 3.767880 -2.056027 -3.035120 3.767880 -2.056027 -3.035120
+ 24.433380 11.891518 -16.975850 24.433380 11.891518 -16.975850
+ 17.422500 7.969748 -12.159490 17.422500 7.969748 -12.159490
+ -7.450270 3.538379 5.944820 -7.450270 3.538379 5.944820
+-16.231710 22.953311 14.587100 -16.231710 22.953311 14.587100
+ -7.937500 -5.022292 5.390470 -7.937500 -5.022292 5.390470
+ -0.198450 -27.095698 -2.758340 -0.198450 -27.095698 -2.758340
+ -9.498550 20.425850 9.286390 -9.498550 20.425850 9.286390
+ -0.897360 -8.097738 -0.198340 -0.897360 -8.097738 -0.198340
+ 0.813230 -13.295648 -2.033710 0.813230 -13.295648 -2.033710
+ 2.078570 13.100883 -0.147340 2.078570 13.100883 -0.147340
+]
+
+NORMAL_VECTOR HBA
+(0,2) [ 0.596257 -0.085625 0.798214 ]
+
+ROTATION_MATRIX HBA
+(0,2) x (0,2) [
+ -0.0267330000 -0.8023480000 0.5962570000
+ 0.9916260000 -0.0966710000 -0.0856250000
+ 0.1263420000 0.5889750000 0.7982140000
+]
+
+HBA
+(0,2) [ 3801691.943300000 -528983.966429000 5076957.924 ]
+(0,95) x (0,1) x (0,2) [
+-11.012710 23.071660 10.749460 -11.012710 23.071660 10.749460
+ -6.915650 24.101365 7.803410 -6.915650 24.101365 7.803410
+ -2.818570 25.130078 4.857230 -2.818570 25.130078 4.857230
+ 1.277720 26.158694 1.911640 1.277720 26.158694 1.911640
+ 5.374780 27.188399 -1.034410 5.374780 27.188399 -1.034410
+-14.545460 17.016786 12.723710 -14.545460 17.016786 12.723710
+-10.449210 18.046394 9.778250 -10.449210 18.046394 9.778250
+ -6.352120 19.075108 6.832070 -6.352120 19.075108 6.832070
+ -2.255030 20.103821 3.885890 -2.255030 20.103821 3.885890
+ 1.842030 21.133525 0.939840 1.842030 21.133525 0.939840
+ 5.938310 22.162142 -2.005750 5.938310 22.162142 -2.005750
+ 10.035400 23.190855 -4.951920 10.035400 23.190855 -4.951920
+-18.079020 10.961816 14.698550 -18.079020 10.961816 14.698550
+-13.981960 11.991520 11.752500 -13.981960 11.991520 11.752500
+ -9.884870 13.020233 8.806320 -9.884870 13.020233 8.806320
+ -5.788590 14.048850 5.860730 -5.788590 14.048850 5.860730
+ -1.691500 15.077563 2.914550 -1.691500 15.077563 2.914550
+ 2.405560 16.107269 -0.031490 2.405560 16.107269 -0.031490
+ 6.502650 17.135981 -2.977670 6.502650 17.135981 -2.977670
+ 10.599730 18.164694 -5.923850 10.599730 18.164694 -5.923850
+ 14.695990 19.194303 -8.869310 14.695990 19.194303 -8.869310
+-21.611770 4.906942 16.672800 -21.611770 4.906942 16.672800
+-17.515490 5.935559 13.727210 -17.515490 5.935559 13.727210
+-13.418420 6.965263 10.781160 -13.418420 6.965263 10.781160
+ -9.321340 7.993976 7.834980 -9.321340 7.993976 7.834980
+ -5.224250 9.022690 4.888810 -5.224250 9.022690 4.888810
+ -1.127190 10.052394 1.942760 -1.127190 10.052394 1.942760
+ 2.969090 11.081011 -1.002830 2.969090 11.081011 -1.002830
+ 7.066180 12.109724 -3.949010 7.066180 12.109724 -3.949010
+ 11.163240 13.139429 -6.895060 11.163240 13.139429 -6.895060
+ 15.260330 14.168142 -9.841240 15.260330 14.168142 -9.841240
+ 19.356610 15.196759 -12.786830 19.356610 15.196759 -12.786830
+-21.048240 -0.119316 15.701460 -21.048240 -0.119316 15.701460
+-16.951180 0.910390 12.755410 -16.951180 0.910390 12.755410
+-12.854890 1.939006 9.809820 -12.854890 1.939006 9.809820
+ -8.757810 2.967719 6.863650 -8.757810 2.967719 6.863650
+ -4.660750 3.997424 3.917600 -4.660750 3.997424 3.917600
+ -0.563660 5.026137 0.971420 -0.563660 5.026137 0.971420
+ 3.533430 6.054851 -1.974760 3.533430 6.054851 -1.974760
+ 7.629690 7.084458 -4.920220 7.629690 7.084458 -4.920220
+ 11.726770 8.113171 -7.866400 11.726770 8.113171 -7.866400
+ 15.823860 9.141885 -10.812570 15.823860 9.141885 -10.812570
+ 19.920920 10.171590 -13.758620 19.920920 10.171590 -13.758620
+-20.484700 -5.145573 14.730120 -20.484700 -5.145573 14.730120
+-16.387640 -4.115868 11.784070 -16.387640 -4.115868 11.784070
+-12.290560 -3.087155 8.837900 -12.290560 -3.087155 8.837900
+ -8.193470 -2.058442 5.891720 -8.193470 -2.058442 5.891720
+ -4.097210 -1.028833 2.946260 -4.097210 -1.028833 2.946260
+ 4.096960 1.028594 -2.946100 4.096960 1.028594 -2.946100
+ 8.194020 2.058298 -5.892150 8.194020 2.058298 -5.892150
+ 12.291110 3.087011 -8.838320 12.291110 3.087011 -8.838320
+ 16.387390 4.115628 -11.783910 16.387390 4.115628 -11.783910
+ 20.484450 5.145332 -14.729960 20.484450 5.145332 -14.729960
+-19.920390 -10.170742 13.758320 -19.920390 -10.170742 13.758320
+-15.824110 -9.142125 10.812740 -15.824110 -9.142125 10.812740
+-11.727020 -8.113412 7.866560 -11.727020 -8.113412 7.866560
+ -7.629960 -7.083707 4.920510 -7.629960 -7.083707 4.920510
+ -3.532880 -6.054994 1.974330 -3.532880 -6.054994 1.974330
+ 0.563410 -5.026377 -0.971260 0.563410 -5.026377 -0.971260
+ 4.660470 -3.996672 -3.917310 4.660470 -3.996672 -3.917310
+ 8.757550 -2.967959 -6.863480 8.757550 -2.967959 -6.863480
+ 12.854640 -1.939246 -9.809660 12.854640 -1.939246 -9.809660
+ 16.951700 -0.909541 -12.755710 16.951700 -0.909541 -12.755710
+ 21.047990 0.119075 -15.701300 21.047990 0.119075 -15.701300
+-19.356860 -15.196999 12.786990 -19.356860 -15.196999 12.786990
+-15.259780 -14.168285 9.840810 -15.259780 -14.168285 9.840810
+-11.163520 -13.138678 6.895350 -11.163520 -13.138678 6.895350
+ -7.066430 -12.109964 3.949170 -7.066430 -12.109964 3.949170
+ -2.969330 -11.081251 1.002990 -2.969330 -11.081251 1.002990
+ 1.127730 -10.051547 -1.943060 1.127730 -10.051547 -1.943060
+ 5.224810 -9.022833 -4.889230 5.224810 -9.022833 -4.889230
+ 9.321100 -7.994216 -7.834820 9.321100 -7.994216 -7.834820
+ 13.418180 -6.965503 -10.781000 13.418180 -6.965503 -10.781000
+ 17.515240 -5.935798 -13.727050 17.515240 -5.935798 -13.727050
+ 21.612330 -4.907085 -16.673230 21.612330 -4.907085 -16.673230
+-14.696230 -19.194543 8.869470 -14.696230 -19.194543 8.869470
+-10.599170 -18.164838 5.923420 -10.599170 -18.164838 5.923420
+ -6.502090 -17.136124 2.977240 -6.502090 -17.136124 2.977240
+ -2.405800 -16.107508 0.031660 -2.405800 -16.107508 0.031660
+ 1.691260 -15.077804 -2.914390 1.691260 -15.077804 -2.914390
+ 5.788340 -14.049090 -5.860570 5.788340 -14.049090 -5.860570
+ 9.885430 -13.020377 -8.806750 9.885430 -13.020377 -8.806750
+ 13.981690 -11.990768 -11.752210 13.981690 -11.990768 -11.752210
+ 18.078780 -10.962055 -14.698390 18.078780 -10.962055 -14.698390
+-10.035640 -23.191095 4.952080 -10.035640 -23.191095 4.952080
+ -5.938550 -22.162382 2.005910 -5.938550 -22.162382 2.005910
+ -1.841490 -21.132677 -0.940140 -1.841490 -21.132677 -0.940140
+ 2.254790 -20.104061 -3.885730 2.254790 -20.104061 -3.885730
+ 6.351880 -19.075347 -6.831910 6.351880 -19.075347 -6.831910
+ 10.448940 -18.045643 -9.777960 10.448940 -18.045643 -9.777960
+ 14.546020 -17.016929 -12.724140 14.546020 -17.016929 -12.724140
+ -5.375050 -27.187647 1.034700 -5.375050 -27.187647 1.034700
+ -1.277960 -26.158934 -1.911480 -1.277960 -26.158934 -1.911480
+ 2.819130 -25.130221 -4.857660 2.819130 -25.130221 -4.857660
+ 6.916210 -24.101508 -7.803840 6.916210 -24.101508 -7.803840
+ 11.012470 -23.071900 -10.749300 11.012470 -23.071900 -10.749300
+]
diff --git a/MAC/Deployment/data/StaticMetaData/PVSSnumbers.dat b/MAC/Deployment/data/StaticMetaData/PVSSnumbers.dat
index 24320d97b564ccdd7fcfae4b9ab71a5644808567..8101e1de04aab614f5c549b0125af3a826e7ebc7 100644
--- a/MAC/Deployment/data/StaticMetaData/PVSSnumbers.dat
+++ b/MAC/Deployment/data/StaticMetaData/PVSSnumbers.dat
@@ -141,6 +141,7 @@ DE609 210
PL610 211
PL611 212
PL612 213
+IE613 214
#
# Test Systems
diff --git a/MAC/Deployment/data/StaticMetaData/RSPBlet.dat b/MAC/Deployment/data/StaticMetaData/RSPBlet.dat
index d9dd3b4d008284ea78e60c21b0bd8742fcb7a779..7c1983eab83db5fc418c9c42079880ca819d45b1 100644
--- a/MAC/Deployment/data/StaticMetaData/RSPBlet.dat
+++ b/MAC/Deployment/data/StaticMetaData/RSPBlet.dat
@@ -60,5 +60,6 @@ DE609 0 1 2 3
PL610 0 1 2 3
PL611 0 1 2 3
PL612 0 1 2 3
+IE613 0 1 2 3
FI609 0 1 2 3
RS511 0 1 2 3
diff --git a/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat b/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat
index 8b820e8011609889ab03e07ab2a03c0fdd676c2f..f4a25802cdb14070b414d3e7f106ff8df7b42e7c 100644
--- a/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat
+++ b/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat
@@ -178,3 +178,6 @@ PL610 RSP_0 cbt003-10GB04 10.220.11.103 A0:36:9F:1F:7B:42
PL611 RSP_0 cbt004-10GB04 10.220.41.104 A0:36:9F:1F:7A:06
PL612 RSP_0 cbt005-10GB04 10.220.61.105 A0:36:9F:1F:79:E2
+
+# TO BE ADAPTED!
+IE613 RSP_0 cbt005-10GB04 10.220.61.105 A0:36:9F:1F:79:E2
diff --git a/MAC/Deployment/data/StaticMetaData/RSPConnections_local.dat b/MAC/Deployment/data/StaticMetaData/RSPConnections_local.dat
index 61454dd00f0b52b6f54b69b09336f21384bce1cc..27f5bb66ca09145c25d78c525efc78642d40a02a 100644
--- a/MAC/Deployment/data/StaticMetaData/RSPConnections_local.dat
+++ b/MAC/Deployment/data/StaticMetaData/RSPConnections_local.dat
@@ -72,4 +72,9 @@ PL611_03 10.170.0.30 00:12:F2:C6:BB:00 R00-BG1-PL611
PL612_00 10.170.0.30 90:1B:0E:60:33:F4 LOFARPL612_1
PL612_01 10.170.0.30 90:1B:0E:60:33:F4 LOFARPL612_1
PL612_02 10.170.0.30 90:1B:0E:60:33:F4 LOFARPL612_1
-PL612_03 10.170.0.30 90:1B:0E:60:33:F4 LOFARPL612_1
\ No newline at end of file
+PL612_03 10.170.0.30 90:1B:0E:60:33:F4 LOFARPL612_1
+
+IE613_00 10.170.0.30 90:1B:0E:60:33:F4 R00-BG1-IE613
+IE613_00 10.170.0.30 90:1B:0E:60:33:F4 R00-BG1-IE613
+IE613_00 10.170.0.30 90:1B:0E:60:33:F4 R00-BG1-IE613
+IE613_00 10.170.0.30 90:1B:0E:60:33:F4 R00-BG1-IE613
diff --git a/MAC/Deployment/data/StaticMetaData/RSPImage.conf b/MAC/Deployment/data/StaticMetaData/RSPImage.conf
index 12ddc1f6c3c3daebb38397f215149e3642f245b3..7f94f57f57481a0f909891b7b1fe6dca930309af 100644
--- a/MAC/Deployment/data/StaticMetaData/RSPImage.conf
+++ b/MAC/Deployment/data/StaticMetaData/RSPImage.conf
@@ -58,3 +58,4 @@ FI609 4
PL610 4
PL611 4
PL612 4
+IE613 4
diff --git a/MAC/Deployment/data/StaticMetaData/StationAttenuation.dat b/MAC/Deployment/data/StaticMetaData/StationAttenuation.dat
index d4f6462324eb54b2f2d3361588f9670da1d796e4..077c3b3a93b26ddbb61176f1908941d0d2fd419b 100644
--- a/MAC/Deployment/data/StaticMetaData/StationAttenuation.dat
+++ b/MAC/Deployment/data/StaticMetaData/StationAttenuation.dat
@@ -64,6 +64,7 @@ DE609 0.25 0.0 0.0 0.0 0.0 4.0 4.0 4.0
PL610 0.25 0.0 0.0 0.0 0.0 0.0 0.0 0.0
PL611 0.25 0.0 0.0 0.0 0.0 0.0 0.0 0.0
PL612 0.25 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+IE613 0.25 0.0 0.0 0.0 0.0 0.0 0.0 0.0
FI609 0.25 0.0 0.0 0.0 0.0 0.0 0.0 0.0
RS511 0.25 0.0 0.0 0.0 0.0 0.0 0.0 0.0
diff --git a/MAC/Deployment/data/StaticMetaData/StationInfo.dat b/MAC/Deployment/data/StaticMetaData/StationInfo.dat
index 018a86900e8fb5d44b33c67f0b7751c56f8f12c6..cf0b9d7040b836d8fb2344e1e594bbab8bbfa0e4 100644
--- a/MAC/Deployment/data/StaticMetaData/StationInfo.dat
+++ b/MAC/Deployment/data/StaticMetaData/StationInfo.dat
@@ -199,6 +199,8 @@ PL610 211 E 17.0741606 52.2759328 122.29 24 12 96 96
PL611 212 E 20.4896131 49.9649386 305.42 24 12 96 48 2 No No No
# Baldy
PL612 213 E 20.5897506 53.5939042 178.38 24 12 96 96 2 No No No
+# Birr
+IE613 214 E -7.915542 53.095319 100 24 12 96 96 2 No No No
## Non-ILT international
## 900
@@ -208,7 +210,7 @@ FI609 901 E 20.7609103 69.0714225 533.25 12 6 48 48 1
## Test systems
# name ID ring long lat height nrRSP nrTBB nrLBA nrHBA nrPowec HBAsplit LBAcal Aartfaac
#----------------------------------------------------------------------------------------------------------------
-CS100 230 C 6.3952067 52.8121013 0 6 12 4 4 1 Yes No No
+#CS100 230 C 6.3952067 52.8121013 0 6 12 4 4 1 Yes No No
#MCU099 231
#CCU099 232
-RS511 301 R 6.7852089 53.4093164 51.53 12 6 96 48 1 No Yes No
+#RS511 301 R 6.7852089 53.4093164 51.53 12 6 96 48 1 No Yes No
diff --git a/MAC/Deployment/data/StaticMetaData/TBBConnections.dat b/MAC/Deployment/data/StaticMetaData/TBBConnections.dat
index ff258474a6858243669a134ad291db760456983c..07c4b7193b166664f17ca1084ea63c66c3ce3158 100644
--- a/MAC/Deployment/data/StaticMetaData/TBBConnections.dat
+++ b/MAC/Deployment/data/StaticMetaData/TBBConnections.dat
@@ -93,6 +93,7 @@ DE609 TBB_0 locus081
PL610 TBB_0 locus082
PL611 TBB_0 locus083
PL612 TBB_0 locus084
+IE613 TBB_0 locus085
# Non-ILT Stations (for completeness)
FI609 TBB_0 locus081
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/IE613-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/IE613-iHBADeltas.conf
new file mode 100644
index 0000000000000000000000000000000000000000..65b8c278186d2bb9fa306b104e7fb32229a8e83c
--- /dev/null
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/IE613-iHBADeltas.conf
@@ -0,0 +1,23 @@
+#
+# iHBADeltas for IE613
+# Created: 2017-07-11 14:36:00
+#
+HBADeltas
+(0,15) x (0,2) [
+ -1.454 -2.041 0.867
+ -1.488 -0.801 1.025
+ -1.521 0.439 1.183
+ -1.555 1.678 1.341
+ -0.451 -1.920 0.131
+ -0.485 -0.680 0.289
+ -0.518 0.559 0.447
+ -0.552 1.799 0.605
+ 0.552 -1.799 -0.605
+ 0.518 -0.559 -0.447
+ 0.485 0.680 -0.289
+ 0.451 1.920 -0.131
+ 1.555 -1.678 -1.341
+ 1.521 -0.439 -1.183
+ 1.488 0.801 -1.025
+ 1.454 2.041 -0.867
+]
diff --git a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationPositions.parset b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationPositions.parset
index 9f9e17c0c40abbbb58669c35a7050fd0153cdec7..cac9c4d78a3dd569dd5e0818fc33e64541c9d276 100644
--- a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationPositions.parset
+++ b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationPositions.parset
@@ -148,6 +148,9 @@ PIC.Core.DE609HBA.phaseCenter = [3727217.673, 655109.175, 5117003.123]
PIC.Core.FR606LBA.phaseCenter = [4323979.809, 165608.773, 4670303.094]
PIC.Core.FR606HBA.phaseCenter = [4324016.708, 165545.525, 4670271.363]
+PIC.Core.IE613LBA.phaseCenter = [3801633.528, -529021.899, 5076997.185]
+PIC.Core.IE613HBA.phaseCenter = [3801691.943, -528983.966, 5076957.924]
+
PIC.Core.PL610LBA.phaseCenter = [3738425.932, 1148187.176, 5021750.597]
PIC.Core.PL610HBA.phaseCenter = [3738462.416, 1148244.316, 5021710.658]
diff --git a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset
index a300bea9bc7a9c69fcc459a6fc15a00398fa2141..609c155de742b6d325935b36798e2babb6ee0e67 100644
--- a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset
+++ b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset
@@ -219,6 +219,10 @@ PIC.Core.FR606HBA.RSP.ports = [udp:10.211.1.105:16060, udp:10.212.1.105:1606
PIC.Core.FR606HBA.RSP.receiver = cbt005_1
PIC.Core.FR606LBA.RSP.ports = [udp:10.211.1.105:16060, udp:10.212.1.105:16061, udp:10.213.1.105:16062, udp:10.214.1.105:16063]
PIC.Core.FR606LBA.RSP.receiver = cbt005_1
+PIC.Core.IE613HBA.RSP.ports = [udp:10.220.61.105:16130, udp:10.220.61.105:16131, udp:10.220.61.105:16132, udp:10.220.61.105:16133]
+PIC.Core.IE613HBA.RSP.receiver = cbt005_1
+PIC.Core.IE613LBA.RSP.ports = [udp:10.220.61.105:16130, udp:10.220.61.105:16131, udp:10.220.61.105:16132, udp:10.220.61.105:16133]
+PIC.Core.IE613LBA.RSP.receiver = cbt005_1
PIC.Core.PL610HBA.RSP.ports = [udp:10.220.11.103:16100, udp:10.220.11.103:16101, udp:10.220.11.103:16102, udp:10.220.11.103:16103]
PIC.Core.PL610HBA.RSP.receiver = cbt003_1
PIC.Core.PL610LBA.RSP.ports = [udp:10.220.11.103:16100, udp:10.220.11.103:16101, udp:10.220.11.103:16102, udp:10.220.11.103:16103]
diff --git a/RTCP/Cobalt/GPUProc/src/scripts/cobalt_functions.sh b/RTCP/Cobalt/GPUProc/src/scripts/cobalt_functions.sh
index bab31a064e8905cf75520541d4a3aa41ecc37367..7c1c348a04aafdbe52c479b37529a6b1a5e7187a 100755
--- a/RTCP/Cobalt/GPUProc/src/scripts/cobalt_functions.sh
+++ b/RTCP/Cobalt/GPUProc/src/scripts/cobalt_functions.sh
@@ -73,8 +73,8 @@ function read_cluster_model {
SLURM_PARTITION=lofarobs # NOTE: sinfo (without -a) only displays this partition for members of the lofarsys group (+ slurm,root)
COMPUTENODES="`ssh $HEADNODE sinfo --responding --states=idle,mixed,alloc --format=%n-ib.dragnet.infiniband.lofar,%T --noheader --partition=$SLURM_PARTITION --sort=N | fgrep -v ,draining | cut -f1 -d,`"
if [ -z "$COMPUTENODES" ]; then
- echo "ERROR: Could not obtain list of available DRAGNET nodes. Defaulting to drg01 - drg20 -ib.dragnet.infiniband.lofar"
- COMPUTENODES="`seq -f "drg%02-ib.dragnet.infiniband.lofar" 1 20`"
+ echo "ERROR: Could not obtain list of available DRAGNET nodes. Defaulting to drg01 - drg23 -ib.dragnet.infiniband.lofar"
+ COMPUTENODES=`seq -f drg%02.0f-ib.dragnet.infiniband.lofar 1 23`
fi
COMPUTENODES=$(echo $COMPUTENODES | sed -e s/dragproc-ib.dragnet.infiniband.lofar/dragproc-10g.online.lofar/g) # dragproc has no infiniband i/f, so use 10g
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/CMakeLists.txt b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/CMakeLists.txt
index def97c594aeb5b88dc0458387ca87b05ac01a067..d0443398bad2a8ca891f2d43956776ce0dcfcf8e 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/CMakeLists.txt
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb/sql/CMakeLists.txt
@@ -5,7 +5,8 @@ set(sql_files add_notifications.sql
add_resource_allocation_statics.sql
add_virtual_instrument.sql
create_database.sql
- create_and_populate_database.sql)
+ create_and_populate_database.sql
+ README)
install_files(/share/radb/sql FILES ${sql_files})
diff --git a/SubSystems/Online_Cobalt/test/tstartBGL.run b/SubSystems/Online_Cobalt/test/tstartBGL.run
index 9f38eb2fc70bf47b092fd0cea5389af9131838ee..800d5ddf1ce40e3ef64363c4cca5fea5357d2ff4 100755
--- a/SubSystems/Online_Cobalt/test/tstartBGL.run
+++ b/SubSystems/Online_Cobalt/test/tstartBGL.run
@@ -63,10 +63,11 @@ echo "Cobalt.FinalMetaDataGatherer.host=localhost" >> tstartBGL.in_parset
for cluster in CEP4 DRAGNET; do # all in cobalt_functions.sh as used by runObservation.sh
echo "Testing with storageClusterName $cluster"
echo "Observation.DataProducts.Output_Correlated.storageClusterName=$cluster" >> tstartBGL.in_parset
- startBGL.sh 1 2 3 tstartBGL.in_parset 1000 || error "startBGL.sh failed"
+ nice -n 5 startBGL.sh 1 2 3 tstartBGL.in_parset 1000 || error "startBGL.sh failed"
# PID file is created by runObservation.sh, which is started in the background. Although the PID file
# is created almost immediately, we may be too fast if we check without waiting.
+ # Used 'nice -n 5' to dramatically increase the chance that we check before the pid file is removed again.
sleep 1
[ -e $LOFARROOT/var/run/rtcp-1000.pid ] || error "Found no $LOFARROOT/var/run/rtcp-1000.pid"