Skip to content
Snippets Groups Projects
Commit 4eab4a08 authored by John Romein's avatar John Romein
Browse files

bug 225: 

New naming of fake stations.
parent 6af12b26
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
RTCP/Run/src/OLAP.parset
+ 60
− 14
View file @ 4eab4a08
......@@ -8,6 +8,39 @@ PIC.Core.CS010.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.CS016.phaseCenter = [3826778.89958, 461298.01474 , 5064718.361 ]
PIC.Core.CS016.position = [3826778.89958, 461298.01474 , 5064718.361 ]
PIC.Core.T0.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
PIC.Core.T0.position = [3826967.64713, 460904.072585, 5064612.8258]
PIC.Core.T1.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T1.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T2.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T2.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T3.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T3.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T4.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T4.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T5.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T5.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T6.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T6.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T7.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T7.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T8.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T8.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T9.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T9.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T10.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T10.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T11.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T11.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T12.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T12.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T13.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T13.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T14.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T14.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T15.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.T15.position = [3826815.56096, 460986.585898, 5064718.84237]
#new phase centers; need to synchronize with the stations
#PIC.Core.CS001.phaseCenter = [3826970.22456, 460903.733617, 5064610.96954]
#PIC.Core.CS010.phaseCenter = [3826816.81762, 460986.897266, 5064717.91745]
......@@ -202,24 +235,37 @@ PIC.Core.Effelsberg_1.position = [4034038.38453, 487026.452469, 4900277.46593]
PIC.Core.Effelsberg_2.position = [4034038.38453, 487026.452469, 4900277.46593]
PIC.Core.Effelsberg_3.position = [4034038.38453, 487026.452469, 4900277.46593]
PIC.Core.B00.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.B00_0.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.B00_1.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.S1.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.S1.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.S2.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.S2.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.S5.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.S5.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.S6.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.S6.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.S9.phaseCenter = [3826967.64713, 460904.072585, 5064612.8258]
PIC.Core.S9.position = [3826967.64713, 460904.072585, 5064612.8258]
PIC.Core.S10.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.S10.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.S13.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.S13.position = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.S14.phaseCenter = [3826815.56096, 460986.585898, 5064718.84237]
PIC.Core.S14.position = [3826815.56096, 460986.585898, 5064718.84237]
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.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]
# 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]
PIC.Core.B03_1.position = [3826815.56096, 460986.585898, 5064718.84237]
#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]
#PIC.Core.B03_1.position = [3826815.56096, 460986.585898, 5064718.84237]
RTCP/Run/src/Stations.py
+ 10
− 22
View file @ 4eab4a08
......@@ -83,28 +83,16 @@ CS016_4HBAs = CS016_HBA0 + CS016_HBA1 + CS016_HBA2 + CS016_HBA3
CS016 = [Station('CS016', '10.170.0.49', ['10.170.0.49:4346', '10.170.0.49:4347', '10.170.0.49:4348', '10.170.0.49:4349'])]
#B00_0 = [Station('B00_0', '10.170.0.1', ['tcp:10.170.0.1:4346']]
B00_0 = [Station('B00_0', '10.170.0.1', ['10.170.0.1:4346', '10.170.0.1:4347', '10.170.0.1:4348', '10.170.0.1:4349'])]
B00_1 = [Station('B00_1', '10.170.0.2', ['10.170.0.2:4346', '10.170.0.2:4347', '10.170.0.2:4348', '10.170.0.2:4349'])]
B00 = B00_0 + B00_1
B01_0 = [Station('B01_0', '10.170.0.5', ['10.170.0.5:4346'])]
#B01_0 = [Station('B01_0', '10.170.0.5', ['10.170.0.5:4346', '10.170.0.5:4347', '10.170.0.5:4348', '10.170.0.5:4349'])]
#B01_1 = [Station('B01_1', '10.170.0.6', ['10.170.0.6:4346', '10.170.0.6:4347', '10.170.0.6:4348', '10.170.0.6:4349'])]
B01_1 = [Station('B01_1', '10.170.0.6', ['10.170.0.6:4346'])]
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'])]
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'])]
B03 = B03_0 + B03_1
for RSP in range(1,5):
for IP in [1,2,5,6,9,10,13,14]:
inputs = ['10.170.0.' + str(IP) + ':' + str(port) for port in range(4346, 4346 + RSP)]
exec 'S' + str(IP) + '_' + str(RSP) + '=[Station(\'S' + str(IP) + '\',\'10.170.0.' + str(IP) + '\',' + str(inputs) + ')]'
exec 'B00_' + str(RSP) + '=S1_' + str(RSP) + '+S2_' + str(RSP)
exec 'B01_' + str(RSP) + '=S5_' + str(RSP) + '+S6_' + str(RSP)
exec 'B02_' + str(RSP) + '=S9_' + str(RSP) + '+S10_' + str(RSP)
exec 'B03_' + str(RSP) + '=S13_' + str(RSP) + '+S14_' + str(RSP)
AllStations = CS001 + CS010 + CS016
AllMicroStations = CS001_4us + CS010_4us + CS016_4us
......
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