diff --git a/Appl/CEP/CS1/CS1_Run/src/CS1.parset b/Appl/CEP/CS1/CS1_Run/src/CS1.parset
index 815bb36c5258f6d8a7ac4058fdc1b757846ec7e6..d9d3466e2b13b0310939989f5ce76e329db2c8c5 100644
--- a/Appl/CEP/CS1/CS1_Run/src/CS1.parset
+++ b/Appl/CEP/CS1/CS1_Run/src/CS1.parset
@@ -47,7 +47,7 @@ OLAP.DelayComp.positionType = ITRF # should be ITRF
OLAP.IPHeaderSize = 32
OLAP.EPAHeaderSize = 16
OLAP.nrTimesInFrame = 16
-OLAP.nrSubbandsPerFrame = 32
+OLAP.nrSubbandsPerFrame = 36
OLAP.nrBitsPerSample=16
OLAP.nrSecondsOfBuffer = 26
OLAP.delayCompensation = T
diff --git a/Appl/CEP/CS1/CS1_Run/src/CS1_Parset.py b/Appl/CEP/CS1/CS1_Run/src/CS1_Parset.py
index f6c0cd13aeccac8159084795ef2edfea7f90a74d..1127343733b002cefd0cac15faf9a9b017d09d46 100644
--- a/Appl/CEP/CS1/CS1_Run/src/CS1_Parset.py
+++ b/Appl/CEP/CS1/CS1_Run/src/CS1_Parset.py
@@ -35,38 +35,22 @@ class CS1_Parset(LOFAR_Parset.Parset):
self.stationList = stationList
self['OLAP.nrRSPboards'] = len(stationList)
self['OLAP.storageStationNames'] = [s.getName() for s in stationList]
-
+
def setInputToMem(self):
self.inputFromMemory = True
self['OLAP.OLAP_Conn.station_Input_Transport'] = 'NULL'
def getInputNodes(self):
- inputNodelist = list()
-
+ inputNodelist = list()
+
for s in self.stationList:
- name = s.getName()[0:s.getName().find('_')]
- if s.getName()[s.getName().find('_')+1:s.getName().find('_')+3] == 'us':
- index = int(s.getName()[len(s.getName())-1:len(s.getName())])
- else:
- if len(s.getName()) < 14:
- index = int(s.getName()[len(s.getName())-1:len(s.getName())])/4
- else:
- index = int(s.getName()[len(s.getName())-2:len(s.getName())])/4
-
- nm = self.getStringVector('PIC.Core.' + name + '.inputNodeList')[index]
- nm = nm.strip("[")
- nm = nm.strip("]")
- nm = nm.strip(" ")
-
- if name == 'CS016':
- inputnode = int(nm[len(nm)-2:len(nm)])
- else:
- inputnode = int(nm[len(nm)-1:len(nm)])
-
- inputNodelist.append(inputnode)
-
+ name = self.getString('PIC.Core.' + s.getName() + '.port')
+ name=name.split(":")
+ name=name[0].strip("lii")
+ inputNodelist.append(int(name))
+
return inputNodelist
-
+
def getNStations(self):
return int(len(self.stationList))
diff --git a/Appl/CEP/CS1/CS1_Run/src/CS1_Run.py b/Appl/CEP/CS1/CS1_Run/src/CS1_Run.py
index 01f4efe3fc512386edf309516ed29960ad31ccb4..b2e9efe9ad84cb70455dfef81881c71d72be7191 100755
--- a/Appl/CEP/CS1/CS1_Run/src/CS1_Run.py
+++ b/Appl/CEP/CS1/CS1_Run/src/CS1_Run.py
@@ -132,7 +132,7 @@ if __name__ == '__main__':
sys.exit(1)
parset.setStations(stationList)
-
+
# see if we are using fake input
if options.fakeinput > 0:
parset.setInterval(1, options.runtime+10)
diff --git a/Appl/CEP/CS1/CS1_Run/src/CS1_Stations.py b/Appl/CEP/CS1/CS1_Run/src/CS1_Stations.py
index 5b29ab1c3a9d23bc2cd715dcbc2fb0d245cfde91..a5b796583bd262516e36876d5f7be06af5cea141 100644
--- a/Appl/CEP/CS1/CS1_Run/src/CS1_Stations.py
+++ b/Appl/CEP/CS1/CS1_Run/src/CS1_Stations.py
@@ -15,6 +15,12 @@ class Station(object):
#Keep the antenna positions in ITRF coordinates.
#Storing a position on earth given as (lon,lat,height)
+CS010_HBA10 = [Station('CS010_HBA10')]
+CS010_HBA17 = [Station('CS010_HBA17')]
+CS010_HBA25 = [Station('CS010_HBA25')]
+CS010_HBA29 = [Station('CS010_HBA29')]
+CS010_HBA = CS010_HBA10 + CS010_HBA17 + CS010_HBA25 + CS010_HBA29
+
CS010_dipole0 = [Station('CS010_dipole0')]
CS010_dipole4 = [Station('CS010_dipole4')]
CS010_dipole8 = [Station('CS010_dipole8')]
diff --git a/Appl/CEP/CS1/CS1_Run/src/OLAP.parset b/Appl/CEP/CS1/CS1_Run/src/OLAP.parset
index 1a392fe9b2c93c4558ff19b55319d9f77e72e465..69f2979bd026b2c7b32c445c8855471752d5c177 100644
--- a/Appl/CEP/CS1/CS1_Run/src/OLAP.parset
+++ b/Appl/CEP/CS1/CS1_Run/src/OLAP.parset
@@ -1,49 +1,100 @@
#Keep the antenna positions in ITRF coordinates.
#Storing a position on earth given as (lon,lat,height)
-PIC.Core.CS010.trackingPhaseCentre = [0.119884530715, 0.920263520535, 6364621.19236]
-PIC.Core.CS008.trackingPhaseCentre = [0.119875714863, 0.920290262694, 6364620.51091]
-PIC.Core.CS001.trackingPhaseCentre = [0.119858559246, 0.920235787778, 6364622.29921]
-PIC.Core.CS016.trackingPhaseCentre = [0.119965884875, 0.920263367124, 6364621.33052]
+PIC.Core.CS010.phaseCenter = [0.119884530715, 0.920263520535, 6364621.19236]
+PIC.Core.CS008.phaseCenter = [0.119875714863, 0.920290262694, 6364620.51091]
+PIC.Core.CS001.phaseCenter = [0.119858559246, 0.920235787778, 6364622.29921]
+PIC.Core.CS016.phaseCenter = [0.119965884875, 0.920263367124, 6364621.33052]
-#PIC.Core.CS010_us0.physicalPhaseCentre = [0.119880751593, 0.920263316053, 6364621.18657]
+PIC.Core.CS010_HBA10.position = [0.119902568208, 0.920266865369, 6364619.91351]
+PIC.Core.CS010_HBA17.position = [0.119894277894, 0.920266088261, 6364619.9295 ]
+PIC.Core.CS010_HBA25.position = [0.119901840988, 0.920271625154, 6364619.81553]
+PIC.Core.CS010_HBA29.position = [0.11990014414 , 0.920276336371, 6364619.71856]
+
+PIC.Core.CS010_HBA10.port = lii001:4346
+PIC.Core.CS010_HBA17.port = lii001:4347
+PIC.Core.CS010_HBA25.port = lii002:4348
+PIC.Core.CS010_HBA29.port = lii003:4349
+
+#PIC.Core.CS010_us0.position = [0.119880751593, 0.920263316053, 6364621.18657]
# For CS10_us0 (48 dipoles) the physical position and phase centre are equal
-PIC.Core.CS010_us0.physicalPhaseCentre = [0.119884530715, 0.920263520535, 6364621.19236]
-PIC.Core.CS010_us1.physicalPhaseCentre = [0.11988976137 , 0.920265828067, 6364621.16087]
-PIC.Core.CS010_us2.physicalPhaseCentre = [0.119878900574, 0.920261296557, 6364621.25414]
-PIC.Core.CS010_us3.physicalPhaseCentre = [0.119884742094, 0.920264493858, 6364621.16333]
-
-PIC.Core.CS008_us0.physicalPhaseCentre = [0.119869229995, 0.920290343316, 6364620.50225]
-PIC.Core.CS008_us1.physicalPhaseCentre = [0.119875847702, 0.920294190008, 6364620.43708]
-PIC.Core.CS008_us2.physicalPhaseCentre = [0.119898932106, 0.920286202343, 6364620.66949]
-PIC.Core.CS008_us3.physicalPhaseCentre = [0.119892314399, 0.920282356152, 6364620.76366]
-
-PIC.Core.CS001_us0.physicalPhaseCentre = [0.119852074863, 0.920235868407, 6364622.30655]
-PIC.Core.CS001_us1.physicalPhaseCentre = [0.119858692085, 0.920239715084, 6364622.21637]
-PIC.Core.CS001_us2.physicalPhaseCentre = [0.119865043629, 0.920235707148, 6364622.29187]
-PIC.Core.CS001_us3.physicalPhaseCentre = [0.119858426407, 0.920231860473, 6364622.38405]
-
-PIC.Core.CS016_us0.physicalPhaseCentre = [0.119959400492, 0.920263448231, 6364621.32185]
-PIC.Core.CS016_us1.physicalPhaseCentre = [0.119966018199, 0.92026729443 , 6364621.24368]
-PIC.Core.CS016_us2.physicalPhaseCentre = [0.119972369258, 0.9202632865 , 6364621.33318]
-PIC.Core.CS016_us3.physicalPhaseCentre = [0.119965751066, 0.920259440307, 6364621.42235]
-
-PIC.Core.CS010_dipole0.physicalPhaseCentre = [0.119881248042, 0.920262545738, 6364621.18843]
-PIC.Core.CS010_dipole4.physicalPhaseCentre = [0.119888779622, 0.920265564336, 6364621.16629]
-PIC.Core.CS010_dipole8.physicalPhaseCentre = [0.119879764027, 0.920262155263, 6364621.23847]
-PIC.Core.CS010_dipole12.physicalPhaseCentre = [0.119885557551, 0.920264027099, 6364621.15694]
-
-PIC.Core.CS008_dipole0.physicalPhaseCentre = [0.119868321939, 0.920290354485, 6364620.49802]
-PIC.Core.CS008_dipole4.physicalPhaseCentre = [0.119874940131, 0.920294201177, 6364620.43385]
-PIC.Core.CS008_dipole8.physicalPhaseCentre = [0.11989802405 , 0.920286213523, 6364620.68626]
-PIC.Core.CS008_dipole12.physicalPhaseCentre = [0.119891406343, 0.920282367332, 6364620.78143]
-
-PIC.Core.CS001_dipole0.physicalPhaseCentre = [0.119851166807, 0.920235879575, 6364622.29932]
-PIC.Core.CS001_dipole4.physicalPhaseCentre = [0.119857784514, 0.920239726254, 6364622.21414]
-PIC.Core.CS001_dipole8.physicalPhaseCentre = [0.119864135573, 0.92023571831 , 6364622.27264]
-PIC.Core.CS001_dipole12.physicalPhaseCentre = [0.119857518351, 0.920231872127, 6364622.37981]
-
-PIC.Core.CS016_dipole0.physicalPhaseCentre = [0.119958492436, 0.920263459402, 6364621.32162]
-PIC.Core.CS016_dipole4.physicalPhaseCentre = [0.119965110628, 0.920267305601, 6364621.24345]
-PIC.Core.CS016_dipole8.physicalPhaseCentre = [0.119971461687, 0.920263297671, 6364621.33295]
-PIC.Core.CS016_dipole12.physicalPhaseCentre = [0.119964843495, 0.920259451478, 6364621.42212]
+PIC.Core.CS010_us0.position = [0.119884530715, 0.920263520535, 6364621.19236]
+PIC.Core.CS010_us1.position = [0.11988976137 , 0.920265828067, 6364621.16087]
+PIC.Core.CS010_us2.position = [0.119878900574, 0.920261296557, 6364621.25414]
+PIC.Core.CS010_us3.position = [0.119884742094, 0.920264493858, 6364621.16333]
+
+PIC.Core.CS008_us0.position = [0.119869229995, 0.920290343316, 6364620.50225]
+PIC.Core.CS008_us1.position = [0.119875847702, 0.920294190008, 6364620.43708]
+PIC.Core.CS008_us2.position = [0.119898932106, 0.920286202343, 6364620.66949]
+PIC.Core.CS008_us3.position = [0.119892314399, 0.920282356152, 6364620.76366]
+
+PIC.Core.CS001_us0.position = [0.119852074863, 0.920235868407, 6364622.30655]
+PIC.Core.CS001_us1.position = [0.119858692085, 0.920239715084, 6364622.21637]
+PIC.Core.CS001_us2.position = [0.119865043629, 0.920235707148, 6364622.29187]
+PIC.Core.CS001_us3.position = [0.119858426407, 0.920231860473, 6364622.38405]
+
+PIC.Core.CS016_us0.position = [0.119959400492, 0.920263448231, 6364621.32185]
+PIC.Core.CS016_us1.position = [0.119966018199, 0.92026729443 , 6364621.24368]
+PIC.Core.CS016_us2.position = [0.119972369258, 0.9202632865 , 6364621.33318]
+PIC.Core.CS016_us3.position = [0.119965751066, 0.920259440307, 6364621.42235]
+
+PIC.Core.CS010_us0.port = lii001:4346
+PIC.Core.CS010_us1.port = lii001:4347
+PIC.Core.CS010_us2.port = lii002:4348
+PIC.Core.CS010_us3.port = lii003:4349
+
+PIC.Core.CS008_us0.port = lii004:4346
+PIC.Core.CS008_us1.port = lii004:4347
+PIC.Core.CS008_us2.port = lii005:4348
+PIC.Core.CS008_us3.port = lii006:4349
+
+PIC.Core.CS001_us0.port = lii007:4346
+PIC.Core.CS001_us1.port = lii007:4347
+PIC.Core.CS001_us2.port = lii008:4348
+PIC.Core.CS001_us3.port = lii009:4349
+
+PIC.CORE.CS016_us0.port = lii010:4346
+PIC.CORE.CS016_us1.port = lii010:4347
+PIC.CORE.CS016_us2.port = lii011:4348
+PIC.CORE.CS016_us3.port = lii012:4349
+
+PIC.Core.CS010_dipole0.position = [0.119881248042, 0.920262545738, 6364621.18843]
+PIC.Core.CS010_dipole4.position = [0.119888779622, 0.920265564336, 6364621.16629]
+PIC.Core.CS010_dipole8.position = [0.119879764027, 0.920262155263, 6364621.23847]
+PIC.Core.CS010_dipole12.position = [0.119885557551, 0.920264027099, 6364621.15694]
+
+PIC.Core.CS008_dipole0.position = [0.119868321939, 0.920290354485, 6364620.49802]
+PIC.Core.CS008_dipole4.position = [0.119874940131, 0.920294201177, 6364620.43385]
+PIC.Core.CS008_dipole8.position = [0.11989802405 , 0.920286213523, 6364620.68626]
+PIC.Core.CS008_dipole12.position = [0.119891406343, 0.920282367332, 6364620.78143]
+
+PIC.Core.CS001_dipole0.position = [0.119851166807, 0.920235879575, 6364622.29932]
+PIC.Core.CS001_dipole4.position = [0.119857784514, 0.920239726254, 6364622.21414]
+PIC.Core.CS001_dipole8.position = [0.119864135573, 0.92023571831 , 6364622.27264]
+PIC.Core.CS001_dipole12.position = [0.119857518351, 0.920231872127, 6364622.37981]
+
+PIC.Core.CS016_dipole0.position = [0.119958492436, 0.920263459402, 6364621.32162]
+PIC.Core.CS016_dipole4.position = [0.119965110628, 0.920267305601, 6364621.24345]
+PIC.Core.CS016_dipole8.position = [0.119971461687, 0.920263297671, 6364621.33295]
+PIC.Core.CS016_dipole12.position = [0.119964843495, 0.920259451478, 6364621.42212]
+
+PIC.Core.CS010_dipole0.port = lii001:4346
+PIC.Core.CS010_dipole4.port = lii001:4347
+PIC.Core.CS010_dipole8.port = lii002:4348
+PIC.Core.CS010_dipole12.port = lii003:4349
+
+PIC.Core.CS008_dipole0.port = lii004:4346
+PIC.Core.CS008_dipole4.port = lii004:4347
+PIC.Core.CS008_dipole8.port = lii005:4348
+PIC.Core.CS008_dipole12.port = lii006:4349
+
+PIC.Core.CS001_dipole0.port = lii007:4346
+PIC.Core.CS001_dipole4.port = lii007:4347
+PIC.Core.CS001_dipole8.port = lii008:4348
+PIC.Core.CS001_dipole12.port = lii009:4349
+
+PIC.Core.CS016_dipole0.port = lii010:4346
+PIC.Core.CS016_dipole4.port = lii010:4347
+PIC.Core.CS016_dipole8.port = lii011:4348
+PIC.Core.CS016_dipole12.port = lii012:4349
+