jolly-roger 0.0.2__tar.gz → 0.1.0__tar.gz

{jolly_roger-0.0.2 → jolly_roger-0.1.0}/.gitignore

@@ -156,3 +156,4 @@ Thumbs.db
 # Common editor files
 *~
 *.swp
+jolly_roger/_version.py

{jolly_roger-0.0.2 → jolly_roger-0.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jolly-roger
-Version: 0.0.2
+Version: 0.1.0
 Summary: The pirate flagger
 Project-URL: Homepage, https://github.com/flint-crew/jolly-roger
 Project-URL: Bug Tracker, https://github.com/flint-crew/jolly-roger/issues

{jolly_roger-0.0.2 → jolly_roger-0.1.0}/jolly_roger/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.2'
-__version_tuple__ = version_tuple = (0, 0, 2)
+__version__ = version = '0.1.0'
+__version_tuple__ = version_tuple = (0, 1, 0)

{jolly_roger-0.0.2 → jolly_roger-0.1.0}/jolly_roger/hour_angles.py

@@ -8,15 +8,14 @@ from typing import Literal
 
 import astropy.units as u
 import numpy as np
-from astropy.coordinates import EarthLocation, SkyCoord, get_sun
+from astropy.coordinates import AltAz, EarthLocation, SkyCoord, get_sun
 from astropy.time import Time
 from casacore.tables import table
 
 from jolly_roger.logging import logger
 
 # Default location with XYZ based on mean of antenna positions
-ASKAP_XYZ_m = np.array([-2556146.66356375, 5097426.58592797, -2848333.08164107]) * u.m
-ASKAP = EarthLocation(*ASKAP_XYZ_m)
+ASKAP = EarthLocation.of_site("ASKAP")
 
 
 @dataclass
@@ -75,6 +74,9 @@ def _process_position(
         if position == "sun":
             logger.info("Getting sky-position of the sun")
             position = get_sun(times)
+        else:
+            logger.info(f"Getting sky-position of {position=}")
+            position = SkyCoord.from_name(position)
 
     if position is None:
         if ms_path is None:
@@ -83,8 +85,8 @@ def _process_position(
 
         with table(str(ms_path / "FIELD")) as tab:
             logger.info(f"Getting the sky-position from PHASE_DIR of {ms_path=}")
-            field_positions = tab.getcol("PHASE_DIR")
-            position = SkyCoord(field_positions[0] * u.rad)
+            field_positions = tab.getcol("PHASE_DIR")[:]
+            position = SkyCoord(*(field_positions * u.rad).squeeze())
 
     if isinstance(position, SkyCoord):
         return position
@@ -116,7 +118,7 @@ def make_hour_angles_for_ms(
     logger.info(f"Computing hour angles for {ms_path=}")
     with table(str(ms_path), ack=False) as tab:
         logger.info("Extracting timesteps and constructing time mapping")
-        times_mjds = tab.getcol("TIME_CENTROID")
+        times_mjds = tab.getcol("TIME_CENTROID")[:] * u.s
 
         # get unique time steps and make sure they are in their first appeared order
         times_mjds, indices = np.unique(times_mjds, return_index=True)
@@ -127,33 +129,28 @@ def make_hour_angles_for_ms(
     if whole_day:
         logger.info(f"Assuming a full day from {times_mjds} MJD (seconds)")
         time_step = times_mjds[1] - times_mjds[0]
-        times_mjds = times_mjds[0] + time_step * np.arange(
-            int(60 * 60 * 24 / time_step)
+        times_mjds = np.arange(
+            start=times_mjds[0],
+            stop=times_mjds[0] + 24 * u.hour,
+            step=time_step,
         )
 
-    times = Time(times_mjds / 60 / 60 / 24, format="mjd")
+    times = Time(times_mjds, format="mjd", scale="utc")
 
-    sky_position: SkyCoord = _process_position(
-        position=position, times=times, ms_path=ms_path
-    )
+    sky_position = _process_position(position=position, times=times, ms_path=ms_path)
 
     lst = times.sidereal_time("apparent", longitude=location.lon)
-    hour_angle = lst - sky_position.ra
-    mask = hour_angle > 12 * u.hourangle
-    hour_angle[mask] -= 24 * u.hourangle
+    hour_angle = (lst - sky_position.ra).wrap_at(12 * u.hourangle)
 
     logger.info("Creatring elevation curve")
-    sin_alt = np.arcsin(
-        np.sin(location.lat) * np.sin(sky_position[0].dec.rad)
-        + np.cos(location.lat) * np.cos(sky_position.dec.rad) * np.cos(hour_angle)
-    ).to(u.rad)
+    altaz = sky_position.transform_to(AltAz(obstime=times, location=location))
 
     return PositionHourAngles(
         hour_angle=hour_angle,
         time_mjds=times_mjds,
         location=location,
         position=sky_position,
-        elevation=sin_alt,
+        elevation=altaz.alt.to(u.rad),
         time=times,
         time_map=time_map,
     )

{jolly_roger-0.0.2 → jolly_roger-0.1.0}/jolly_roger/uvws.py

@@ -44,12 +44,11 @@ def xyz_to_uvw(
     """
     b_xyz = baselines.b_xyz
 
-    # Getting the units right is important, mate
-    ha = hour_angles.hour_angle
-    ha = ha.to(u.rad)
+    # Convert HA to geocentric hour angle (at Greenwich meridian)
+    # This is why we subtract the location's longitude
+    ha = hour_angles.hour_angle - hour_angles.location.lon
 
     declination = hour_angles.position.dec
-    declination = declination.to(u.rad)
 
     # This is necessary for broadcastung in the matrix to work.
     # Should the position be a solar object like the sub its position
@@ -71,21 +70,22 @@ def xyz_to_uvw(
             [sin_ha, cos_ha, zeros],
             [-sin_dec * cos_ha, sin_dec * sin_ha, cos_dec],
             [
-                np.cos(declination) * np.cos(ha),
-                np.cos(declination) * np.sin(ha),
-                np.sin(declination),
+                cos_dec * cos_ha,
+                -cos_dec * sin_ha,
+                sin_dec,
             ],
         ]
     )
 
     # Every time this confuses me and I need the first mate to look over.
-    # b_xyz shape: (baselines, coord) where coord is XYZ
+    # b_xyz shape: (baselines, 3) where coord is XYZ
     # mat shape: (3, 3, timesteps)
-    # uvw shape: (baseline, coord, timesteps) where coord is UVW
-    uvw = np.einsum("ijk,lj->lik", mat, b_xyz, optimize=True)  # codespell:ignore lik
+    # uvw shape: (3, baseline, timesteps) where coord is UVW
+    uvw = np.einsum("ijk,lj->ilk", mat, b_xyz, optimize=True)  # codespell:ignore ilk
+    # i,j,k -> (3, 3, time)
+    # l,j -> (baseline, 3)
+    # i,l,k -> (3, baseline, time)
 
-    # Make order (coord, baseline, timesteps)
-    uvw = np.swapaxes(uvw, 0, 1)
     logger.debug(f"{uvw.shape=}")
 
     return UVWs(uvws=uvw, hour_angles=hour_angles, baselines=baselines)

jolly_roger-0.1.0/tests/test_hour_angles.py

@@ -0,0 +1,16 @@
+"""Some tests around the hour angles"""
+
+from __future__ import annotations
+
+from astropy.coordinates import EarthLocation
+
+
+def test_askap_position() -> None:
+    """Ensure that the EarthLocation for ASKAP is correctly formed"""
+    from jolly_roger.hour_angles import ASKAP
+
+    askap_astropy = EarthLocation.of_site("ASKAP")
+
+    assert ASKAP.x.value == askap_astropy.x.value
+    assert ASKAP.y.value == askap_astropy.y.value
+    assert ASKAP.z.value == askap_astropy.z.value

jolly_roger-0.0.2/tests/test_hour_angles.py

@@ -1,12 +0,0 @@
-"""Some tests around the hour angles"""
-
-from __future__ import annotations
-
-
-def test_askap_position() -> None:
-    """Ensure that the EarthLocation for ASKAP is correctly formed"""
-    from jolly_roger.hour_angles import ASKAP
-
-    assert ASKAP.x.value == -2556146.66356375
-    assert ASKAP.y.value == 5097426.58592797
-    assert ASKAP.z.value == -2848333.08164107