From 08d1e19e74dd96a94081a6787b97ea62e93bfa4e Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Wed, 17 Dec 2008 08:29:34 +0000
Subject: [PATCH] Bug 1302: Added 'mol' to the relevant run scripts and tweaked
his list of stations.
---
RTCP/Run/src/Host_Names.py | 1 +
RTCP/Run/src/OLAP.parset | 12 +++++++++---
RTCP/Run/src/Run.py | 2 +-
RTCP/Run/src/Stations.py | 8 +++++---
4 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/RTCP/Run/src/Host_Names.py b/RTCP/Run/src/Host_Names.py
index 2376b167862..6ba1af96f8b 100644
--- a/RTCP/Run/src/Host_Names.py
+++ b/RTCP/Run/src/Host_Names.py
@@ -40,6 +40,7 @@ romein = UserId(bgfen0,'romein')
lofarsys = UserId(bgfen0,'lofarsys')
broekema = UserId(bgfen0,'broekema')
nieuwpoo = UserId(bgfen0,'nieuwpoo')
+mol = UserId(bgfen0,'mol')
IONodes = dict({ \
'R000-B00' : [ \
diff --git a/RTCP/Run/src/OLAP.parset b/RTCP/Run/src/OLAP.parset
index 54c85e76e21..f229e6ffee1 100644
--- a/RTCP/Run/src/OLAP.parset
+++ b/RTCP/Run/src/OLAP.parset
@@ -210,9 +210,15 @@ PIC.Core.B01.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.B01_0.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.B01_1.position = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.B02.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.B02_0.position = [3826815.56096, 460986.585898, 5064718.84237]
-PIC.Core.B02_1.position = [3826815.56096, 460986.585898, 5064718.84237]
+#PIC.Core.B02.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
+#PIC.Core.B02_0.position = [3826815.56096, 460986.585898, 5064718.84237]
+#PIC.Core.B02_1.position = [3826815.56096, 460986.585898, 5064718.84237]
+
+# copies of CS001, CS010 phase centers
+PIC.Core.B02a.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
+PIC.Core.B02a.position = [3826967.64713, 460904.072585, 5064612.8258]
+PIC.Core.B02b.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
+PIC.Core.B02b.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.B03.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.B03_0.position = [3826815.56096, 460986.585898, 5064718.84237]
diff --git a/RTCP/Run/src/Run.py b/RTCP/Run/src/Run.py
index 9dafac30410..48d72331245 100755
--- a/RTCP/Run/src/Run.py
+++ b/RTCP/Run/src/Run.py
@@ -34,7 +34,7 @@ def doObservation(obsID, parset):
rsp.selectRCUs([0, 1, 2, 8, 9])
rsp.setWG([2], 60e6)
- mapTable = dict({'gels': gels, 'lofarsys': lofarsys, 'romein': romein, 'broekema': broekema, 'nieuwpoo': nieuwpoo})
+ mapTable = dict({'gels': gels, 'lofarsys': lofarsys, 'romein': romein, 'broekema': broekema, 'nieuwpoo': nieuwpoo, 'mol': mol})
logname = os.environ.get("LOGNAME", os.environ.get("USERNAME"))
if mapTable.has_key(logname):
userId = mapTable.get(logname)
diff --git a/RTCP/Run/src/Stations.py b/RTCP/Run/src/Stations.py
index 8a7c15624e8..404175aa575 100644
--- a/RTCP/Run/src/Stations.py
+++ b/RTCP/Run/src/Stations.py
@@ -90,9 +90,11 @@ B01_2 = [Station('B01_2', '10.170.0.6', ['10.170.0.6:4346'])]
B01_3 = [Station('B01_3', '10.170.0.6', ['10.170.0.6:4346'])]
B01 = B01_0 + B01_1 + B01_2 + B01_3
-B02_0 = [Station('B02_0', '10.170.0.9', ['10.170.0.9:4346', '10.170.0.9:4347', '10.170.0.9:4348', '10.170.0.9:4349'])]
-B02_1 = [Station('B02_1', '10.170.0.10', ['10.170.0.10:4346', '10.170.0.10:4347', '10.170.0.10:4348', '10.170.0.10:4349'])]
-B02 = B02_0 + B02_1
+#B02_0 = [Station('B02_0', '10.170.0.9', ['10.170.0.9:4346'])]
+B02a = [Station('B02a', '10.170.0.9', ['10.170.0.9:4346', '10.170.0.9:4347', '10.170.0.9:4348', '10.170.0.9:4349'])]
+B02b = [Station('B02b', '10.170.0.10', ['10.170.0.10:4346', '10.170.0.10:4347', '10.170.0.10:4348', '10.170.0.10:4349'])]
+B02 = B02a + B02b
+#B02 = B02_0
B03_0 = [Station('B03_0', '10.170.0.13', ['10.170.0.13:4346', '10.170.0.13:4347', '10.170.0.13:4348', '10.170.0.13:4349'])]
B03_1 = [Station('B03_1', '10.170.0.14', ['10.170.0.14:4346', '10.170.0.14:4347', '10.170.0.14:4348', '10.170.0.14:4349'])]
--
GitLab