Skip to content
Snippets Groups Projects
Commit c62c64e0 authored by Martin Gels's avatar Martin Gels
Browse files

BugID:1005 

Added HBA positions and modified code for port-numbers.
parent 4659707e
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
+ 1
− 1
View file @ c62c64e0
...@@ -47,7 +47,7 @@ OLAP.DelayComp.positionType = ITRF # should be ITRF ...@@ -47,7 +47,7 @@ OLAP.DelayComp.positionType = ITRF # should be ITRF
OLAP.IPHeaderSize = 32 OLAP.IPHeaderSize = 32
OLAP.EPAHeaderSize = 16 OLAP.EPAHeaderSize = 16
OLAP.nrTimesInFrame = 16 OLAP.nrTimesInFrame = 16
OLAP.nrSubbandsPerFrame = 32 OLAP.nrSubbandsPerFrame = 36
OLAP.nrBitsPerSample=16 OLAP.nrBitsPerSample=16
OLAP.nrSecondsOfBuffer = 26 OLAP.nrSecondsOfBuffer = 26
OLAP.delayCompensation = T OLAP.delayCompensation = T
......
Appl/CEP/CS1/CS1_Run/src/CS1_Parset.py
+ 9
− 25
View file @ c62c64e0
...@@ -35,38 +35,22 @@ class CS1_Parset(LOFAR_Parset.Parset): ...@@ -35,38 +35,22 @@ class CS1_Parset(LOFAR_Parset.Parset):
self.stationList = stationList self.stationList = stationList
self['OLAP.nrRSPboards'] = len(stationList) self['OLAP.nrRSPboards'] = len(stationList)
self['OLAP.storageStationNames'] = [s.getName() for s in stationList] self['OLAP.storageStationNames'] = [s.getName() for s in stationList]
def setInputToMem(self): def setInputToMem(self):
self.inputFromMemory = True self.inputFromMemory = True
self['OLAP.OLAP_Conn.station_Input_Transport'] = 'NULL' self['OLAP.OLAP_Conn.station_Input_Transport'] = 'NULL'
def getInputNodes(self): def getInputNodes(self):
inputNodelist = list() inputNodelist = list()
for s in self.stationList: for s in self.stationList:
name = s.getName()[0:s.getName().find('_')] name = self.getString('PIC.Core.' + s.getName() + '.port')
if s.getName()[s.getName().find('_')+1:s.getName().find('_')+3] == 'us': name=name.split(":")
index = int(s.getName()[len(s.getName())-1:len(s.getName())]) name=name[0].strip("lii")
else: inputNodelist.append(int(name))
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)
return inputNodelist return inputNodelist
def getNStations(self): def getNStations(self):
return int(len(self.stationList)) return int(len(self.stationList))
......
Appl/CEP/CS1/CS1_Run/src/CS1_Run.py
+ 1
− 1
View file @ c62c64e0
...@@ -132,7 +132,7 @@ if __name__ == '__main__': ...@@ -132,7 +132,7 @@ if __name__ == '__main__':
sys.exit(1) sys.exit(1)
parset.setStations(stationList) parset.setStations(stationList)
# see if we are using fake input # see if we are using fake input
if options.fakeinput > 0: if options.fakeinput > 0:
parset.setInterval(1, options.runtime+10) parset.setInterval(1, options.runtime+10)
......
Appl/CEP/CS1/CS1_Run/src/CS1_Stations.py
+ 6
− 0
View file @ c62c64e0
...@@ -15,6 +15,12 @@ class Station(object): ...@@ -15,6 +15,12 @@ class Station(object):
#Keep the antenna positions in ITRF coordinates. #Keep the antenna positions in ITRF coordinates.
#Storing a position on earth given as (lon,lat,height) #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_dipole0 = [Station('CS010_dipole0')]
CS010_dipole4 = [Station('CS010_dipole4')] CS010_dipole4 = [Station('CS010_dipole4')]
CS010_dipole8 = [Station('CS010_dipole8')] CS010_dipole8 = [Station('CS010_dipole8')]
......
Appl/CEP/CS1/CS1_Run/src/OLAP.parset
+ 95
− 44
View file @ c62c64e0
#Keep the antenna positions in ITRF coordinates. #Keep the antenna positions in ITRF coordinates.
#Storing a position on earth given as (lon,lat,height) #Storing a position on earth given as (lon,lat,height)
PIC.Core.CS010.trackingPhaseCentre = [0.119884530715, 0.920263520535, 6364621.19236] PIC.Core.CS010.phaseCenter = [0.119884530715, 0.920263520535, 6364621.19236]
PIC.Core.CS008.trackingPhaseCentre = [0.119875714863, 0.920290262694, 6364620.51091] PIC.Core.CS008.phaseCenter = [0.119875714863, 0.920290262694, 6364620.51091]
PIC.Core.CS001.trackingPhaseCentre = [0.119858559246, 0.920235787778, 6364622.29921] PIC.Core.CS001.phaseCenter = [0.119858559246, 0.920235787778, 6364622.29921]
PIC.Core.CS016.trackingPhaseCentre = [0.119965884875, 0.920263367124, 6364621.33052] 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 # 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_us0.position = [0.119884530715, 0.920263520535, 6364621.19236]
PIC.Core.CS010_us1.physicalPhaseCentre = [0.11988976137 , 0.920265828067, 6364621.16087] PIC.Core.CS010_us1.position = [0.11988976137 , 0.920265828067, 6364621.16087]
PIC.Core.CS010_us2.physicalPhaseCentre = [0.119878900574, 0.920261296557, 6364621.25414] PIC.Core.CS010_us2.position = [0.119878900574, 0.920261296557, 6364621.25414]
PIC.Core.CS010_us3.physicalPhaseCentre = [0.119884742094, 0.920264493858, 6364621.16333] PIC.Core.CS010_us3.position = [0.119884742094, 0.920264493858, 6364621.16333]
PIC.Core.CS008_us0.physicalPhaseCentre = [0.119869229995, 0.920290343316, 6364620.50225] PIC.Core.CS008_us0.position = [0.119869229995, 0.920290343316, 6364620.50225]
PIC.Core.CS008_us1.physicalPhaseCentre = [0.119875847702, 0.920294190008, 6364620.43708] PIC.Core.CS008_us1.position = [0.119875847702, 0.920294190008, 6364620.43708]
PIC.Core.CS008_us2.physicalPhaseCentre = [0.119898932106, 0.920286202343, 6364620.66949] PIC.Core.CS008_us2.position = [0.119898932106, 0.920286202343, 6364620.66949]
PIC.Core.CS008_us3.physicalPhaseCentre = [0.119892314399, 0.920282356152, 6364620.76366] PIC.Core.CS008_us3.position = [0.119892314399, 0.920282356152, 6364620.76366]
PIC.Core.CS001_us0.physicalPhaseCentre = [0.119852074863, 0.920235868407, 6364622.30655] PIC.Core.CS001_us0.position = [0.119852074863, 0.920235868407, 6364622.30655]
PIC.Core.CS001_us1.physicalPhaseCentre = [0.119858692085, 0.920239715084, 6364622.21637] PIC.Core.CS001_us1.position = [0.119858692085, 0.920239715084, 6364622.21637]
PIC.Core.CS001_us2.physicalPhaseCentre = [0.119865043629, 0.920235707148, 6364622.29187] PIC.Core.CS001_us2.position = [0.119865043629, 0.920235707148, 6364622.29187]
PIC.Core.CS001_us3.physicalPhaseCentre = [0.119858426407, 0.920231860473, 6364622.38405] PIC.Core.CS001_us3.position = [0.119858426407, 0.920231860473, 6364622.38405]
PIC.Core.CS016_us0.physicalPhaseCentre = [0.119959400492, 0.920263448231, 6364621.32185] PIC.Core.CS016_us0.position = [0.119959400492, 0.920263448231, 6364621.32185]
PIC.Core.CS016_us1.physicalPhaseCentre = [0.119966018199, 0.92026729443 , 6364621.24368] PIC.Core.CS016_us1.position = [0.119966018199, 0.92026729443 , 6364621.24368]
PIC.Core.CS016_us2.physicalPhaseCentre = [0.119972369258, 0.9202632865 , 6364621.33318] PIC.Core.CS016_us2.position = [0.119972369258, 0.9202632865 , 6364621.33318]
PIC.Core.CS016_us3.physicalPhaseCentre = [0.119965751066, 0.920259440307, 6364621.42235] PIC.Core.CS016_us3.position = [0.119965751066, 0.920259440307, 6364621.42235]
PIC.Core.CS010_dipole0.physicalPhaseCentre = [0.119881248042, 0.920262545738, 6364621.18843] PIC.Core.CS010_us0.port = lii001:4346
PIC.Core.CS010_dipole4.physicalPhaseCentre = [0.119888779622, 0.920265564336, 6364621.16629] PIC.Core.CS010_us1.port = lii001:4347
PIC.Core.CS010_dipole8.physicalPhaseCentre = [0.119879764027, 0.920262155263, 6364621.23847] PIC.Core.CS010_us2.port = lii002:4348
PIC.Core.CS010_dipole12.physicalPhaseCentre = [0.119885557551, 0.920264027099, 6364621.15694] PIC.Core.CS010_us3.port = lii003:4349
PIC.Core.CS008_dipole0.physicalPhaseCentre = [0.119868321939, 0.920290354485, 6364620.49802] PIC.Core.CS008_us0.port = lii004:4346
PIC.Core.CS008_dipole4.physicalPhaseCentre = [0.119874940131, 0.920294201177, 6364620.43385] PIC.Core.CS008_us1.port = lii004:4347
PIC.Core.CS008_dipole8.physicalPhaseCentre = [0.11989802405 , 0.920286213523, 6364620.68626] PIC.Core.CS008_us2.port = lii005:4348
PIC.Core.CS008_dipole12.physicalPhaseCentre = [0.119891406343, 0.920282367332, 6364620.78143] PIC.Core.CS008_us3.port = lii006:4349
PIC.Core.CS001_dipole0.physicalPhaseCentre = [0.119851166807, 0.920235879575, 6364622.29932] PIC.Core.CS001_us0.port = lii007:4346
PIC.Core.CS001_dipole4.physicalPhaseCentre = [0.119857784514, 0.920239726254, 6364622.21414] PIC.Core.CS001_us1.port = lii007:4347
PIC.Core.CS001_dipole8.physicalPhaseCentre = [0.119864135573, 0.92023571831 , 6364622.27264] PIC.Core.CS001_us2.port = lii008:4348
PIC.Core.CS001_dipole12.physicalPhaseCentre = [0.119857518351, 0.920231872127, 6364622.37981] PIC.Core.CS001_us3.port = lii009:4349
PIC.Core.CS016_dipole0.physicalPhaseCentre = [0.119958492436, 0.920263459402, 6364621.32162] PIC.CORE.CS016_us0.port = lii010:4346
PIC.Core.CS016_dipole4.physicalPhaseCentre = [0.119965110628, 0.920267305601, 6364621.24345] PIC.CORE.CS016_us1.port = lii010:4347
PIC.Core.CS016_dipole8.physicalPhaseCentre = [0.119971461687, 0.920263297671, 6364621.33295] PIC.CORE.CS016_us2.port = lii011:4348
PIC.Core.CS016_dipole12.physicalPhaseCentre = [0.119964843495, 0.920259451478, 6364621.42212] 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
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