TAsk #10719: Reintegrating task branch for updated DE605 position into trunk

MAC/Deployment/data/Coordinates/ETRF_FILES/DE605/de605-antenna-positions-etrs.csv

@@ -192,4 +192,4 @@ H93,4005734.142,451011.284,4926412.448,-18.523,-17.887,0.000,186,187
 H94,4005736.628,451015.186,4926410.184,-14.946,-21.592,0.000,188,189
 H95,4005739.113,451019.088,4926407.921,-11.368,-25.297,0.000,190,191
 CLBA,4005681.742,450968.282,4926457.670,0.000,0.000,0.000,-1,-1
-CHBA,4005681.407,450968.304,4926457.940,0.000,0.000,0.000,-1,-1
+CHBA,4005718.447,451028.044,4926424.103,0.000,0.000,0.000,-1,-1

MAC/Deployment/data/Coordinates/create_CDB_objects.py

@@ -41,7 +41,7 @@ if __name__ == '__main__':
         print findStationInfo(station)
         if (len(findStationInfo(station)) < 13):
             continue
-        (name, stationID, stnType, long, lat, height, nrRSP, nrTBB, nrLBA, nrHBA, HBAsplit, LBAcal, Aartfaac ) = findStationInfo(station)
+        (name, stationID, stnType, long, lat, height, nrRSP, nrTBB, nrLBA, nrHBA, nrPowecs, HBAsplit, LBAcal, Aartfaac ) = findStationInfo(station)
         if height[0] != '0':
             print "updating %s to the coordinate database " % station
             for lba in xrange(0, int(nrLBA)*2):

MAC/Deployment/data/Coordinates/database.py

@@ -3,7 +3,7 @@
 
 ## database info
 dbName="StationCoordinates"
-dbHost="localhost"
+dbHost="sasdb"
 
 def getDBname():
     return(dbName)

MAC/Deployment/data/Coordinates/make_all_station_file.py

@@ -9,7 +9,7 @@ from datetime import *
 from copy import deepcopy
 from math import *
 import numpy as np
-import MLab as mlab
+#import MLab as mlab
 from database import *
 
 # get info from database.py

MAC/Deployment/data/Coordinates/make_conf_files.py

@@ -9,7 +9,7 @@ from datetime import *
 from copy import deepcopy
 from math import *
 import numpy as np
-import MLab as mlab
+#import MLab as mlab
 from database import *
 
 # get info from database.py

RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationPositions.parset

@@ -138,7 +138,7 @@ PIC.Core.DE604LBA.phaseCenter = [3796327.178, 877591.636, 5032757.508]
 PIC.Core.DE604HBA.phaseCenter = [3796379.823, 877614.130, 5032712.528]
 
 PIC.Core.DE605LBA.phaseCenter = [4005681.355, 450968.621, 4926457.941]
-PIC.Core.DE605HBA.phaseCenter = [4005681.020, 450968.643, 4926458.211]
+PIC.Core.DE605HBA.phaseCenter = [4005717.990, 451028.465, 4926424.423]
 
 # Note: DE609 coordinates are EPOCH 2015.0
 PIC.Core.DE609LBA.phaseCenter = [3727207.323, 655185.254, 5117000.901]