Changeset 68

Timestamp:

Sep 23, 2014 1:21:28 PM (10 years ago)

Author:

JohnLightfoot

Message:

parallelized

File:

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

trunk/dirtyimage.py

@@ -7 +7 @@
 
 import common.commonobjects as co
+
+def dirty(b_x_list, b_y_list, spectra, wn_spectra, iwn, wn, spatial_axis, npix):
+    image = numpy.zeros([npix, npix], numpy.float)
+    beam = numpy.zeros([npix, npix], numpy.float)
+
+    for ibx,b_x in enumerate(b_x_list):
+        b_x = b_x_list[ibx]
+        b_y = b_y_list[ibx]
+        spectrum = spectra[ibx]
+        wn_spectrum = wn_spectra[ibx]
+
+        # 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)
+
+        vis = spectrum[wn_spectrum==wn]
+
+        # numpy arrays are [row,col] or here [y,x]
+        for iy,y in enumerate(spatial_axis):
+            contribution = (vis * valx * valy[iy]) + \
+              numpy.conjugate(vis * valx * valy[iy])
+            image[iy,:] += contribution.real
+            contribution = (valx * valy[iy]) + \
+              numpy.conjugate(valx * valy[iy])
+            beam[iy,:] += contribution.real
+   
+    # normalise
+    image /= numpy.sum(beam)
+    beam /= numpy.sum(beam)
+
+    return image, beam
 
 
@@ -40 +73 @@
         dirtybeam = np.zeros([npix, npix, len(wavenumber)], np.float)
 
+        # calculate dirty image for each wn
+        # uvspectrum objects don't pickle so unpack them first
+        b_x_list = []
+        b_y_list = []
+        spectra = []
+        wn_spectra = []
         for uvspectrum in uvspectra:
+            b_x_list.append(uvspectrum.baseline_x)
+            b_y_list.append(uvspectrum.baseline_y)
+            spectra.append(uvspectrum.spectrum)
+            wn_spectra.append(uvspectrum.wavenumber)
 
-            b_x = uvspectrum.baseline_x
-            b_y = uvspectrum.baseline_y
-            spectrum = uvspectrum.spectrum
-            wn_spectrum = uvspectrum.wavenumber
+        jobs = {}
+        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,)
+            jobs[wn] = self.job_server.submit(dirty, indata, (),
+              ('numpy','math',))
 
-            for iwn,wn in enumerate(wavenumber):
-                # 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 = np.exp(2j * math.pi * argx)
-                valy = np.exp(2j * math.pi * argy)
-
-                vis = spectrum[wn_spectrum==wn]
-
-                # numpy arrays are [row,col] or here [y,x]
-                for iy,y in enumerate(spatial_axis):
-                    contribution = (vis * valx * valy[iy]) + \
-                      np.conjugate(vis * valx * valy[iy])
-                    dirtyimage[iy,:,iwn] += contribution.real
-                    contribution = (valx * valy[iy]) + \
-                      np.conjugate(valx * valy[iy])
-                    dirtybeam[iy,:,iwn] += contribution.real
-   
-        # normalise
         for iwn,wn in enumerate(wavenumber):
-            dirtyimage[:,:,iwn] /= np.sum(dirtybeam[:,:,iwn])
-            dirtybeam[:,:,iwn] /= np.sum(dirtybeam[:,:,iwn])
-#        dirtyimage /= 2.0 * float(len(uvspectra))
-#        dirtybeam /= 2.0 * float(len(uvspectra))
-        print 'sum image', np.sum(dirtyimage[:,:,0])
-        print 'sum beam', np.sum(dirtybeam[:,:,0])
+            # collect and store results
+            dirtyimage[:,:,iwn], dirtybeam[:,:,iwn] = jobs[wn]()
 
         self.result['dirtyimage'] = dirtyimage