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

bug 225: 

Adaptations to new R001 partition
parent 76a88a5e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Appl/CEP/CS1/CS1_Run/src/CS1.parset
+ 11
− 6
View file @ 79170035
......@@ -21,11 +21,12 @@ OLAP.OLAP_Conn.BGLProc_Storage_Ports = [8300..8363]
# should be one of NULL(inputFromMemory), FILE, TCP, UDP, ETHERNET
OLAP.OLAP_Conn.station_Input_Transport = UDP
# The format of the data
OLAP.OLAP_Conn.rawDataServers = ["10.181.0.4"]
OLAP.OLAP_Conn.rawDataPorts = [4000]
# Variables for Storage
OLAP.subbandsPerPset = 1 #3
OLAP.psetsPerStorage = 1 #2
OLAP.subbandsPerPset = 3
OLAP.psetsPerStorage = 3
OLAP.BGLProc.integrationSteps = 608 #768 at 200MHz
OLAP.BGLProc.nrPPFTaps=16
OLAP.BGLProc.coresPerPset = 16
......@@ -45,10 +46,10 @@ OLAP.DelayComp.positionType = ITRF # should be ITRF
OLAP.IPHeaderSize = 32
OLAP.EPAHeaderSize = 16
OLAP.nrTimesInFrame = 16
OLAP.nrSubbandsPerFrame = 36
OLAP.nrSubbandsPerFrame = 18
OLAP.nrBitsPerSample=16
OLAP.nrSecondsOfBuffer = 6
OLAP.maxNetworkDelay = 2.0 # 1 second extra added to compensate for timestamp bug
OLAP.maxNetworkDelay = 1.0 # 1 second extra added to compensate for timestamp bug
OLAP.delayCompensation = T
Observation.sampleClock = 160
......@@ -76,8 +77,12 @@ Observation.nrPolarisations = 2
Observation.year = 2007
Observation.treeID = 00001
Observation.subbandList = [0, 1]
Observation.subbandList = [128,135,142,149,156,163,170,177,184,191,198,205,212,219,226,233,240,247]
#Observation.subbandList = [0]
#Observation.subbandList = [0, 1, 2, 3, 4, 5]
#Observation.subbandList = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35]
#Observation.subbandList = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,36,37,38,39]
#Observation.subbandList = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,36,37,38,39,40,41]
#Observation.subbandList = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47]
Observation.VirtualInstrument.stationList = ['CS010', 'CS008', 'CS001', 'CS016']
......
Appl/CEP/CS1/CS1_Run/src/CS1_Hosts.py
+ 66
− 4
View file @ 79170035
......@@ -2,10 +2,6 @@ from Hosts import *
import sys
liifen = ClusterFEN(name = 'liifen',
address = '129.125.99.51')
liifen.setSlavesByPattern('lii%03d', '10.162.0.%d', [1,2,3,4,5,6,7,8,9,10,11,12,13])
listfen = ClusterFEN(name = 'listfen' ,
address = '129.125.99.50')
listfen.setSlavesByPattern('list%03d', '10.181.0.%d', [3,4])
......@@ -159,6 +155,72 @@ IONodes = dict({ \
'10.170.0.1', \
'10.170.0.3', \
], \
'R001_8' : [ \
'10.170.0.250', \
'10.170.0.252', \
'10.170.0.242', \
'10.170.0.244', \
'10.170.0.249', \
'10.170.0.251', \
'10.170.0.241', \
'10.170.0.243', \
'10.170.0.186', \
'10.170.0.188', \
'10.170.0.178', \
'10.170.0.180', \
'10.170.0.185', \
'10.170.0.187', \
'10.170.0.177', \
'10.170.0.179', \
'10.170.0.234', \
'10.170.0.236', \
'10.170.0.226', \
'10.170.0.228', \
'10.170.0.233', \
'10.170.0.235', \
'10.170.0.225', \
'10.170.0.227', \
'10.170.0.170', \
'10.170.0.172', \
'10.170.0.162', \
'10.170.0.164', \
'10.170.0.169', \
'10.170.0.171', \
'10.170.0.161', \
'10.170.0.163', \
'10.170.0.218', \
'10.170.0.220', \
'10.170.0.210', \
'10.170.0.212', \
'10.170.0.217', \
'10.170.0.219', \
'10.170.0.209', \
'10.170.0.211', \
'10.170.0.154', \
'10.170.0.156', \
'10.170.0.146', \
'10.170.0.148', \
'10.170.0.153', \
'10.170.0.155', \
'10.170.0.145', \
'10.170.0.147', \
'10.170.0.202', \
'10.170.0.204', \
'10.170.0.194', \
'10.170.0.196', \
'10.170.0.201', \
'10.170.0.203', \
'10.170.0.193', \
'10.170.0.195', \
'10.170.0.138', \
'10.170.0.140', \
'10.170.0.130', \
'10.170.0.132', \
'10.170.0.137', \
'10.170.0.139', \
'10.170.0.129', \
'10.170.0.131', \
], \
})
IONodes['R000_128_0T'] = IONodes['R000_128_0']
......
Appl/CEP/CS1/CS1_Run/src/CS1_Stations.py
+ 36
− 2
View file @ 79170035
......@@ -135,7 +135,40 @@ CS016_us2 = [Station('CS016_us2')]
CS016_us3 = [Station('CS016_us3')]
CS016_4us = CS016_us0 + CS016_us1 + CS016_us2 + CS016_us3
Effelsberg_0 = [Station('Effelsberg_0')]
Effelsberg_1 = [Station('Effelsberg_1')]
Effelsberg_2 = [Station('Effelsberg_2')]
Effelsberg_3 = [Station('Effelsberg_3')]
Effelsberg = Effelsberg_0 + Effelsberg_1 + Effelsberg_2 + Effelsberg_3
I001_us0 = [Station('I001_us0')]
B06_0 = [Station('B06_0')]
B06_1 = [Station('B06_1')]
B06_2 = [Station('B06_2')]
B06_3 = [Station('B06_3')]
B06 = B06_0 + B06_1 + B06_2 + B06_3
T0_0 = [Station('T0_0')]
T0_1 = [Station('T0_1')]
T0_2 = [Station('T0_2')]
T0_3 = [Station('T0_3')]
T0_4 = [Station('T0_4')]
T0_5 = [Station('T0_5')]
T0_6 = [Station('T0_6')]
T0_7 = [Station('T0_7')]
T0_8 = [Station('T0_8')]
T0_9 = [Station('T0_9')]
T0_10 = [Station('T0_10')]
T0_11 = [Station('T0_11')]
T0_12 = [Station('T0_12')]
T0_13 = [Station('T0_13')]
T0_14 = [Station('T0_14')]
T0_15 = [Station('T0_15')]
T0 = T0_0 + T0_1 + T0_2 + T0_3 + T0_4 + T0_5 + T0_6 + T0_7 + T0_8 + T0_9 + T0_10 + T0_11 + T0_12 + T0_13 + T0_14 + T0_15
I_43 = [Station('I_43')]
I_91 = [Station('I_91')]
AllMicroStations = CS010_4us + CS001_4us + CS008_4us + CS016_4us
AllDipoles0_4_8_12 = CS010_4dipoles0_4_8_12 + CS001_4dipoles0_4_8_12 + CS008_4dipoles0_4_8_12 + CS016_4dipoles0_4_8_12
......@@ -143,7 +176,8 @@ AllDipolesMixed = CS010_4dipoles0_4_8_12 + CS001_4dipoles2_6_10_14 + CS008_4dipo
AllHBAs = CS010_HBAs + CS001_HBAs + CS008_HBAs + CS016_HBAs
Mixed = CS010_us0 + CS010_dipole4 + CS010_dipole8 + CS010_dipole12 + CS001_4dipoles0_4_8_12 + CS008_4dipoles0_4_8_12 + CS016_4dipoles0_4_8_12
All24Dipoles = CS001_4dipoles0_4_8_12 + CS008_4dipoles0_4_8_12 + CS016_4dipoles0_4_8_12 + CS030_4dipoles + CS031_4dipoles + CS032_4dipoles
All23Dipoles = CS001_4dipoles0_4_8_12 + CS008_4dipoles0_4_8_12 + CS016_us0 + CS016_us1 + CS016_us2 + CS030_4dipoles + CS031_4dipoles + CS032_4dipoles
Generator = CS010_HBA0 + CS010_HBA2 + CS010_HBA3 + CS008_HBA0 + CS008_HBA2 + CS008_HBA3 + CS001_HBA0 + CS001_HBA2 + CS001_HBA3 + CS016_HBA0 + CS016_HBA2 + CS016_HBA3
#Test = CS001T_4dipoles + CS001_4dipoles0_4_8_12
Test = CS001_4dipoles0_4_8_12 + CS008_4dipoles0_4_8_12 + CS016_4dipoles0_4_8_12
#Test = CS001T_4dipoles + CS010_4dipoles0_4_8_12 + CS001_4dipoles0_4_8_12 + CS008_4dipoles0_4_8_12 + CS016_dipole0 + CS016_dipole4 + CS016_dipole8
Test = CS001T_4dipoles + CS001_4dipoles0_4_8_12 + CS008_4dipoles0_4_8_12 + CS016_dipole0 + CS016_dipole4 + CS016_dipole8
Everything = All23Dipoles + B06_0 + B06_2
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