fixes to uv fitting

casa_timing_script.py

@@ -362,8 +362,10 @@
 if runClean=='U':
     uv_fit='T'
 #only point sources right now
-uv_num=int(data_params["uv_num"])
 uv_initp=data_params["uv_initp"]
+file_uv0=open(uv_initp)
+uv_num=sum(1 for line in file_uv0)-1
+file_uv0.close()
 phcen_rad=vishead(vis=visibility,mode='get',hdkey='ptcs')
 print 'Phase center set to:'
 phcen=au.rad2radec(phcen_rad[0]['r1'][0][0][0],phcen_rad[0]['r1'][1][0][0],hmsdms=True).replace(',','')

param.txt

@@ -29,7 +29,6 @@ do_monte='F'
 integ_fit='B'
 uv_fit='F'
 uv_fix='F'
-uv_num = 1
 uv_initp =''
 def_times='F'
 startTimeH=''

param_description.txt

@@ -66,8 +66,6 @@ uv_fit: toggle to do uv plane fitting; string, options are 'T' or 'F'
 
 uv_fix: toggle to fix position in uv fitting from position of whole data set; string, options are 'T' or 'F'
 
-uv_num: if doing uv fitting, the number of point sources for fitting; integer
-
 uv_initp: if doing uv fitting, provide the path to the intial guess file for uv fitting; string
 Format of this file is a row for each point source, with ra offset from phase center (arcsec),
 dec offset from phase center (arcsec), and flux (Jy) on each row. Target MUST be first source in file

uv_init_example.txt

@@ -1,4 +1,4 @@
-#example uv initial parameters file, first line is target!
+#uv initial parameters file, first line is target! (please only edit the rows below this one).
 0 0 700e-3
 1 1 500e-3
 2 2 400e-3