diff --git a/MAC/Deployment/data/OTDB/Component_diff.sh b/MAC/Deployment/data/OTDB/Component_diff.sh
index cc0a4fa7963eaea4c80a203c2d051f0cbc289235..9bc8779074aa76fbd53e03b979eb6f7d7011d67c 100755
--- a/MAC/Deployment/data/OTDB/Component_diff.sh
+++ b/MAC/Deployment/data/OTDB/Component_diff.sh
@@ -7,7 +7,7 @@
# > Component_diff.sh -o <old_version> -n <new_version> -s -D <otdb database>
# -H <otdb host>
#
-# -s: Show list of all available revision numbers in OTDB; requires
+# -s: Show list of all available revision numbers in OTDB; requires
# -D: Database name; default is LOFAR_4
# -H: Database server; default is sasdb
# If new version is omitted, we assume the latest (HEAD)
@@ -24,9 +24,14 @@ SyntaxError()
[ -z "${Msg}" ] || echo "ERROR: ${Msg}"
echo ""
echo "Syntax: $(basename $0) -o <old_revision> -n <new_revision>"
+ echo " [ -s -D <otdb database> -H <otdb host>]"
echo ""
- echo " - If new version is omitted, we assume the latest (HEAD)"
- echo " - Script will find out which branch revision number belongs to"
+ echo " - old and new_revision are SVN revision numbers"
+ echo " - If new revision is omitted, we assume the latest (HEAD)"
+ echo " - Script will find out which branch a revision number belongs to"
+ echo " -s: Show list of all available revision numbers in OTDB; requires: "
+ echo " -D: Database name; default is LOFAR_4"
+ echo " -H: Database server; default is sasdb"
echo ""
}
@@ -35,6 +40,8 @@ function find_branch_name {
head=`echo $line | awk -F/ '{print $2}'`
if [ "$head" != "trunk" ]; then
branch=`echo $line | awk -F/ '{print $3}' | awk '{print $1}'`
+ else
+ branch=$head
fi
}
@@ -173,14 +180,42 @@ cd $curdir
diff -bB -u /tmp/comp_$old_version/data/OTDB/all_old_comps.lst /tmp/comp_$new_version/data/OTDB/all_new_comps.lst > diff_compfiles_$old_version_$new_version
echo ""
echo "Differences in component files:"
-echo "=============="
-echo "New files in rev. $new_version ($new_branch) compared to rev. $old_version ($old_branch):"
-grep ^+[A-Z] diff_compfiles_$old_version_$new_version
-echo "=============="
-echo "Removed files in rev. $new_version ($new_branch) since rev. $old_version ($old_branch):"
-grep ^-[A-Z] diff_compfiles_$old_version_$new_version
-echo "=============="
-echo ""
+new_files=( `grep ^+[A-Z] diff_compfiles_$old_version_$new_version` )
+
+if [ ${#new_files[@]} -ge 1 ]; then
+ echo "=============="
+ echo "New files in rev. $new_version ($new_branch) compared to rev. $old_version ($old_branch):"
+ for new_file in "${new_files[@]}"
+ do
+ new_file=`echo $new_file | awk -F+ '{print $2}'`
+ echo $new_file":"
+ echo "+++++++++++++++++"
+ echo ""
+ cat /tmp/comp_$new_version/data/OTDB/${new_file} | awk '{print "+"$0}'
+ echo ""
+ echo "+++++++++++++++++"
+ echo ""
+ done
+ echo "=============="
+fi
+removed_files=( `grep ^-[A-Z] diff_compfiles_$old_version_$new_version` )
+if [ ${#removed_files[@]} -ge 1 ]; then
+ echo "Removed files in rev. $new_version ($new_branch) since rev. $old_version ($old_branch):"
+ for removed_file in "${removed_files[@]}"
+ do
+ removed_file=`echo $removed_file | awk -F+ '{print $2}'`
+ echo $removed_file":"
+ echo "-----------------"
+ echo ""
+ cat /tmp/comp_$old_version/data/OTDB/${removed_file} | awk '{print "-"$0}'
+ echo ""
+ echo "-----------------"
+ echo ""
+ done
+ echo "=============="
+ echo
+fi
+
if [ -s diff_compfiles_$old_version_$new_version ]; then
cat diff_compfiles_$old_version_$new_version | grep ^\ [A-Z] | awk '{print $1}' > all_present.lst
else
diff --git a/MAC/Deployment/data/StaticMetaData/MAC+IP.dat b/MAC/Deployment/data/StaticMetaData/MAC+IP.dat
index 07431239f8d2681aa3398d2f7bc8abfb3834061a..f69058212156c860439c6e03695ba97d1a8bcae3 100644
--- a/MAC/Deployment/data/StaticMetaData/MAC+IP.dat
+++ b/MAC/Deployment/data/StaticMetaData/MAC+IP.dat
@@ -227,30 +227,6 @@ R01-BG2-FR606 10.170.1.25 00:12:F2:C4:C6:00
R01-BG2-SE607 10.170.1.26 00:12:F2:C4:C6:00
R01-BG2-UK608 10.170.1.58 00:12:F2:C4:C6:00
-# International stations need to be given the
-# IP address of the destination IO node, but
-# the MAC address of the first router/switch
-# in our network. Currently, that is CBT3 for
-# all international stations.
-
-R00-CBT3-DE601 10.170.0.50 00:01:E8:D7:93:A7
-R00-CBT3-DE602 10.170.0.182 00:01:E8:D7:93:A7
-R00-CBT3-DE603 10.170.0.38 00:01:E8:D7:93:A7
-R00-CBT3-DE604 10.170.0.142 00:01:E8:D7:93:A7
-R00-CBT3-DE605 10.170.0.174 00:01:E8:D7:93:A7
-R00-CBT3-FR606 10.170.0.14 00:01:E8:D7:93:A7
-R00-CBT3-SE607 10.170.0.26 00:01:E8:D7:93:A7
-R00-CBT3-UK608 10.170.0.58 00:01:E8:D7:93:A7
-
-R01-CBT3-DE601 10.170.1.50 00:01:E8:D7:93:A7
-R01-CBT3-DE602 10.170.1.182 00:01:E8:D7:93:A7
-R01-CBT3-DE603 10.170.1.38 00:01:E8:D7:93:A7
-R01-CBT3-DE604 10.170.1.142 00:01:E8:D7:93:A7
-R01-CBT3-DE605 10.170.1.174 00:01:E8:D7:93:A7
-R01-CBT3-FR606 10.170.1.14 00:01:E8:D7:93:A7
-R01-CBT3-SE607 10.170.1.26 00:01:E8:D7:93:A7
-R01-CBT3-UK608 10.170.1.58 00:01:E8:D7:93:A7
-
cbt001-10GB01 10.168.96.1 A0:36:9F:1F:78:A4
cbt001-10GB02 10.168.96.2 A0:36:9F:1F:78:A6
cbt001-10GB03 10.168.96.3 A0:36:9F:1F:7B:44
@@ -288,3 +264,12 @@ cbt009-10GB02 10.168.104.2 A0:36:9F:1F:36:E6
cbt009-10GB03 10.168.104.3 A0:36:9F:1F:78:64
cbt009-10GB04 10.168.104.4 A0:36:9F:1F:78:66
+cbt-BG3-DE601 10.168.103.4 00:12:F2:C6:BB:00
+cbt-BG1-DE602 10.168.98.4 00:12:F2:C6:C1:00
+cbt-BG1-DE603 10.168.99.4 00:12:F2:C6:C1:00
+cbt-BG1-DE604 10.168.98.4 00:12:F2:C6:C1:00
+cbt-BG3-DE605 10.168.103.4 00:12:F2:C6:BB:00
+cbt-BG2-FR606 10.168.100.4 00:12:F2:C4:C6:00
+cbt-BG2-SE607 10.168.101.4 00:12:F2:C4:C6:00
+cbt-BG2-UK608 10.168.100.4 00:12:F2:C4:C6:00
+
diff --git a/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat b/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat
index d5123ba45d56a3fc0f532048cea110f908bac15c..62355ff5c063bbe6b211ef3feedb7ee713055f8b 100644
--- a/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat
+++ b/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat
@@ -17,123 +17,184 @@
#
# Reroute to Cobalt, valid from 2013-10-29.
# The Cobalt machines are put behind the BG-x switches, replacing R01.
-
+#
+# The network configuration is as follows:
+#
+# BG0 -> cbt001
+# BG0 -> cbt002
+# BG1 -> cbt003
+# BG1 -> cbt004
+# BG2 -> cbt005
+# BG2 -> cbt006
+# BG3 -> cbt007
+# BG3 -> cbt008
+# BG2 -> cbt009
+
+# CS001 -> BG3
CS001 RSP_0 cbt007-10GB01
CS001 RSP_1 cbt007-10GB01
+# CS002 -> BG1
CS002 RSP_0 cbt003-10GB01
CS002 RSP_1 cbt003-10GB01
+# CS003 -> BG2
CS003 RSP_0 cbt005-10GB01
CS003 RSP_1 cbt005-10GB01
+# CS004 -> BG3
CS004 RSP_0 cbt008-10GB01
CS004 RSP_1 cbt008-10GB01
+# CS005 -> BG0
CS005 RSP_0 cbt001-10GB01
CS005 RSP_1 cbt001-10GB01
+# CS006 -> BG1
CS006 RSP_0 cbt004-10GB01
CS006 RSP_1 cbt004-10GB01
+# CS007 -> BG2
CS007 RSP_0 cbt006-10GB01
CS007 RSP_1 cbt006-10GB01
+# CS011 -> BG1
CS011 RSP_0 cbt003-10GB02
CS011 RSP_1 cbt003-10GB02
+# CS013 -> BG2
CS013 RSP_0 cbt005-10GB02
CS013 RSP_1 cbt005-10GB02
+# CS017 -> BG0
CS017 RSP_0 cbt002-10GB01
CS017 RSP_1 cbt002-10GB01
+# CS021 -> BG0
CS021 RSP_0 cbt001-10GB02
CS021 RSP_1 cbt001-10GB02
+# CS024 -> BG3
CS024 RSP_0 cbt007-10GB02
CS024 RSP_1 cbt007-10GB02
+# CS026 -> BG1
CS026 RSP_0 cbt004-10GB02
CS026 RSP_1 cbt004-10GB02
+# CS028 -> BG1
CS028 RSP_0 cbt003-10GB03
CS028 RSP_1 cbt003-10GB03
+# CS030 -> BG2
CS030 RSP_0 cbt006-10GB02
CS030 RSP_1 cbt006-10GB02
+# CS031 -> BG1
CS031 RSP_0 cbt004-10GB03
CS031 RSP_1 cbt004-10GB03
+# CS032 -> BG0
CS032 RSP_0 cbt002-10GB02
CS032 RSP_1 cbt002-10GB02
+# CS101 -> BG0
CS101 RSP_0 cbt001-10GB03
CS101 RSP_1 cbt001-10GB03
+# CS103 -> BG3
CS103 RSP_0 cbt008-10GB02
CS103 RSP_1 cbt008-10GB02
-CS201 RSP_0 cbt003-10GB04
+# CS201 -> BG1
+CS201 RSP_0 cbt003-10GB02
CS201 RSP_1 cbt003-10GB04
+# CS301 -> BG2
CS301 RSP_0 cbt005-10GB03
CS301 RSP_1 cbt005-10GB03
+# CS302 -> BG1
CS302 RSP_0 cbt004-10GB04
CS302 RSP_1 cbt004-10GB04
+# CS401 -> BG3
CS401 RSP_0 cbt007-10GB03
CS401 RSP_1 cbt007-10GB03
+# CS501 -> BG2
CS501 RSP_0 cbt006-10GB03
CS501 RSP_1 cbt006-10GB03
+# RS104 -> BG0
RS104 RSP_0 cbt002-10GB03
+# RS106 -> BG3
RS106 RSP_0 cbt008-10GB03
+# RS205 -> BG3
RS205 RSP_0 cbt007-10GB04
+# RS208 -> BG0
RS208 RSP_0 cbt001-10GB04
-RS210 RSP_0 cbt005-10GB04
+# RS210 -> BG2
+RS210 RSP_0 cbt005-10GB03
+# RS305 -> BG2
RS305 RSP_0 cbt006-10GB04
+# RS306 -> BG2
RS306 RSP_0 cbt005-10GB01
+# RS307 -> BG3
RS307 RSP_0 cbt008-10GB04
+# RS310 -> BG0
RS310 RSP_0 cbt002-10GB04
+# RS406 -> BG3
RS406 RSP_0 cbt007-10GB03
+# RS407 -> BG0
RS407 RSP_0 cbt001-10GB04
+# RS409 -> BG0
RS409 RSP_0 cbt002-10GB03
+# RS410 -> BG0
RS410 RSP_0 cbt002-10GB04
+# RS503 -> BG2
RS503 RSP_0 cbt006-10GB04
+# RS508 -> BG3
RS508 RSP_0 cbt008-10GB03
+# RS509 -> BG3
RS509 RSP_0 cbt007-10GB04
-DE601 RSP_0 cbt008-10GB04
+# DE601 -> BG3
+DE601 RSP_0 cbt-BG3-DE601
+
+# DE602 -> BG1
+DE602 RSP_0 cbt-BG1-DE602
-DE602 RSP_0 cbt003-10GB04
+# DE603 -> BG1
+DE603 RSP_0 cbt-BG1-DE603
-DE603 RSP_0 cbt004-10GB04
+# DE604 -> BG1
+DE604 RSP_0 cbt-BG1-DE604
-DE604 RSP_0 cbt003-10GB02
+# DE605 -> BG3
+DE605 RSP_0 cbt-BG3-DE605
-DE605 RSP_0 cbt008-10GB04
+# FR606 -> BG2
+FR606 RSP_0 cbt-BG2-FR606
-FR606 RSP_0 cbt005-10GB04
+# SE607 -> BG2
+SE607 RSP_0 cbt-BG2-SE607
-SE607 RSP_0 cbt006-10GB04
+# UK608 -> BG2
+UK608 RSP_0 cbt-BG2-UK608
-UK608 RSP_0 cbt005-10GB03
diff --git a/MAC/Deployment/data/StaticMetaData/RSPConnections_test.dat b/MAC/Deployment/data/StaticMetaData/RSPConnections_test.dat
index 91d5e055323720e7ccc298d354bee35d7ad50b92..eab46aea8301a0c9ea02c7f4c598cfa2aa32c8ac 100644
--- a/MAC/Deployment/data/StaticMetaData/RSPConnections_test.dat
+++ b/MAC/Deployment/data/StaticMetaData/RSPConnections_test.dat
@@ -14,7 +14,5 @@
# Alias DestIP DestMAC BGP node
#-------------------------------------------------
-test1 10.170.1.17 00:14:5E:7D:96:38 R01-M0-N04-J00
-test2 10.170.1.18 00:14:5E:7D:96:39 R01-M0-N04-J01
-test3 10.170.1.21 00:14:5E:7D:94:80 R01-M0-N05-J00
-test4 10.170.1.22 00:14:5E:7D:94:81 R01-M0-N05-J01
+test1 10.170.1.1 00:14:5E:7D:1E:53 R01-M0-N00-J00
+test2 10.170.1.2 00:14:5E:7D:1E:54 R01-M0-N00-J01
diff --git a/MAC/Deployment/data/StaticMetaData/createCobaltConfig b/MAC/Deployment/data/StaticMetaData/createCobaltConfig
index 6e1246c9d13ce4d9061ef10380a295e26a28fecd..a99b3fcb4a38178f62ce540ea441b275185b22a4 100755
--- a/MAC/Deployment/data/StaticMetaData/createCobaltConfig
+++ b/MAC/Deployment/data/StaticMetaData/createCobaltConfig
@@ -16,6 +16,7 @@ $host =~ /^cbt/ || next;
if (not $cached) {
%lookup = {};
+ %rlookup = {};
open $fh, "MAC+IP.dat"
or die "Cannot open MAC+IP.dat";
@@ -25,6 +26,7 @@ if (not $cached) {
($name, $ip, $mac) = split(/\s+/, $line);
$lookup{$name} = $ip;
+ $rlookup{$ip} = $rlookup{$ip} || $name;
}
close $fh;
@@ -33,13 +35,14 @@ if (not $cached) {
}
$dest = $lookup{$host};
+$host = $rlookup{$dest};
$baseport = 10000 + $nr * 10;
$portstr = sprintf "[udp:%s:%d, udp:%s:%d, udp:%s:%d, udp:%s:%d]",
- $dest, $baseport + ($board * 6) + 0,
- $dest, $baseport + ($board * 6) + 1,
- $dest, $baseport + ($board * 6) + 2,
- $dest, $baseport + ($board * 6) + 3;
+ $host, $baseport + ($board * 6) + 0,
+ $host, $baseport + ($board * 6) + 1,
+ $host, $baseport + ($board * 6) + 2,
+ $host, $baseport + ($board * 6) + 3;
if ($board == 0) {
printf "PIC.Core.Station.%sLBA.RSP.ports = %s\n",$station,$portstr;
diff --git a/MAC/Deployment/data/StaticMetaData/createFiles b/MAC/Deployment/data/StaticMetaData/createFiles
index 33226ee7bf60e2ce54d94bd29b3fa7898b2e0de6..912bd177a4d2e3d024a44f542643d5f0aaf356e1 100755
--- a/MAC/Deployment/data/StaticMetaData/createFiles
+++ b/MAC/Deployment/data/StaticMetaData/createFiles
@@ -258,7 +258,7 @@ def createRSPDriverFile(resultDir, stationName, dataDir, partitionName,ilt_local
Fills in the markers in the RSPDriver.dat.tmpl file to match the values for the given station.
"""
# First create RSPConnections.dat with proper BG-P partition filled in.
- if (is_Cobalt == 1):
+ if is_Cobalt:
createRSPConnectionsFile_cobalt(resultDir, dataDir)
else:
createRSPConnectionsFile_bg(resultDir, dataDir, partitionName)
@@ -279,9 +279,11 @@ def createRSPDriverFile(resultDir, stationName, dataDir, partitionName,ilt_local
# Extract station number from its name
stationNr = int(name[2:])
- # Need globally unique IP port numbers.
- #basePort = 0x10FA
- basePort = 10000 + stationNr * 10
+ if is_Cobalt:
+ # Need globally unique IP port numbers.
+ basePort = 10000 + stationNr * 10
+ else:
+ basePort = 0x10FA
# International station in local mode takes dest. MAC/IP info from
# separate file
@@ -290,8 +292,7 @@ def createRSPDriverFile(resultDir, stationName, dataDir, partitionName,ilt_local
for rspNr in range(len(ip_mac_alias)):
RSPconfig = RSPconfig.replace("@LANE_0"+str(rspNr)+"_MAC@", ip_mac_alias[rspNr][2] +" # "+ip_mac_alias[rspNr][3])
RSPconfig = RSPconfig.replace("@LANE_0"+str(rspNr)+"_IP@", ip_mac_alias[rspNr][1])
- if (is_Cobalt == 1):
- RSPconfig = RSPconfig.replace("@LANE_0"+str(rspNr)+"_PORT@", str(basePort + rspNr))
+ RSPconfig = RSPconfig.replace("@LANE_0"+str(rspNr)+"_PORT@", str(basePort + rspNr))
else:
nrNodes = len(rspDestNode) # Number of occurences in file
# Core stations have two occurences (these have a splitter), and so
@@ -303,15 +304,13 @@ def createRSPDriverFile(resultDir, stationName, dataDir, partitionName,ilt_local
for rspNr in range(4):
RSPconfig = RSPconfig.replace("@LANE_0"+str(rspNr)+"_MAC@", mac +" # "+rspDestNode[str(0)])
RSPconfig = RSPconfig.replace("@LANE_0"+str(rspNr)+"_IP@", ip)
- if (is_Cobalt == 1):
- RSPconfig = RSPconfig.replace("@LANE_0"+str(rspNr)+"_PORT@", str(basePort + rspNr))
+ RSPconfig = RSPconfig.replace("@LANE_0"+str(rspNr)+"_PORT@", str(basePort + rspNr))
if str(1) in rspDestNode.keys():
(ip, mac) = findIPandMAC(rspDestNode[str(1)],dataDir)
for rspNr in range(4):
RSPconfig = RSPconfig.replace("@LANE_1"+str(rspNr)+"_MAC@", mac +" # "+rspDestNode[str(1)])
RSPconfig = RSPconfig.replace("@LANE_1"+str(rspNr)+"_IP@", ip)
- if (is_Cobalt == 1):
- RSPconfig = RSPconfig.replace("@LANE_1"+str(rspNr)+"_PORT@", str(basePort + 6 + rspNr))
+ RSPconfig = RSPconfig.replace("@LANE_1"+str(rspNr)+"_PORT@", str(basePort + 6 + rspNr))
# Find IP address for RSP board ethernet. All NL stations have RSP address
diff --git a/RTCP/IONProc/src/ION_main.cc b/RTCP/IONProc/src/ION_main.cc
index 77e5d9b80242e238a12aa358a6fdaec1f0b84834..09994df02e68571b362c29794b3d612c43eb8148 100644
--- a/RTCP/IONProc/src/ION_main.cc
+++ b/RTCP/IONProc/src/ION_main.cc
@@ -359,12 +359,14 @@ int main(int argc, char **argv)
#if defined HAVE_BGP_ION
ParameterSet personality("/proc/personality.sh");
+#if 0
unsigned realPsetNumber = personality.getUint32("BG_PSETNUM");
if (myPsetNumber != realPsetNumber) {
std::cerr << "myPsetNumber (" << myPsetNumber << ") != realPsetNumber (" << realPsetNumber << ')' << std::endl;
exit(1);
}
+#endif
std::string myIPaddress = personality.getString("BG_IP");
strcpy(ipAddresses[myPsetNumber].origin(), myIPaddress.c_str());
diff --git a/RTCP/Run/src/BlueGeneControl.conf b/RTCP/Run/src/BlueGeneControl.conf
index c63cdaed86fa1b1cd1e8102fe053a104f531307d..25bd445b64def437aabbdb9f18268a893950c231 100644
--- a/RTCP/Run/src/BlueGeneControl.conf
+++ b/RTCP/Run/src/BlueGeneControl.conf
@@ -8,7 +8,7 @@ if [ "$USER" == "lofarsys" ]
then
if [ "`basename $HOME`" == "lofartest" ]
then
- PARTITION=LOFARTEST # test partition
+ PARTITION=R01-M0-N00-32 # test partition
else
PARTITION=R00 # production partition
fi
diff --git a/RTCP/Run/src/OLAP.parset b/RTCP/Run/src/OLAP.parset
index c3bdd01f5b99af29e8b5575f9e20a932c4cacd76..906a74f0d3320fa71ed42382dd209d2e4a7f8490 100644
--- a/RTCP/Run/src/OLAP.parset
+++ b/RTCP/Run/src/OLAP.parset
@@ -7,194 +7,174 @@ OLAP.correctClocks = T
# Fibre length corrections for core stations using
# a single clock.
#
-PIC.Core.CS001LBA.clockCorrectionTime = 4.755947e-06
-PIC.Core.CS001HBA0.clockCorrectionTime = 4.759754e-06
-PIC.Core.CS001HBA1.clockCorrectionTime = 4.759754e-06
-PIC.Core.CS001HBA.clockCorrectionTime = 4.759754e-06
-
-PIC.Core.CS002LBA.clockCorrectionTime = 8.32233e-06
-PIC.Core.CS002HBA0.clockCorrectionTime = 8.318834e-06
-PIC.Core.CS002HBA1.clockCorrectionTime = 8.318304e-06
-PIC.Core.CS002HBA.clockCorrectionTime = 8.318569e-06
-
-PIC.Core.CS003LBA.clockCorrectionTime = 6.921444e-06
-PIC.Core.CS003HBA0.clockCorrectionTime = 6.917926e-06
-PIC.Core.CS003HBA1.clockCorrectionTime = 6.917872e-06
-PIC.Core.CS003HBA.clockCorrectionTime = 6.917899e-06
-
-PIC.Core.CS004LBA.clockCorrectionTime = 7.884847e-06
-PIC.Core.CS004HBA0.clockCorrectionTime = 7.889961e-06
-PIC.Core.CS004HBA1.clockCorrectionTime = 7.889505e-06
-PIC.Core.CS004HBA.clockCorrectionTime = 7.889733e-06
-
-PIC.Core.CS005LBA.clockCorrectionTime = 8.537828e-06
-PIC.Core.CS005HBA0.clockCorrectionTime = 8.542093e-06
-PIC.Core.CS005HBA1.clockCorrectionTime = 8.541791e-06
-PIC.Core.CS005HBA.clockCorrectionTime = 8.541942e-06
-
-PIC.Core.CS006LBA.clockCorrectionTime = 7.880705e-06
-PIC.Core.CS006HBA0.clockCorrectionTime = 7.882892e-06
-PIC.Core.CS006HBA1.clockCorrectionTime = 7.883396e-06
-PIC.Core.CS006HBA.clockCorrectionTime = 7.883150e-06
-
-PIC.Core.CS007LBA.clockCorrectionTime = 7.916458e-06
-PIC.Core.CS007HBA0.clockCorrectionTime = 7.913020e-06
-PIC.Core.CS007HBA1.clockCorrectionTime = 7.913260e-06
-PIC.Core.CS007HBA.clockCorrectionTime = 7.913140e-06
-
-PIC.Core.CS011LBA.clockCorrectionTime = 7.55500e-06
-PIC.Core.CS011HBA0.clockCorrectionTime = 7.55852e-06
-PIC.Core.CS011HBA1.clockCorrectionTime = 7.55852e-06
-PIC.Core.CS011HBA.clockCorrectionTime = 7.55852e-06
-
-PIC.Core.CS013LBA.clockCorrectionTime = 9.47910e-06
-PIC.Core.CS013HBA0.clockCorrectionTime = 9.47910e-06
-PIC.Core.CS013HBA1.clockCorrectionTime = 9.47910e-06
-PIC.Core.CS013HBA.clockCorrectionTime = 9.47910e-06
-
-PIC.Core.CS017LBA.clockCorrectionTime = 1.540812e-05
-PIC.Core.CS017HBA0.clockCorrectionTime = 1.541095e-05
-PIC.Core.CS017HBA1.clockCorrectionTime = 1.541095e-05
-PIC.Core.CS017HBA.clockCorrectionTime = 1.541095e-05
-
-PIC.Core.CS021LBA.clockCorrectionTime = 6.044335e-06
-PIC.Core.CS021HBA0.clockCorrectionTime = 6.04963e-06
-PIC.Core.CS021HBA1.clockCorrectionTime = 6.04963e-06
-PIC.Core.CS021HBA.clockCorrectionTime = 6.04963e-06
-
-PIC.Core.CS024LBA.clockCorrectionTime = 4.66335e-06
-PIC.Core.CS024HBA0.clockCorrectionTime = 4.65857e-06
-PIC.Core.CS024HBA1.clockCorrectionTime = 4.65857e-06
-PIC.Core.CS024HBA.clockCorrectionTime = 4.65857e-06
-
-PIC.Core.CS026LBA.clockCorrectionTime = 1.620482e-05
-PIC.Core.CS026HBA0.clockCorrectionTime = 1.619948e-05
-PIC.Core.CS026HBA1.clockCorrectionTime = 1.619948e-05
-PIC.Core.CS026HBA.clockCorrectionTime = 1.619948e-05
-
-PIC.Core.CS028LBA.clockCorrectionTime = 1.6967048e-05
-PIC.Core.CS028HBA0.clockCorrectionTime = 1.6962571e-05
-PIC.Core.CS028HBA1.clockCorrectionTime = 1.6962571e-05
-PIC.Core.CS028HBA.clockCorrectionTime = 1.6962571e-05
-
-PIC.Core.CS030LBA.clockCorrectionTime = 9.7110576e-06
-PIC.Core.CS030HBA0.clockCorrectionTime = 9.7160576e-06
-PIC.Core.CS030HBA1.clockCorrectionTime = 9.7160576e-06
-PIC.Core.CS030HBA.clockCorrectionTime = 9.7160576e-06
-
-PIC.Core.CS031LBA.clockCorrectionTime = 6.375533e-06
-PIC.Core.CS031HBA0.clockCorrectionTime = 6.370090e-06
-PIC.Core.CS031HBA1.clockCorrectionTime = 6.370090e-06
-PIC.Core.CS031HBA.clockCorrectionTime = 6.370090e-06
-
-PIC.Core.CS032LBA.clockCorrectionTime = 8.541675e-06
-PIC.Core.CS032HBA0.clockCorrectionTime = 8.546255e-06
-PIC.Core.CS032HBA1.clockCorrectionTime = 8.546255e-06
-PIC.Core.CS032HBA.clockCorrectionTime = 8.546255e-06
-
-PIC.Core.CS101LBA.clockCorrectionTime = 1.5155471e-05
-PIC.Core.CS101HBA0.clockCorrectionTime = 1.5157971e-05
-PIC.Core.CS101HBA1.clockCorrectionTime = 1.5157971e-05
-PIC.Core.CS101HBA.clockCorrectionTime = 1.5157971e-05
-
-PIC.Core.CS103LBA.clockCorrectionTime = 3.5503206e-05
-PIC.Core.CS103HBA0.clockCorrectionTime = 3.5500922e-05
-PIC.Core.CS103HBA1.clockCorrectionTime = 3.5500922e-05
-PIC.Core.CS103HBA.clockCorrectionTime = 3.5500922e-05
-
-PIC.Core.CS201LBA.clockCorrectionTime = 1.745439e-05
-PIC.Core.CS201HBA0.clockCorrectionTime = 1.744924e-05
-PIC.Core.CS201HBA1.clockCorrectionTime = 1.744924e-05
-PIC.Core.CS201HBA.clockCorrectionTime = 1.744924e-05
-
-PIC.Core.CS301LBA.clockCorrectionTime = 7.685249e-06
-PIC.Core.CS301HBA0.clockCorrectionTime = 7.690431e-06
-PIC.Core.CS301HBA1.clockCorrectionTime = 7.690431e-06
-PIC.Core.CS301HBA.clockCorrectionTime = 7.690431e-06
-
-PIC.Core.CS302LBA.clockCorrectionTime = 1.2317004e-05
-PIC.Core.CS302HBA0.clockCorrectionTime = 1.2321604e-05
-PIC.Core.CS302HBA1.clockCorrectionTime = 1.2321604e-05
-PIC.Core.CS302HBA.clockCorrectionTime = 1.2321604e-05
-
-PIC.Core.CS401LBA.clockCorrectionTime = 8.052200e-06
-PIC.Core.CS401HBA0.clockCorrectionTime = 8.057504e-06
-PIC.Core.CS401HBA1.clockCorrectionTime = 8.057770e-06
-PIC.Core.CS401HBA.clockCorrectionTime = 8.057637e-06
-
-PIC.Core.CS501LBA.clockCorrectionTime = 1.65797e-05
-PIC.Core.CS501HBA0.clockCorrectionTime = 1.65842e-05
-PIC.Core.CS501HBA1.clockCorrectionTime = 1.65842e-05
-PIC.Core.CS501HBA.clockCorrectionTime = 1.65842e-05
+
+PIC.Core.CS001LBA.clockCorrectionTime = 4.640447e-06
+PIC.Core.CS001HBA0.clockCorrectionTime = 4.644254e-06
+PIC.Core.CS001HBA1.clockCorrectionTime = 4.644254e-06
+PIC.Core.CS001HBA.clockCorrectionTime = 4.644254e-06
+
+PIC.Core.CS002LBA.clockCorrectionTime = 6.951830e-06
+PIC.Core.CS002HBA0.clockCorrectionTime = 6.948334e-06
+PIC.Core.CS002HBA1.clockCorrectionTime = 6.947804e-06
+PIC.Core.CS002HBA.clockCorrectionTime = 6.948069e-06
+
+PIC.Core.CS003LBA.clockCorrectionTime = 5.550944e-06
+PIC.Core.CS003HBA0.clockCorrectionTime = 5.547426e-06
+PIC.Core.CS003HBA1.clockCorrectionTime = 5.547372e-06
+PIC.Core.CS003HBA.clockCorrectionTime = 5.547399e-06
+
+PIC.Core.CS004LBA.clockCorrectionTime = 6.514347e-06
+PIC.Core.CS004HBA0.clockCorrectionTime = 6.519461e-06
+PIC.Core.CS004HBA1.clockCorrectionTime = 6.519005e-06
+PIC.Core.CS004HBA.clockCorrectionTime = 6.519233e-06
+
+PIC.Core.CS005LBA.clockCorrectionTime = 7.167328e-06
+PIC.Core.CS005HBA0.clockCorrectionTime = 7.171593e-06
+PIC.Core.CS005HBA1.clockCorrectionTime = 7.171291e-06
+PIC.Core.CS005HBA.clockCorrectionTime = 7.171442e-06
+
+PIC.Core.CS006LBA.clockCorrectionTime = 6.510205e-06
+PIC.Core.CS006HBA0.clockCorrectionTime = 6.512392e-06
+PIC.Core.CS006HBA1.clockCorrectionTime = 6.512896e-06
+PIC.Core.CS006HBA.clockCorrectionTime = 6.512650e-06
+
+PIC.Core.CS007LBA.clockCorrectionTime = 6.545958e-06
+PIC.Core.CS007HBA0.clockCorrectionTime = 6.542520e-06
+PIC.Core.CS007HBA1.clockCorrectionTime = 6.542760e-06
+PIC.Core.CS007HBA.clockCorrectionTime = 6.542640e-06
+
+PIC.Core.CS011LBA.clockCorrectionTime = 7.439500e-06
+PIC.Core.CS011HBA0.clockCorrectionTime = 7.443020e-06
+PIC.Core.CS011HBA1.clockCorrectionTime = 7.443020e-06
+PIC.Core.CS011HBA.clockCorrectionTime = 7.443020e-06
+
+PIC.Core.CS013LBA.clockCorrectionTime = 8.683600e-06
+PIC.Core.CS013HBA0.clockCorrectionTime = 8.683600e-06
+PIC.Core.CS013HBA1.clockCorrectionTime = 8.683600e-06
+PIC.Core.CS013HBA.clockCorrectionTime = 8.683600e-06
+
+PIC.Core.CS017LBA.clockCorrectionTime = 1.529262e-05
+PIC.Core.CS017HBA0.clockCorrectionTime = 1.529545e-05
+PIC.Core.CS017HBA1.clockCorrectionTime = 1.529545e-05
+PIC.Core.CS017HBA.clockCorrectionTime = 1.529545e-05
+
+PIC.Core.CS021LBA.clockCorrectionTime = 5.928835e-06
+PIC.Core.CS021HBA0.clockCorrectionTime = 5.934130e-06
+PIC.Core.CS021HBA1.clockCorrectionTime = 5.934130e-06
+PIC.Core.CS021HBA.clockCorrectionTime = 5.934130e-06
+
+PIC.Core.CS024LBA.clockCorrectionTime = 4.547850e-06
+PIC.Core.CS024HBA0.clockCorrectionTime = 4.543070e-06
+PIC.Core.CS024HBA1.clockCorrectionTime = 4.543070e-06
+PIC.Core.CS024HBA.clockCorrectionTime = 4.543070e-06
+
+PIC.Core.CS026LBA.clockCorrectionTime = 1.608932e-05
+PIC.Core.CS026HBA0.clockCorrectionTime = 1.608398e-05
+PIC.Core.CS026HBA1.clockCorrectionTime = 1.608398e-05
+PIC.Core.CS026HBA.clockCorrectionTime = 1.608398e-05
+
+PIC.Core.CS028LBA.clockCorrectionTime = 1.685155e-05
+PIC.Core.CS028HBA0.clockCorrectionTime = 1.684707e-05
+PIC.Core.CS028HBA1.clockCorrectionTime = 1.684707e-05
+PIC.Core.CS028HBA.clockCorrectionTime = 1.684707e-05
+
+PIC.Core.CS030LBA.clockCorrectionTime = 9.595558e-06
+PIC.Core.CS030HBA0.clockCorrectionTime = 9.600558e-06
+PIC.Core.CS030HBA1.clockCorrectionTime = 9.600558e-06
+PIC.Core.CS030HBA.clockCorrectionTime = 9.600558e-06
+
+PIC.Core.CS031LBA.clockCorrectionTime = 6.260033e-06
+PIC.Core.CS031HBA0.clockCorrectionTime = 6.254590e-06
+PIC.Core.CS031HBA1.clockCorrectionTime = 6.254590e-06
+PIC.Core.CS031HBA.clockCorrectionTime = 6.254590e-06
+
+PIC.Core.CS032LBA.clockCorrectionTime = 8.426175e-06
+PIC.Core.CS032HBA0.clockCorrectionTime = 8.430755e-06
+PIC.Core.CS032HBA1.clockCorrectionTime = 8.430755e-06
+PIC.Core.CS032HBA.clockCorrectionTime = 8.430755e-06
+
+PIC.Core.CS101LBA.clockCorrectionTime = 1.503997e-05
+PIC.Core.CS101HBA0.clockCorrectionTime = 1.504247e-05
+PIC.Core.CS101HBA1.clockCorrectionTime = 1.504247e-05
+PIC.Core.CS101HBA.clockCorrectionTime = 1.504247e-05
+
+PIC.Core.CS103LBA.clockCorrectionTime = 3.538771e-05
+PIC.Core.CS103HBA0.clockCorrectionTime = 3.538542e-05
+PIC.Core.CS103HBA1.clockCorrectionTime = 3.538542e-05
+PIC.Core.CS103HBA.clockCorrectionTime = 3.538542e-05
+
+PIC.Core.CS201LBA.clockCorrectionTime = 1.733889e-05
+PIC.Core.CS201HBA0.clockCorrectionTime = 1.733374e-05
+PIC.Core.CS201HBA1.clockCorrectionTime = 1.733374e-05
+PIC.Core.CS201HBA.clockCorrectionTime = 1.733374e-05
+
+PIC.Core.CS301LBA.clockCorrectionTime = 7.569749e-06
+PIC.Core.CS301HBA0.clockCorrectionTime = 7.574931e-06
+PIC.Core.CS301HBA1.clockCorrectionTime = 7.574931e-06
+PIC.Core.CS301HBA.clockCorrectionTime = 7.574931e-06
+
+PIC.Core.CS302LBA.clockCorrectionTime = 1.220150e-05
+PIC.Core.CS302HBA0.clockCorrectionTime = 1.220610e-05
+PIC.Core.CS302HBA1.clockCorrectionTime = 1.220610e-05
+PIC.Core.CS302HBA.clockCorrectionTime = 1.220610e-05
+
+PIC.Core.CS401LBA.clockCorrectionTime = 7.936700e-06
+PIC.Core.CS401HBA0.clockCorrectionTime = 7.942004e-06
+PIC.Core.CS401HBA1.clockCorrectionTime = 7.942270e-06
+PIC.Core.CS401HBA.clockCorrectionTime = 7.942137e-06
+
+PIC.Core.CS501LBA.clockCorrectionTime = 1.646420e-05
+PIC.Core.CS501HBA0.clockCorrectionTime = 1.646870e-05
+PIC.Core.CS501HBA1.clockCorrectionTime = 1.646870e-05
+PIC.Core.CS501HBA.clockCorrectionTime = 1.646870e-05
#
# Stations outside of the core (no correction needed)
#
-
PIC.Core.RS106LBA.clockCorrectionTime = 0
PIC.Core.RS106HBA.clockCorrectionTime = 0
-
PIC.Core.RS205LBA.clockCorrectionTime = 0
PIC.Core.RS205HBA.clockCorrectionTime = 0
-
PIC.Core.RS208LBA.clockCorrectionTime = 0
PIC.Core.RS208HBA.clockCorrectionTime = 0
-
PIC.Core.RS210LBA.clockCorrectionTime = 0
PIC.Core.RS210HBA.clockCorrectionTime = 0
-
PIC.Core.RS305LBA.clockCorrectionTime = 0
PIC.Core.RS305HBA.clockCorrectionTime = 0
-
PIC.Core.RS306LBA.clockCorrectionTime = 0
PIC.Core.RS306HBA.clockCorrectionTime = 0
-
PIC.Core.RS307LBA.clockCorrectionTime = 0
PIC.Core.RS307HBA.clockCorrectionTime = 0
-
PIC.Core.RS310LBA.clockCorrectionTime = 0
PIC.Core.RS310HBA.clockCorrectionTime = 0
-
PIC.Core.RS406LBA.clockCorrectionTime = 0
PIC.Core.RS406HBA.clockCorrectionTime = 0
-
PIC.Core.RS407LBA.clockCorrectionTime = 0
PIC.Core.RS407HBA.clockCorrectionTime = 0
-
PIC.Core.RS409LBA.clockCorrectionTime = 0
PIC.Core.RS409HBA.clockCorrectionTime = 0
-
PIC.Core.RS503LBA.clockCorrectionTime = 0
PIC.Core.RS503HBA.clockCorrectionTime = 0
-
PIC.Core.RS508LBA.clockCorrectionTime = 0
PIC.Core.RS508HBA.clockCorrectionTime = 0
-
PIC.Core.RS509LBA.clockCorrectionTime = 0
PIC.Core.RS509HBA.clockCorrectionTime = 0
# DE601 has a clock offset for unknown reasons
PIC.Core.DE601LBA.clockCorrectionTime = 1.1e-6
PIC.Core.DE601HBA.clockCorrectionTime = 1.1e-6
-
PIC.Core.DE602LBA.clockCorrectionTime = 0
PIC.Core.DE602HBA.clockCorrectionTime = 0
-
PIC.Core.DE603LBA.clockCorrectionTime = 0
PIC.Core.DE603HBA.clockCorrectionTime = 0
-
PIC.Core.DE604LBA.clockCorrectionTime = 0
PIC.Core.DE604HBA.clockCorrectionTime = 0
-
PIC.Core.DE605LBA.clockCorrectionTime = 0
PIC.Core.DE605HBA.clockCorrectionTime = 0
-
PIC.Core.FR606LBA.clockCorrectionTime = 0
PIC.Core.FR606HBA.clockCorrectionTime = 0
-
PIC.Core.SE607LBA.clockCorrectionTime = 0
PIC.Core.SE607HBA.clockCorrectionTime = 0
-
PIC.Core.UK608LBA.clockCorrectionTime = 0
PIC.Core.UK608HBA.clockCorrectionTime = 0
@@ -389,141 +369,3 @@ PIC.Core.SE607HBA.phaseCenter = [3370271.657, 712125.881, 5349991.165]
PIC.Core.UK608LBA.phaseCenter = [4008438.457, -100309.725, 4943735.828]
PIC.Core.UK608HBA.phaseCenter = [4008461.941, -100376.609, 4943716.874]
-
-#
-# Experimental part:
-#
-
-PIC.Core.S1.phaseCenter = [3826615.56096, 460986.585898, 5064718.84237]
-PIC.Core.S2.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S5.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S6.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S9.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
-PIC.Core.S10.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S13.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S14.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S17.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S18.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S21.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S22.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S25.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
-PIC.Core.S26.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S29.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S30.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S33.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S34.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S37.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S38.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S41.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
-PIC.Core.S42.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S45.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S46.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S49.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S50.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S53.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S54.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S57.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
-PIC.Core.S58.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S61.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S62.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S129.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S130.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S133.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S134.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S137.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
-PIC.Core.S138.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S141.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S142.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S145.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S146.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S149.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S150.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S153.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
-PIC.Core.S154.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S157.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S158.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S161.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S162.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S165.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S166.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S169.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
-PIC.Core.S170.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S173.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S174.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S177.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S178.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S181.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S182.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S185.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
-PIC.Core.S186.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S189.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.S190.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-
-PIC.Core.T1.phaseCenter = [3826615.56096, 460986.585898, 5064718.84237]
-PIC.Core.T2.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T5.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T6.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T9.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
-PIC.Core.T10.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T13.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T14.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T17.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T18.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T21.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T22.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T25.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
-PIC.Core.T26.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T29.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T30.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T33.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T34.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T37.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T38.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T41.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
-PIC.Core.T42.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T45.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T46.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T49.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T50.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T53.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T54.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T57.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
-PIC.Core.T58.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T61.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T62.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T129.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T130.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T133.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T134.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T137.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
-PIC.Core.T138.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T141.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T142.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T145.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T146.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T149.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T150.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T153.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
-PIC.Core.T154.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T157.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T158.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T161.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T162.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T165.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T166.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T169.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
-PIC.Core.T170.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T173.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T174.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T177.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T178.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T181.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T182.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T185.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
-PIC.Core.T186.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T189.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.T190.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-
-#
-# End of experimental part
-#
diff --git a/RTCP/Run/src/locations.sh.in b/RTCP/Run/src/locations.sh.in
index 1e4b06cc4fd4e3532fd78f0b7e5864f4b40b4554..ed9dbdd3b51ad8df1b8865dbca71c59edf6f2cef 100644
--- a/RTCP/Run/src/locations.sh.in
+++ b/RTCP/Run/src/locations.sh.in
@@ -109,6 +109,20 @@ function set_psetinfo() {
return
fi
+ if [ "$PARTITION" == "R01-M0-N00-J00-16" ]
+ then
+ PSETS="10.170.1.1"
+ FIRSTPSET="10.170.1.1"
+
+ return
+ fi
+ if [ "$PARTITION" == "R01-M0-N00-32" ]
+ then
+ PSETS="10.170.1.1,10.170.1.2"
+ FIRSTPSET="10.170.1.1"
+
+ return
+ fi
# list both the partition directly (small partitions) and recursively (large partitions) to get all -32 subpartitions
# bghierarchy needs a valid stdin for some reason and will read from it, so provide a fake one
diff --git a/RTCP/Run/src/startBGL.sh b/RTCP/Run/src/startBGL.sh
index 1e5a9496229e2a489e16b2318e0c8dc7b2514d8a..8958d1fe5a2340ed44c9dd8d9a68c078bda2abab 100755
--- a/RTCP/Run/src/startBGL.sh
+++ b/RTCP/Run/src/startBGL.sh
@@ -31,14 +31,16 @@ then
# Reroute to Cobalt
echo "Rerouting to Cobalt"
- # Prepare parset
- echo "Preparing parset..."
- <$PARSET sed 's/\(locus...\)/\1\.cep2\.lofar/g' > /tmp/foo
-
# Copy parset to Cobalt
echo "Transferring parset to Cobalt..."
COBALT_PARSET="/globalhome/mol/parsets/`basename $PARSET`"
- scp /tmp/foo "mol@10.168.96.1:$COBALT_PARSET"
+ scp $PARSET "mol@10.168.96.1:$COBALT_PARSET"
+
+ # Copy the parset to NFS for post processing
+ cp $PARSET $STORAGE_PARSET
+
+ # Make the /opt/lofar/var/log/latest symlink
+ ln -sfT `dirname $STORAGE_PARSET` /opt/lofar/var/log/latest
# Start the observation on Cobalt
echo "Signalling start to Cobalt..."
diff --git a/RTCP/Run/src/stopBGL.sh b/RTCP/Run/src/stopBGL.sh
index e7365e391ce2cba0f982502ada08d8eec486656c..71aa8c15b75b7f8b71a547b10fe697be0096219d 100755
--- a/RTCP/Run/src/stopBGL.sh
+++ b/RTCP/Run/src/stopBGL.sh
@@ -23,8 +23,9 @@ then
# Reroute to Cobalt
echo "Rerouting to Cobalt"
- # Start the observation on Cobalt
- ssh mol@10.168.96.1 stopBGL.sh 1 $OBSID
+ # Stop the observation on Cobalt
+ # (TODO: disabled because MAC calls stopBGL before we're finished)
+ #ssh mol@10.168.96.1 stopBGL.sh 1 $OBSID
# And.. done!
exit 0