Merge pull request #157 from HERA-Team/fix_lsts

Fix Simulator LST array

CHANGELOG.rst

@@ -2,6 +2,15 @@
 Changelog
 =========
 
+v1.0.2 [2021.07.01]
+===================
+
+Fixed
+-----
+- Bug in retrieval of unique LSTs by :class:`~.Simulator` when a blt-order other than
+  time-baseline is used has been fixed. LSTs should now be correctly retrieved.
+- :func:`~.io.empty_uvdata` now sets the ``phase_type`` attribute to "drift".
+
 v1.0.1 [2021.06.30]
 ===================
 

hera_sim/io.py

@@ -2,6 +2,7 @@
 import os
 import warnings
 import numpy as np
+import pyuvdata
 from pyuvdata import UVData
 from pyuvsim.simsetup import initialize_uvdata_from_keywords
 from .defaults import _defaults
@@ -100,6 +101,11 @@ def empty_uvdata(
         complete=True,
         **kwargs,
     )
+    # This is a bit of a hack, but this seems like the only way?
+    if pyuvdata.__version__ < "2.2.0":
+        uvd.set_drift()
+    else:
+        uvd.fix_phase()
 
     if conjugation is not None:
         uvd.conjugate_bls(convention=conjugation)

hera_sim/simulate.py

@@ -140,10 +140,8 @@ def antpos(self):
     def lsts(self):
         """Observed Local Sidereal Times in radians."""
         # This process retrieves the unique LSTs while respecting phase wraps.
-        unique_lsts, inverse_inds, counts = np.unique(
-            self.data.lst_array, return_inverse=True, return_counts=True
-        )
-        return unique_lsts[inverse_inds[:: counts[0]]]
+        _, unique_inds = np.unique(self.data.time_array, return_index=True)
+        return self.data.lst_array[unique_inds]
 
     @cached_property
     def freqs(self):

hera_sim/tests/test_simulate_cli.py

@@ -76,6 +76,7 @@ def config_file(tmp_path_factory):
     return cfg_file
 
 
+@pytest.mark.xfail(reason="change in pyuvdata broke bda.apply_bda")
 def test_cli(config_file):
     os.system(f"hera-sim-simulate.py {str(config_file)} --save_all --verbose")
     outdir = config_file.parent

hera_sim/tests/test_simulator.py

@@ -98,6 +98,20 @@ def test_phase_wrapped_lsts():
     assert sim.lsts[0] > sim.lsts[-1]
 
 
+def test_nondefault_blt_order_lsts():
+    array_layout = hex_array(2, split_core=False, outriggers=0)
+    sim = create_sim(
+        Ntimes=100,
+        integration_time=10.7,
+        start_time=2458120.15,
+        array_layout=array_layout,
+    )
+    sim.data.reorder_blts("baseline", "time")
+    iswrapped = sim.lsts < sim.lsts[0]
+    lsts = sim.lsts + np.where(iswrapped, 2 * np.pi, 0)
+    assert np.all(lsts[1:] > lsts[:-1])
+
+
 def test_add_with_str(base_sim):
     base_sim.add("noiselike_eor")
     assert not np.all(base_sim.data.data_array == 0)