Fix some freq_interp_kind issues I missed in #442

RadioAstronomySoftwareGroup · Feb 1, 2024 · 48f999a · 48f999a
1 parent ea299ad
commit 48f999a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/pyuvsim/tests/test_antenna.py b/pyuvsim/tests/test_antenna.py
@@ -18,7 +18,9 @@ def test_jones_set_spline(cst_beam, hera_loc):
     # Run get_beam_jones with spline options.
     array_location = hera_loc
     beam0 = cst_beam.copy()
-    beam0.freq_interp_kind = 'cubic'
+    if hasattr(beam0, "_freq_interp_kind"):
+        # this can go away when we require pyuvdata version >= 2.4.2
+        beam0.freq_interp_kind = "cubic"
     telescope_config_name = os.path.join(SIM_DATA_PATH, 'mwa128_config.yaml')
     with open(telescope_config_name, 'r') as yf:
         telconfig = yaml.safe_load(yf)

diff --git a/pyuvsim/tests/test_run.py b/pyuvsim/tests/test_run.py
@@ -179,7 +179,8 @@ def test_analytic_diffuse(model, tmpdir):
 @pytest.mark.filterwarnings("ignore:Fixing auto polarization power beams")
 def test_powerbeam_sim(cst_beam):
     new_cst = copy.deepcopy(cst_beam)
-    new_cst.freq_interp_kind = 'nearest'  # otherwise we get an error about freq interpolation
+    if hasattr(new_cst, "_freq_interp_kind"):
+        new_cst.freq_interp_kind = 'nearest'  # otherwise we get an error about freq interpolation
     new_cst.efield_to_power()
     beams = BeamList([new_cst] * 4)
     cfg = os.path.join(SIM_DATA_PATH, 'test_config', 'param_1time_1src_testcat.yaml')

diff --git a/pyuvsim/tests/test_telescope.py b/pyuvsim/tests/test_telescope.py
@@ -101,8 +101,9 @@ def test_convert_loop(beam_objs):
     assert beamlist._str_beam_list == []
 
     # Reset UVBeams
-    beams[0].freq_interp_kind = None
-    beams[1].freq_interp_kind = None
+    if hasattr(beams[0], "_freq_interp_kind"):
+        beams[0].freq_interp_kind = None
+        beams[1].freq_interp_kind = None
 
 
 def test_object_mode(beam_objs):

diff --git a/pyuvsim/tests/test_uvsim.py b/pyuvsim/tests/test_uvsim.py
@@ -48,7 +48,11 @@ def multi_beams():
         beam0.read_beamfits(herabeam_default)
     beam0.use_future_array_shapes()
     beam0.extra_keywords['beam_path'] = herabeam_default
-    beam0.freq_interp_kind = 'cubic'
+
+    if hasattr(beam0, "_freq_interp_kind"):
+        # this can go away when we require pyuvdata version >= 2.4.2
+        beam0.freq_interp_kind = "cubic"
+
     if hasattr(beam0, "_interpolation_function"):
         beam0.interpolation_function = 'az_za_simple'
     beam1 = pyuvsim.AnalyticBeam('uniform')