Skip to content
Snippets Groups Projects
Commit 95c34dfd authored by Auke Klazema's avatar Auke Klazema
Browse files

Task #10986: Merge trunk into task branch

parents 28e047ff f896fd1d
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 491 additions and 233 deletions
.gitattributes
+ 2
− 0
View file @ 95c34dfd
......@@ -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
......
MAC/APL/APLCommon/src/swlevel
+ 14
− 11
View file @ 95c34dfd
......@@ -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
......
MAC/APL/RTDBCommon/include/APL/RTDBCommon/RTDButilities.h
+ 1
− 0
View file @ 95c34dfd
......@@ -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
};
......
MAC/APL/RTDBCommon/src/RTDButilities.cc
+ 6
− 5
View file @ 95c34dfd
......@@ -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
......
MAC/APL/RTDBCommon/src/setObjectState.cc
+ 1
− 0
View file @ 95c34dfd
......@@ -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);
}
......
MAC/Deployment/data/Coordinates/CoordMenu.py
+ 1
− 1
View file @ 95c34dfd
......@@ -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()
......
MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql
+ 3
− 2
View file @ 95c34dfd
......@@ -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');
MAC/Deployment/data/Coordinates/data/normal_vectors.dat
+ 99
− 97
View file @ 95c34dfd
#
# 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
MAC/Deployment/data/Coordinates/make_all_station_file.py
+ 4
− 9
View file @ 95c34dfd
......@@ -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)
MAC/Deployment/data/Coordinates/make_conf_files.py
+ 16
− 8
View file @ 95c34dfd
......@@ -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' %\
......
MAC/Deployment/data/StaticMetaData/AntennaFields/IE613-AntennaField.conf 0 → 100644
+ 227
− 0
View file @ 95c34dfd
#
# 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
]
MAC/Deployment/data/StaticMetaData/PVSSnumbers.dat
+ 1
− 0
View file @ 95c34dfd
......@@ -141,6 +141,7 @@ DE609 210
PL610 211
PL611 212
PL612 213
IE613 214
#
# Test Systems
......
MAC/Deployment/data/StaticMetaData/RSPBlet.dat
+ 1
− 0
View file @ 95c34dfd
......@@ -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
MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat
+ 3
− 0
View file @ 95c34dfd
......@@ -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
MAC/Deployment/data/StaticMetaData/RSPConnections_local.dat
+ 6
− 1
View file @ 95c34dfd
......@@ -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
MAC/Deployment/data/StaticMetaData/RSPImage.conf
+ 1
− 0
View file @ 95c34dfd
......@@ -58,3 +58,4 @@ FI609 4
PL610 4
PL611 4
PL612 4
IE613 4
MAC/Deployment/data/StaticMetaData/StationAttenuation.dat
+ 1
− 0
View file @ 95c34dfd
......@@ -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
......
MAC/Deployment/data/StaticMetaData/StationInfo.dat
+ 4
− 2
View file @ 95c34dfd
......@@ -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
MAC/Deployment/data/StaticMetaData/TBBConnections.dat
+ 1
− 0
View file @ 95c34dfd
......@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment