diff --git a/.gitattributes b/.gitattributes
index 71c98d3d1eead474227b3501486456902c596562..d6f6bfbf3b1d50bd0151a860a9fa166021650fdd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2534,7 +2534,7 @@ MAC/Deployment/data/Coordinates/ETRF_FILES/DE603/de603-antenna-positions-etrs.cs
MAC/Deployment/data/Coordinates/ETRF_FILES/DE604/de604-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/DE605/de605-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/DE609/de609-antenna-positions-etrs.csv -text
-MAC/Deployment/data/Coordinates/ETRF_FILES/FI609/FI609-antenna-positions-etrs.csv -text
+MAC/Deployment/data/Coordinates/ETRF_FILES/FI901/FI901-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/FR606/fr606-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/IE613/ie613-antenna-positions-etrs.csv -text
MAC/Deployment/data/Coordinates/ETRF_FILES/PL610/pl610-antenna-positions-etrs.csv -text
@@ -2639,8 +2639,8 @@ MAC/Deployment/data/Coordinates/vectors-and-matrices/DE605/de605-hba-solution.li
MAC/Deployment/data/Coordinates/vectors-and-matrices/DE605/de605-lba-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/DE609/de609-hba-final.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/DE609/de609-lba-final.lisp -text
-MAC/Deployment/data/Coordinates/vectors-and-matrices/FI609/FI609-hba-solution.lisp -text
-MAC/Deployment/data/Coordinates/vectors-and-matrices/FI609/FI609-lba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/FI901/FI901-hba-solution.lisp -text
+MAC/Deployment/data/Coordinates/vectors-and-matrices/FI901/FI901-lba-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/FR606/fr606-hba-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/FR606/fr606-lba-solution.lisp -text
MAC/Deployment/data/Coordinates/vectors-and-matrices/IE613/ie613-hba-solution.lisp -text
@@ -3031,7 +3031,7 @@ MAC/Deployment/data/StaticMetaData/AntennaFields/DE603-AntennaField.conf -text
MAC/Deployment/data/StaticMetaData/AntennaFields/DE604-AntennaField.conf -text
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/FI901-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
@@ -3087,7 +3087,7 @@ MAC/Deployment/data/StaticMetaData/CableDelays/DE603-CableDelays.conf -text
MAC/Deployment/data/StaticMetaData/CableDelays/DE604-CableDelays.conf -text
MAC/Deployment/data/StaticMetaData/CableDelays/DE605-CableDelays.conf -text
MAC/Deployment/data/StaticMetaData/CableDelays/DE609-CableDelays.conf -text
-MAC/Deployment/data/StaticMetaData/CableDelays/FI609-CableDelays.conf -text
+MAC/Deployment/data/StaticMetaData/CableDelays/FI901-CableDelays.conf -text
MAC/Deployment/data/StaticMetaData/CableDelays/FR606-CableDelays.conf -text
MAC/Deployment/data/StaticMetaData/CableDelays/IE613-CableDelays.conf -text
MAC/Deployment/data/StaticMetaData/CableDelays/PL610-CableDelays.conf -text
@@ -3124,7 +3124,6 @@ MAC/Deployment/data/StaticMetaData/RSPConnections_test.dat -text
MAC/Deployment/data/StaticMetaData/RSPDriver.conf.test -text
MAC/Deployment/data/StaticMetaData/RemoteStation.conf.test -text
MAC/Deployment/data/StaticMetaData/SourceCatalog.conf -text
-MAC/Deployment/data/StaticMetaData/StaticMetaData -text
MAC/Deployment/data/StaticMetaData/StationAttenuation.dat -text
MAC/Deployment/data/StaticMetaData/StationInfo.dat -text
MAC/Deployment/data/StaticMetaData/Storage+MAC.dat -text
@@ -3164,7 +3163,7 @@ MAC/Deployment/data/StaticMetaData/iHBADeltas/DE603-iHBADeltas.conf -text
MAC/Deployment/data/StaticMetaData/iHBADeltas/DE604-iHBADeltas.conf -text
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/FI901-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
diff --git a/LCU/PPSTune/ppstune/ppstune.py b/LCU/PPSTune/ppstune/ppstune.py
index 6c4da0f69c9559100fea93f1002eb386644aaa2f..0301f5cae194c83cd6b574f8596d9e412f265460 100755
--- a/LCU/PPSTune/ppstune/ppstune.py
+++ b/LCU/PPSTune/ppstune/ppstune.py
@@ -1385,7 +1385,7 @@ def rsp_boards_in_station(remote_station_conf='/opt/lofar/etc/RemoteStation.conf
station = station_name()
if is_nl(station):
return 12
- elif station.upper() == 'FI609':
+ elif station.upper() == 'FI901':
return 12
else:
return 24
diff --git a/MAC/Deployment/data/Coordinates/ETRF_FILES/FI609/FI609-antenna-positions-etrs.csv b/MAC/Deployment/data/Coordinates/ETRF_FILES/FI901/FI901-antenna-positions-etrs.csv
similarity index 100%
rename from MAC/Deployment/data/Coordinates/ETRF_FILES/FI609/FI609-antenna-positions-etrs.csv
rename to MAC/Deployment/data/Coordinates/ETRF_FILES/FI901/FI901-antenna-positions-etrs.csv
diff --git a/MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql b/MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql
index 9ae27620e18c53e19e78cd32052c6e05dbc4502e..16c108c77d572c328b69669f9ec4313b91d6de82 100644
--- a/MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql
+++ b/MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql
@@ -204,7 +204,7 @@ INSERT INTO station VALUES ('DE609', 'Norderstedt');
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 ('FI901', 'Kaira');
INSERT INTO station VALUES ('PL610', 'Borowiec');
INSERT INTO station VALUES ('PL611', 'Lazy');
INSERT INTO station VALUES ('PL612', 'Baldy');
diff --git a/MAC/Deployment/data/Coordinates/data/hba-rotations.csv b/MAC/Deployment/data/Coordinates/data/hba-rotations.csv
index 1b084c06f45e7027dd9117d3e6da4cb95e4152dc..731e9ae24f45de61837b7c55c4cd7c34fcedfd46 100644
--- a/MAC/Deployment/data/Coordinates/data/hba-rotations.csv
+++ b/MAC/Deployment/data/Coordinates/data/hba-rotations.csv
@@ -54,7 +54,7 @@ DE609,44,
FR606,80,
SE607,20,
UK608,50,
-FI609,31,
+FI901,31,
PL610,38,
PL611,66,
PL612,4,
diff --git a/MAC/Deployment/data/Coordinates/data/normal_vectors.dat b/MAC/Deployment/data/Coordinates/data/normal_vectors.dat
index 18493be4204537ef3f37968ae47c65a8abc353cf..2c898256d8c2f8b630a28534b8416156b8820687 100644
--- a/MAC/Deployment/data/Coordinates/data/normal_vectors.dat
+++ b/MAC/Deployment/data/Coordinates/data/normal_vectors.dat
@@ -75,8 +75,8 @@ 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
+FI901, lba , 0.333971, 0.126638, 0.934037
+FI901, 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
diff --git a/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat b/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat
index 97297ac7a026d6c7fcc37640fa1c121e15fb6f94..814f81dea9903d98ebb604fe5567f63a0cd911da 100644
--- a/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat
+++ b/MAC/Deployment/data/Coordinates/data/rotation_matrices.dat
@@ -75,8 +75,8 @@ pl610, hba , -0.1841550080, -0.7902527719, 0.5844548653, 0.9790917169, -0.095213
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
+FI901, lba , -0.1488161195, -0.9307614981, 0.3339712506, 0.9855896004, -0.1121428554, 0.1266377496, -0.0804170519, 0.3480043299, 0.9340375175
+FI901, 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
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/FI609/FI609-hba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/FI901/FI901-hba-solution.lisp
similarity index 100%
rename from MAC/Deployment/data/Coordinates/vectors-and-matrices/FI609/FI609-hba-solution.lisp
rename to MAC/Deployment/data/Coordinates/vectors-and-matrices/FI901/FI901-hba-solution.lisp
diff --git a/MAC/Deployment/data/Coordinates/vectors-and-matrices/FI609/FI609-lba-solution.lisp b/MAC/Deployment/data/Coordinates/vectors-and-matrices/FI901/FI901-lba-solution.lisp
similarity index 100%
rename from MAC/Deployment/data/Coordinates/vectors-and-matrices/FI609/FI609-lba-solution.lisp
rename to MAC/Deployment/data/Coordinates/vectors-and-matrices/FI901/FI901-lba-solution.lisp
diff --git a/MAC/Deployment/data/StaticMetaData/AntennaFields/FI609-AntennaField.conf b/MAC/Deployment/data/StaticMetaData/AntennaFields/FI901-AntennaField.conf
similarity index 99%
rename from MAC/Deployment/data/StaticMetaData/AntennaFields/FI609-AntennaField.conf
rename to MAC/Deployment/data/StaticMetaData/AntennaFields/FI901-AntennaField.conf
index 2401b1344e2162e63491ea3a99a83c11f587e5f2..b0590107934768a02ae9df5a21e5e6c9d917cc2a 100644
--- a/MAC/Deployment/data/StaticMetaData/AntennaFields/FI609-AntennaField.conf
+++ b/MAC/Deployment/data/StaticMetaData/AntennaFields/FI901-AntennaField.conf
@@ -1,6 +1,6 @@
# Blitz-0.10 formatted
#
-# AntennaPositions for FI609
+# AntennaPositions for FI901
# ITRF2005 target_date = 2015.5
# Created: 2015-01-20 21:24:11
#
diff --git a/MAC/Deployment/data/StaticMetaData/CableDelays/FI609-CableDelays.conf b/MAC/Deployment/data/StaticMetaData/CableDelays/FI901-CableDelays.conf
similarity index 99%
rename from MAC/Deployment/data/StaticMetaData/CableDelays/FI609-CableDelays.conf
rename to MAC/Deployment/data/StaticMetaData/CableDelays/FI901-CableDelays.conf
index d08c9c2d4352689ec8ebef372156faaeac379776..e7afbfd2b9edaeb100f8995e2d94faf9e8ac0865 100644
--- a/MAC/Deployment/data/StaticMetaData/CableDelays/FI609-CableDelays.conf
+++ b/MAC/Deployment/data/StaticMetaData/CableDelays/FI901-CableDelays.conf
@@ -1,4 +1,4 @@
-# CableDelays.conf KAIRA (FI609)
+# CableDelays.conf KAIRA (FI901)
#
# Derek McKay-Bukowski, SGO, 2012-09-27
#
diff --git a/MAC/Deployment/data/StaticMetaData/RSPBlet.dat b/MAC/Deployment/data/StaticMetaData/RSPBlet.dat
index 7c1983eab83db5fc418c9c42079880ca819d45b1..f46088694a4ee2ed71fcff6caee86789584cbad2 100644
--- a/MAC/Deployment/data/StaticMetaData/RSPBlet.dat
+++ b/MAC/Deployment/data/StaticMetaData/RSPBlet.dat
@@ -61,5 +61,5 @@ 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
+FI901 0 1 2 3
RS511 0 1 2 3
diff --git a/MAC/Deployment/data/StaticMetaData/RSPConnections_local.dat b/MAC/Deployment/data/StaticMetaData/RSPConnections_local.dat
index c4f3ee971564d58487312da919ac2db5afd257be..032103a3a42777c2203e0e3fbd6f7c76415b37b9 100644
--- a/MAC/Deployment/data/StaticMetaData/RSPConnections_local.dat
+++ b/MAC/Deployment/data/StaticMetaData/RSPConnections_local.dat
@@ -54,10 +54,10 @@ DE609_01 172.20.105.104 00:02:C9:4E:DB:B2 glow-cl04
DE609_02 172.20.105.104 00:02:C9:4E:DB:B2 glow-cl04
DE609_03 172.20.105.103 00:02:C9:4E:DA:54 glow-cl03
-FI609_00 10.211.9.42 00:1B:21:B5:31:24 eth3-PC0
-FI609_01 10.212.9.42 00:1B:21:B5:31:25 eth1-PC1
-FI609_02 10.213.9.42 00:1B:21:B5:31:26 eth5-PC2
-FI609_03 10.214.9.42 00:1B:21:B5:31:27 eth4-PC3
+FI901_00 10.211.9.42 00:1B:21:B5:31:24 eth3-PC0
+FI901_01 10.212.9.42 00:1B:21:B5:31:25 eth1-PC1
+FI901_02 10.213.9.42 00:1B:21:B5:31:26 eth5-PC2
+FI901_03 10.214.9.42 00:1B:21:B5:31:27 eth4-PC3
PL610_00 10.170.0.30 00:12:F2:C6:BB:00 R00-BG1-PL610
PL610_01 10.170.0.30 00:12:F2:C6:BB:00 R00-BG1-PL610
diff --git a/MAC/Deployment/data/StaticMetaData/RSPImage.conf b/MAC/Deployment/data/StaticMetaData/RSPImage.conf
index 7f94f57f57481a0f909891b7b1fe6dca930309af..75120838abbb0381925a35c35dda19371ee8393b 100644
--- a/MAC/Deployment/data/StaticMetaData/RSPImage.conf
+++ b/MAC/Deployment/data/StaticMetaData/RSPImage.conf
@@ -54,7 +54,7 @@ FR606 4
SE607 5
UK608 4
DE609 4
-FI609 4
+FI901 4
PL610 4
PL611 4
PL612 4
diff --git a/MAC/Deployment/data/StaticMetaData/StaticMetaData b/MAC/Deployment/data/StaticMetaData/StaticMetaData
deleted file mode 120000
index 945c9b46d684f08ec84cb316e1dc0061e361f794..0000000000000000000000000000000000000000
--- a/MAC/Deployment/data/StaticMetaData/StaticMetaData
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/MAC/Deployment/data/StaticMetaData/StationAttenuation.dat b/MAC/Deployment/data/StaticMetaData/StationAttenuation.dat
index 69b44783658e3ccfdbe5e3d480fa6b0592472e2f..6e86513391e7dace7161c219a5c11d11fcd81b4b 100644
--- a/MAC/Deployment/data/StaticMetaData/StationAttenuation.dat
+++ b/MAC/Deployment/data/StaticMetaData/StationAttenuation.dat
@@ -65,7 +65,7 @@ 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
+FI901 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 8d42cf36723b5cc25cec745b50263d9403d1c7ae..3e8f1c332de80c5cc42d17f655fca2170a23684a 100644
--- a/MAC/Deployment/data/StaticMetaData/StationInfo.dat
+++ b/MAC/Deployment/data/StaticMetaData/StationInfo.dat
@@ -118,7 +118,7 @@ SE607 207 E 11.9302386 57.3990617 50.34 24 12 96 96 1
# Chillbolton
UK608 208 E -1.4342539 51.1439472 137.66 24 12 96 96 1 No No No
# Norderstedt (H=67.246568409726024)
-# WARNING: JUMP IN STATIONNUMBERS!!!! FI609 HAS NUMBER 209!!!!
+# WARNING: JUMP IN STATIONNUMBERS!!!! FI901 HAS NUMBER 209!!!!
DE609 210 E 9.9692322 53.6988092 69.27 24 12 96 96 1 No No No
# Borowiec
PL610 211 E 17.0741692 52.2759289 120.82 24 12 96 96 2 No No No
@@ -132,7 +132,7 @@ IE613 214 E -7.9213656 53.0951167 105.99 24 12 96 96
## Non-ILT international
## 900
# Finland (to be renamed when it becomes part of ILT)
-FI609 901 E 20.7609103 69.0714225 533.25 12 6 48 48 1 No No No
+FI901 901 E 20.7609103 69.0714225 533.25 12 6 48 48 1 No No No
## central systems (60-69)
## 60
diff --git a/MAC/Deployment/data/StaticMetaData/TBBConnections.dat b/MAC/Deployment/data/StaticMetaData/TBBConnections.dat
index 07c4b7193b166664f17ca1084ea63c66c3ce3158..f3c1995ff047563ac344a91c80ca745164b4988c 100644
--- a/MAC/Deployment/data/StaticMetaData/TBBConnections.dat
+++ b/MAC/Deployment/data/StaticMetaData/TBBConnections.dat
@@ -96,7 +96,7 @@ PL612 TBB_0 locus084
IE613 TBB_0 locus085
# Non-ILT Stations (for completeness)
-FI609 TBB_0 locus081
+FI901 TBB_0 locus081
# Test entries can follow here
RS511 TBB_0 locus085
diff --git a/MAC/Deployment/data/StaticMetaData/createFiles b/MAC/Deployment/data/StaticMetaData/createFiles
index f179efda2a05370dafd0c0a1a2084b869f74bcd8..1c62ab638f50e60d5066b5ff520a114150372a29 100755
--- a/MAC/Deployment/data/StaticMetaData/createFiles
+++ b/MAC/Deployment/data/StaticMetaData/createFiles
@@ -847,8 +847,8 @@ def stationExceptions(resultDir, stationName, dataDir):
"""
Handle exceptional files for some stations
"""
- if (stationName.lower() == "fi609"):
- # Reinstall HardwareMonitor.conf with FI609 specific IP for EC
+ if (stationName.lower() == "fi901"):
+ # Reinstall HardwareMonitor.conf with FI901 specific IP for EC
createHardwareMonitorFile(resultDir, stationName, dataDir, "103")
if __name__ == "__main__":
diff --git a/MAC/Deployment/data/StaticMetaData/iHBADeltas/FI609-iHBADeltas.conf b/MAC/Deployment/data/StaticMetaData/iHBADeltas/FI901-iHBADeltas.conf
similarity index 95%
rename from MAC/Deployment/data/StaticMetaData/iHBADeltas/FI609-iHBADeltas.conf
rename to MAC/Deployment/data/StaticMetaData/iHBADeltas/FI901-iHBADeltas.conf
index 147686bee310a96886f9d796d41a9063f7f816f9..c9085bf489737c6fd50ea28e817752bf65d1fd3b 100644
--- a/MAC/Deployment/data/StaticMetaData/iHBADeltas/FI609-iHBADeltas.conf
+++ b/MAC/Deployment/data/StaticMetaData/iHBADeltas/FI901-iHBADeltas.conf
@@ -1,5 +1,5 @@
#
-# iHBADeltas for FI609
+# iHBADeltas for FI901
# Created: 2017-11-01 13:31:36
# Rotation: 30 degree
#