Changeset 67

Timestamp:

Sep 23, 2014 1:20:56 PM (10 years ago)

Author:

JohnLightfoot

Message:

added clean beams

File:

• trunk/beamsgenerator.py (modified) (4 diffs)

trunk/beamsgenerator.py

@@ -36 +36 @@
       (mult-1)*rpix:(mult+1)*rpix, (mult-1)*rpix:(mult+1)*rpix]
 
-    return dirty_beam
+    # fit Gaussian to dirty beam
+    shape = numpy.shape(dirty_beam)
+    fitter = fitgaussian.FitGaussian()
+    dirty_centre = numpy.array(dirty_beam[shape[0]/2-5:shape[0]/2+5,
+      shape[1]/2-5:shape[1]/2+5])
+    p = fitter.fitgaussian(dirty_centre)
+
+    # clean beam
+    cp = (1.0, float(shape[0])/2.0, float(shape[1])/2.0, p[3], p[4], p[5])
+    rotgauss = fitter.gaussian(*cp)
+    bmax = numpy.max(dirty_beam)
+    clean_beam = numpy.fromfunction(rotgauss, numpy.shape(dirty_beam))
+
+    return dirty_beam, clean_beam
 
 def calculate_primary_beam(npix, rpix, mult, mx, my, bmax, m1_diameter,
@@ -142 +155 @@
         self.result['primary amplitude beam'] = collections.OrderedDict()
         self.result['dirty beam'] = collections.OrderedDict()
+        self.result['clean beam'] = collections.OrderedDict()
 
         wnmax = np.max(fts_wn_truncated)
@@ -183 +197 @@
             indata = (npix, rpix, mult, bmax, uvmapgen['bxby'], wnmax, wn,)
             jobs[wn] = self.job_server.submit(calculate_dirty_beam,
-              indata, (), ('numpy',))
+              indata, (), ('numpy','fitgaussian',))
 
 
@@ -194 +208 @@
 
         for wn in fts_wn_truncated:
-            dirty_beam = jobs[wn]()
+            dirty_beam,clean_beam = jobs[wn]()
             image = co.Image(data=dirty_beam, axes=[axis1, axis2],
               title='Dirty Beam %06.4g cm-1' % wn)
             self.result['dirty beam'][wn] = image
+            image = co.Image(data=clean_beam, axes=[axis1, axis2],
+              title='Clean Beam %06.4g cm-1' % wn)
+            self.result['clean beam'][wn] = image
 
         return self.result