Merge pull request #21 from steven-murray/some-fixes

fix: error in pyuvdata import

.gitignore

@@ -8,3 +8,8 @@ py21cmsense\.egg-info/
 *.pyc
 docs/_build/
 .ipynb_checkpoints/
+pip-wheel-metadata/
+.tox/
+*.pkl
+*.npz
+*.png

example_configs/observatory_hera.yml

@@ -6,7 +6,7 @@
 antpos:
   function: hera  # if antpos is a dict, it uses a function from antpos.py
   hex_num: 7
-  l: 14
+  separation: 14
   dl: 12.12
   units: m
 beam:

py21cmsense/_utils.py

@@ -5,7 +5,7 @@
 from astropy import units as un
 from astropy.coordinates import EarthLocation, SkyCoord
 from astropy.time import Time
-from pyuvdata import uvutils
+from pyuvdata import utils as uvutils
 
 from . import config
 

py21cmsense/antpos.py

@@ -11,7 +11,7 @@
 from . import _utils as ut
 
 
-def hera(hex_num, l, dl, units="m"):
+def hera(hex_num, separation, dl, units="m"):
     """
     Produce a simple regular hexagonal array.
 
@@ -37,7 +37,7 @@ def hera(hex_num, l, dl, units="m"):
     -------
 
     """
-    separation = ut.apply_or_convert_unit(units)(l)
+    separation = ut.apply_or_convert_unit(units)(separation)
     dl = ut.apply_or_convert_unit(units)(dl)
 
     try:

py21cmsense/cli.py

@@ -142,7 +142,7 @@ def calc_sense(
             freq=sensitivity.observation.frequency,
         )
 
-    np.savez(os.path.join(direc, fname), ks=sensitivity.k1d, **out)
+    np.savez(os.path.join(direc, fname), ks=sensitivity.k1d.value, **out)
 
     if write_significance:
         sig = sensitivity.calculate_significance(

py21cmsense/sensitivity.py

@@ -462,7 +462,7 @@ def plot_sense_2d(self, sense2d):
         except ImportError:
             raise ImportError("matplotlib is required to make plots...")
 
-        keys = list(sorted(sense2d.keys()))
+        keys = sorted(sense2d.keys())
         x = np.array([v.value for v in keys])
         x = (
             np.repeat(x, len(self.observation.kparallel))