Update benchmark plots.

casangi · Sep 1, 2021 · 47401ec · 47401ec
1 parent 6b9e69f
commit 47401ec
Show file tree

Hide file tree

Showing 18 changed files with 10,543 additions and 2,496 deletions.
diff --git a/docs/_media/aws_A001_X1273_X2e3.png b/docs/_media/aws_A001_X1273_X2e3.png
diff --git a/docs/_media/aws_A001_X1273_Xc66.png b/docs/_media/aws_A001_X1273_Xc66.png
diff --git a/docs/_media/aws_A001_X12a3_X3be.png b/docs/_media/aws_A001_X12a3_X3be.png
diff --git a/docs/_media/aws_A001_X133d_X1a36.png b/docs/_media/aws_A001_X133d_X1a36.png
diff --git a/docs/_media/cluster_A001_X1273_X2e3.png b/docs/_media/cluster_A001_X1273_X2e3.png
diff --git a/docs/_media/cluster_A001_X1273_Xc66.png b/docs/_media/cluster_A001_X1273_Xc66.png
diff --git a/docs/_media/cluster_A001_X12a3_X3be.png b/docs/_media/cluster_A001_X12a3_X3be.png
diff --git a/docs/_media/cluster_A001_X133d_X1a36.png b/docs/_media/cluster_A001_X133d_X1a36.png
diff --git a/docs/_media/node_A001_X1273_X2e3.png b/docs/_media/node_A001_X1273_X2e3.png
diff --git a/docs/_media/node_A001_X1273_Xc66.png b/docs/_media/node_A001_X1273_Xc66.png
diff --git a/docs/_media/node_A001_X12a3_X3be.png b/docs/_media/node_A001_X12a3_X3be.png
diff --git a/docs/_media/node_A001_X133d_X1a36.png b/docs/_media/node_A001_X133d_X1a36.png
diff --git a/docs/benchmarking.ipynb b/docs/benchmarking.ipynb
diff --git a/docs/imaging/cube_image_graph.png b/docs/imaging/cube_image_graph.png
diff --git a/docs/imaging/cube_imaging_example.ipynb b/docs/imaging/cube_imaging_example.ipynb
diff --git a/docs/imaging/imaging_weights_example.ipynb b/docs/imaging/imaging_weights_example.ipynb
diff --git a/docs/imaging/mosaic_image_example.ipynb b/docs/imaging/mosaic_image_example.ipynb
diff --git a/ngcasa/imaging/synthesis_imaging_cube.py b/ngcasa/imaging/synthesis_imaging_cube.py
@@ -282,26 +282,28 @@ def _make_pb(vis_data_shape,freq_chan,pb_parms,grid_parms):
 
 
 def _make_imaging_weight_chunk(uvw,data_weight,freq_chan,grid_parms,imaging_weights_parms):
-    #if natural
-    _grid_parms = copy.deepcopy(grid_parms)
-    _grid_parms['image_size_padded'] =  grid_parms['image_size'] #do not need to pad since no fft
-    _grid_parms['oversampling'] = 0
-    _grid_parms['support'] = 1
-    _grid_parms['do_psf'] = True
-    _grid_parms['complex_grid'] = False
-    _grid_parms['do_imaging_weight'] = True
-
-    cgk_1D = np.ones((1))
+    if imaging_weights_parms['weighting'] == 'natural':
+        imaging_weights = data_weight
+    else:
+        _grid_parms = copy.deepcopy(grid_parms)
+        _grid_parms['image_size_padded'] =  grid_parms['image_size'] #do not need to pad since no fft
+        _grid_parms['oversampling'] = 0
+        _grid_parms['support'] = 1
+        _grid_parms['do_psf'] = True
+        _grid_parms['complex_grid'] = False
+        _grid_parms['do_imaging_weight'] = True
+
+        cgk_1D = np.ones((1))
 
-    #Grid Weights
-    weight_density_grid, sum_weight = _standard_grid_psf_numpy_wrap(uvw, data_weight, freq_chan, cgk_1D, _grid_parms)
-
-    #Calculate Briggs
-    briggs_factors = _calculate_briggs_parms(weight_density_grid, sum_weight, imaging_weights_parms) # 2 x chan x pol
-
-    #Degrid weight density grid
-    weight_density_grid = np.moveaxis(weight_density_grid,(0,1),(2,3)) #Temp need to change def of image coord pos.
-    imaging_weights = _standard_imaging_weight_degrid_numpy_wrap(weight_density_grid, uvw, data_weight, briggs_factors, freq_chan, _grid_parms)
+        #Grid Weights
+        weight_density_grid, sum_weight = _standard_grid_psf_numpy_wrap(uvw, data_weight, freq_chan, cgk_1D, _grid_parms)
+        
+        #Calculate Briggs
+        briggs_factors = _calculate_briggs_parms(weight_density_grid, sum_weight, imaging_weights_parms) # 2 x chan x pol
+        
+        #Degrid weight density grid
+        weight_density_grid = np.moveaxis(weight_density_grid,(0,1),(2,3)) #Temp need to change def of image coord pos.
+        imaging_weights = _standard_imaging_weight_degrid_numpy_wrap(weight_density_grid, uvw, data_weight, briggs_factors, freq_chan, _grid_parms)
 
     return imaging_weights