Change alma_airy to casa_airy

ngcasa/imaging/_imaging_utils/_check_imaging_parms.py

@@ -46,7 +46,7 @@ def _check_gcf_parms(gcf_parms):
     import numbers
     parms_passed = True
 
-    if not(_check_parms(gcf_parms, 'function', [str], acceptable_data=['alma_airy','airy'], default='alma_airy')): parms_passed = False
+    if not(_check_parms(gcf_parms, 'function', [str], acceptable_data=['casa_airy','airy'], default='casa_airy')): parms_passed = False
     if not(_check_parms(gcf_parms, 'freq_chan', [list,np.array],list_acceptable_data_types=[numbers.Number],list_len=-1)): parms_passed = False
     if not(_check_parms(gcf_parms, 'list_dish_diameters', [list,np.array],list_acceptable_data_types=[numbers.Number],list_len=-1)): parms_passed = False
     if not(_check_parms(gcf_parms, 'list_blockage_diameters', [list,np.array],list_acceptable_data_types=[numbers.Number],list_len=-1)): parms_passed = False
@@ -60,7 +60,7 @@ def _check_gcf_parms(gcf_parms):
     if not(_check_parms(gcf_parms, 'support_cut_level', [numbers.Number], default=2.5*10**-2)): parms_passed = False
     if not(_check_parms(gcf_parms, 'a_chan_num_chunk', [np.int], default=3)): parms_passed = False
 
-    if gcf_parms['function'] == 'airy' or gcf_parms['function'] == 'alma_airy':
+    if gcf_parms['function'] == 'airy' or gcf_parms['function'] == 'casa_airy':
         if not(_check_parms(gcf_parms, 'list_dish_diameters', [list,np.array],list_acceptable_data_types=[numbers.Number],list_len=-1)): parms_passed = False
         if not(_check_parms(gcf_parms, 'list_blockage_diameters', [list,np.array],list_acceptable_data_types=[numbers.Number],list_len=-1)): parms_passed = False
 
@@ -152,7 +152,7 @@ def _check_pb_parms(img_dataset, pb_parms):
 
     #if not(_check_parms(pb_parms, 'pb_name', [str], default='PB')): parms_passed = False
 
-    if not(_check_parms(pb_parms, 'function', [str], default='alma_airy')): parms_passed = False
+    if not(_check_parms(pb_parms, 'function', [str], default='casa_airy')): parms_passed = False
 
     if not(_check_parms(pb_parms, 'list_dish_diameters', [list],list_acceptable_data_types=[numbers.Number],list_len=-1)): parms_passed = False
     if not(_check_parms(pb_parms, 'list_blockage_diameters', [list],list_acceptable_data_types=[numbers.Number],list_len=-1)): parms_passed = False

ngcasa/imaging/_imaging_utils/_make_pb_symmetric.py

@@ -76,7 +76,7 @@ def _airy_disk(freq_chan,pol,pb_parms,grid_parms):
 
 #Formula for obscured airy pattern found in casa6/casa5/code/synthesis/TransformMachines/PBMath1DAiry.cc/h
 # If ipower is 1 the voltage pattern is returned if ipower is 2 the primary beam is returned.
-def _alma_airy_disk(freq_chan,pol,pb_parms,grid_parms):
+def _casa_airy_disk(freq_chan,pol,pb_parms,grid_parms):
     '''
     Does not yet handle beam squint
     dish_diameters : list of int
@@ -184,7 +184,7 @@ def _airy_disk_rorder(freq_chan,pol,pb_parms,grid_parms):
 
 #Formula for obscured airy pattern found in casa6/casa5/code/synthesis/TransformMachines/PBMath1DAiry.cc/h
 # If ipower is 1 the voltage pattern is returned if ipower is 2 the primary beam is returned.
-def _alma_airy_disk_rorder(freq_chan,pol,pb_parms,grid_parms):
+def _casa_airy_disk_rorder(freq_chan,pol,pb_parms,grid_parms):
     '''
     Does not yet handle beam squint
     dish_diameters : list of int

ngcasa/imaging/make_gridding_convolution_function.py

@@ -44,7 +44,7 @@ def make_gridding_convolution_function(mxds, gcf_parms, grid_parms, sel_parms):
     vis_dataset : xarray.core.dataset.Dataset
         Input visibility dataset.
     gcf_parms : dictionary
-    gcf_parms['function'] : {'alma_airy'/'airy'}, default = 'alma_airy'
+    gcf_parms['function'] : {'casa_airy'/'airy'}, default = 'casa_airy'
         The primary beam model used (a function of the dish diameter and blockage diameter).
     gcf_parms['list_dish_diameters']  : list of number, units = meter
         A list of unique antenna dish diameters.
@@ -128,11 +128,11 @@ def make_gridding_convolution_function(mxds, gcf_parms, grid_parms, sel_parms):
     if _gcf_parms['function'] == 'airy':
         from ._imaging_utils._make_pb_symmetric import _airy_disk_rorder
         pb_func = _airy_disk_rorder
-    elif _gcf_parms['function'] == 'alma_airy':
-        from ._imaging_utils._make_pb_symmetric import _alma_airy_disk_rorder
-        pb_func = _alma_airy_disk_rorder
+    elif _gcf_parms['function'] == 'casa_airy':
+        from ._imaging_utils._make_pb_symmetric import _casa_airy_disk_rorder
+        pb_func = _casa_airy_disk_rorder
     else:
-        assert(False), "######### ERROR: Only airy and alma_airy function has been implemented"
+        assert(False), "######### ERROR: Only airy and casa_airy function has been implemented"
 
     #For now only a_term works
     _gcf_parms['a_term'] =  True

ngcasa/imaging/synthesis_imaging_cube.py

@@ -46,7 +46,7 @@ def synthesis_imaging_cube(vis_mxds, img_xds, grid_parms, imaging_weights_parms,
     import itertools
     from cngi._utils._check_parms import _check_sel_parms, _check_existence_sel_parms
     from ._imaging_utils._check_imaging_parms import _check_imaging_weights_parms, _check_grid_parms, _check_pb_parms
-    from ._imaging_utils._make_pb_symmetric import _airy_disk, _alma_airy_disk
+    from ._imaging_utils._make_pb_symmetric import _airy_disk, _casa_airy_disk
     from cngi.image import make_empty_sky_image
 
     _mxds = vis_mxds.copy(deep=True)
@@ -265,9 +265,9 @@ def _make_pb(vis_data_shape,freq_chan,pb_parms,grid_parms):
     if pb_parms['function'] == 'airy':
         from ._imaging_utils._make_pb_symmetric import _airy_disk
         pb_func = _airy_disk
-    elif pb_parms['function'] == 'alma_airy':
-        from ._imaging_utils._make_pb_symmetric import _alma_airy_disk
-        pb_func = _alma_airy_disk
+    elif pb_parms['function'] == 'casa_airy':
+        from ._imaging_utils._make_pb_symmetric import _casa_airy_disk
+        pb_func = _casa_airy_disk
     else:
         print('Only the airy function has been implemented')