Temporary fix for future array shape

CHANGELOG.rst

@@ -2,6 +2,13 @@
 Changelog
 =========
 
+dev-version
+===========
+
+Changed
+-------
+- Temporarily forced all UVData objects in the code to use current array shapes.
+
 v2.3.3 [2022.02.21]
 ===================
 

hera_sim/io.py

@@ -114,6 +114,10 @@ def empty_uvdata(
     if conjugation is not None:
         uvd.conjugate_bls(convention=conjugation)
 
+    # Temporary fix for future array shape - to be removed after v3.
+    if uvd.future_array_shapes:
+        uvd.use_current_array_shapes()
+
     return uvd
 
 

hera_sim/tests/test_vis.py

@@ -5,6 +5,7 @@
 from astropy.units import sday, rad
 from astropy import units
 from pyuvsim.analyticbeam import AnalyticBeam
+from pyuvsim.telescope import BeamConsistencyError
 from vis_cpu import HAVE_GPU
 from hera_sim.defaults import defaults
 from hera_sim import io
@@ -357,6 +358,7 @@ def test_autocorr_flat_beam(uvdata, simulator):
 
     v = sim.uvdata.get_data((0, 0, "xx"))
 
+    print(v)
     # The sky is uniform and integrates to one over the full sky.
     # Thus the stokes-I component of an autocorr will be 0.5 (going to horizon)
     # Since I = XX + YY and X/Y should be equal, the xx part should be 0.25
@@ -619,7 +621,7 @@ def test_beam_type_consistency(uvdata, sky_model):
     beams = [AnalyticBeam("gaussian"), AnalyticBeam("airy")]
     beams[0].efield_to_power()
 
-    with pytest.raises(ValueError):
+    with pytest.raises(BeamConsistencyError):
         ModelData(uvdata=uvdata, sky_model=sky_model, beams=beams)
 
 

hera_sim/visibilities/pyuvsim_wrapper.py

@@ -52,4 +52,6 @@ def simulate(self, data_model: ModelData):
             catalog=pyuvsim.simsetup.SkyModelData(data_model.sky_model),
             quiet=self.quiet,
         )
+        out_uv.use_current_array_shapes()
+        data_model.uvdata.use_current_array_shapes()
         return out_uv.data_array

hera_sim/visibilities/simulators.py

@@ -87,18 +87,24 @@ def __init__(
         self._validate()
 
     def _process_uvdata(self, uvdata: UVData | str | Path):
-        if isinstance(uvdata, UVData):
-            return uvdata
-        elif isinstance(uvdata, (str, Path)):
+
+        if isinstance(uvdata, (str, Path)):
             out = UVData()
             out.read(str(uvdata))
-            return out
-        else:
+            uvdata = out
+
+        if not isinstance(uvdata, UVData):
             raise TypeError(
                 "uvdata must be a UVData object or path to a compatible file. Got "
                 f"{uvdata}, type {type(uvdata)}"
             )
 
+        # Temporary fix for future array shape - to be removed after v3.
+        if uvdata.future_array_shapes:
+            uvdata.use_current_array_shapes()
+
+        return uvdata
+
     @classmethod
     def _process_beams(cls, beams: BeamListType | None, normalize_beams: bool):
         if beams is None: