Changeset 71

Timestamp:

Sep 25, 2014 12:53:16 PM (10 years ago)

Author:

JohnLightfoot

Message:

parallelize and fix normalisation

File:

• trunk/dirtyimage.py (modified) (3 diffs)

trunk/dirtyimage.py

@@ -19 +19 @@
 
         # must be a better way of doing this
-        argx = b_x * (wn * 100.0) * spatial_axis / 206265.0
-        argy = b_y * (wn * 100.0) * spatial_axis / 206265.0
-        valx = numpy.exp(2j * math.pi * argx)
-        valy = numpy.exp(2j * math.pi * argy)
+        argx = numpy.radians(b_x * (wn * 100.0) * spatial_axis / 3600.0)
+        argy = numpy.radians(b_y * (wn * 100.0) * spatial_axis / 3600.0)
+        valx = numpy.exp(2.0j * math.pi * argx)
+        valy = numpy.exp(2.0j * math.pi * argy)
 
         vis = spectrum[wn_spectrum==wn]
@@ -36 +36 @@
    
     # normalise
-    image /= numpy.sum(beam)
-    beam /= numpy.sum(beam)
+    # The sum of the dirty beam should equal the 0 baseline vis measurement: 0
+    # Normalising the volume would preserve flux under convolution but
+    # is problematic as the volume is 0, so normalise the peak to 1.
+    beam /= 2.0 * len(b_x_list)
+
+    # likewise for dirty map
+    image /= 2.0 * len(b_x_list)
 
     return image, beam
@@ -88 +93 @@
         for iwn,wn in enumerate(wavenumber):
             # submit jobs
-            print 'starting dirty for', wn
             indata = (b_x_list, b_y_list, spectra, wn_spectra, iwn, wn, 
               spatial_axis, npix,)