jolly-roger 0.0.2__py3-none-any.whl → 0.2.0__py3-none-any.whl

jolly_roger/uvws.py

@@ -11,17 +11,67 @@ from astropy.constants import c as speed_of_light
 from casacore.tables import table, taql
 from tqdm import tqdm
 
-from jolly_roger.baselines import Baselines
-from jolly_roger.hour_angles import PositionHourAngles
+from jolly_roger.baselines import Baselines, get_baselines_from_ms
+from jolly_roger.hour_angles import PositionHourAngles, make_hour_angles_for_ms
 from jolly_roger.logging import logger
 
 
+@dataclass(frozen=True)
+class WDelays:
+    """Representation and mappings for the w-coordinate derived delays"""
+
+    object_name: str
+    """The name of the object that the delays are derived towards"""
+    w_delays: u.Quantity
+    """The w-derived delay. Shape is [baseline, time]"""
+    b_map: dict[tuple[int, int], int]
+    """The mapping between (ANTENNA1,ANTENNA2) to baseline index"""
+    time_map: dict[u.Quantity, int]
+    """The mapping between time (MJDs from measurement set) to index"""
+    elevation: u.Quantity
+    """The elevation of the target object in time order of steps in the MS"""
+
+
+def get_object_delay_for_ms(
+    ms_path: Path,
+    object_name: str = "sun",
+) -> WDelays:
+    # Generate the two sets of uvw coordinate objects
+    baselines: Baselines = get_baselines_from_ms(ms_path=ms_path)
+    hour_angles_phase = make_hour_angles_for_ms(
+        ms_path=ms_path,
+        position=None,  # gets the position from phase direction
+    )
+    uvws_phase: UVWs = xyz_to_uvw(baselines=baselines, hour_angles=hour_angles_phase)
+
+    hour_angles_object = make_hour_angles_for_ms(
+        ms_path=ms_path,
+        position=object_name,  # gets the position from phase direction
+    )
+    uvws_object: UVWs = xyz_to_uvw(baselines=baselines, hour_angles=hour_angles_object)
+
+    # Subtract the w-coordinates out. Since these uvws have
+    # been computed towards different directions the difference
+    # in w-coordinate is the delay distance
+    w_diffs = uvws_object.uvws[2] - uvws_phase.uvws[2]
+
+    delay_object = (w_diffs / speed_of_light).decompose()
+
+    return WDelays(
+        object_name=object_name,
+        w_delays=delay_object,
+        b_map=baselines.b_map,
+        time_map=hour_angles_phase.time_map,
+        elevation=hour_angles_object.elevation,
+    )
+
+
 @dataclass
 class UVWs:
     """A small container to represent uvws"""
 
     uvws: np.ndarray
-    """The (U,V,W) coordinates"""
+    """The (U,V,W) coordinatesm shape [coord, baseline, time]"""
     hour_angles: PositionHourAngles
     """The hour angle information used to construct the UVWs"""
     baselines: Baselines
@@ -44,17 +94,16 @@ 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
+    # Should the position be a solar object like the sun its position
     # will change throughout the observation. but it will have
-    ## been created consistently with the hour angles. If it is fixed
+    # been created consistently with the hour angles. If it is fixed
     # then the use of the numpy ones like will ensure the same shape.
     declination = (np.ones(len(ha)) * declination).decompose()
 
@@ -71,21 +120,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.0.2.dist-info → jolly_roger-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jolly-roger
-Version: 0.0.2
+Version: 0.2.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
@@ -23,6 +23,8 @@ Classifier: Topic :: Scientific/Engineering
 Classifier: Typing :: Typed
 Requires-Python: >=3.11
 Requires-Dist: astropy
+Requires-Dist: dask-ms
+Requires-Dist: matplotlib
 Requires-Dist: numpy>=2.0.0
 Requires-Dist: python-casacore>=3.6.0
 Requires-Dist: tqdm

jolly_roger-0.2.0.dist-info/RECORD

@@ -0,0 +1,17 @@
+jolly_roger/__init__.py,sha256=7xiZLdeY-7sgrYGQ1gNdCjgCfqnoPXK7AeaHncY_DGU,204
+jolly_roger/_version.py,sha256=iB5DfB5V6YB5Wo4JmvS-txT42QtmGaWcWp3udRT7zCI,511
+jolly_roger/_version.pyi,sha256=j5kbzfm6lOn8BzASXWjGIA1yT0OlHTWqlbyZ8Si_o0E,118
+jolly_roger/baselines.py,sha256=C_vC3v_ciU2T_si31oS0hUmsMNTQA0USxrm4118vYvY,4615
+jolly_roger/delays.py,sha256=cvLMhChkkB6PkS11v6JU8Wn23Zqv5bQY1HTMzeIGTNw,3015
+jolly_roger/flagger.py,sha256=tlC-M_MpLpqOvkF544zw2EvOUpbSpasO2zlMlXMcxSs,3034
+jolly_roger/hour_angles.py,sha256=ld3jiEDQXlYLHrChUxYD_UBSxKH0qarstakBPLQ0M8s,6044
+jolly_roger/logging.py,sha256=04YVHnF_8tKDkXNtXQ-iMyJ2BLV-qowbPAqqMFDxYE4,1338
+jolly_roger/plots.py,sha256=LsueygCHpGvBXZe2y4q1fmJEMyjoMl65JzFMzbduawI,5280
+jolly_roger/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jolly_roger/tractor.py,sha256=ORkQb7T7jxMFVcDihH1McYYGq07OgsvbfT44D82ghL4,27723
+jolly_roger/uvws.py,sha256=ujZdIIxNY2k4HY9p65kUyH-VqN6thNpOrBb-wpL9mYM,12424
+jolly_roger-0.2.0.dist-info/METADATA,sha256=vFDa_-0nKwhoFVmm9x_qqQgZURZV8jPBprgRue9h7XY,4221
+jolly_roger-0.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+jolly_roger-0.2.0.dist-info/entry_points.txt,sha256=q8RYosASYsPShzsIo58NxOhIMuB4F-gQ2uG6zS2p224,98
+jolly_roger-0.2.0.dist-info/licenses/LICENSE,sha256=7G-TthaPSOehr-pdj4TJydXj3eIUmerMbCUSatMr8hc,1522
+jolly_roger-0.2.0.dist-info/RECORD,,

{jolly_roger-0.0.2.dist-info → jolly_roger-0.2.0.dist-info}/entry_points.txt

@@ -1,2 +1,3 @@
 [console_scripts]
 jolly_flagger = jolly_roger.flagger:cli
+jolly_tractor = jolly_roger.tractor:cli

jolly_roger-0.0.2.dist-info/RECORD

@@ -1,14 +0,0 @@
-jolly_roger/__init__.py,sha256=7xiZLdeY-7sgrYGQ1gNdCjgCfqnoPXK7AeaHncY_DGU,204
-jolly_roger/_version.py,sha256=wO7XWlZte1hxA4mMvRc6zhNdGm74Nhhn2bfWRAxaKbI,511
-jolly_roger/_version.pyi,sha256=j5kbzfm6lOn8BzASXWjGIA1yT0OlHTWqlbyZ8Si_o0E,118
-jolly_roger/baselines.py,sha256=C_vC3v_ciU2T_si31oS0hUmsMNTQA0USxrm4118vYvY,4615
-jolly_roger/flagger.py,sha256=tlC-M_MpLpqOvkF544zw2EvOUpbSpasO2zlMlXMcxSs,3034
-jolly_roger/hour_angles.py,sha256=ChWTy69dkRN0R2HWEknHagv6W3xTXuSJJn9sAqBABCc,6160
-jolly_roger/logging.py,sha256=04YVHnF_8tKDkXNtXQ-iMyJ2BLV-qowbPAqqMFDxYE4,1338
-jolly_roger/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jolly_roger/uvws.py,sha256=8G2E7bq8y5EEc2wQW5nli1WKsebZbBEHN8fhPzlinWk,10558
-jolly_roger-0.0.2.dist-info/METADATA,sha256=BtHEC57mNeu12PI6_pnDSkD8i767av0kQfTr_vINWuI,4172
-jolly_roger-0.0.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-jolly_roger-0.0.2.dist-info/entry_points.txt,sha256=ZwEZAe4DBn5nznVI0tP0a1wUinYouwXxxcZP6p7Pkvk,58
-jolly_roger-0.0.2.dist-info/licenses/LICENSE,sha256=7G-TthaPSOehr-pdj4TJydXj3eIUmerMbCUSatMr8hc,1522
-jolly_roger-0.0.2.dist-info/RECORD,,