tabsim 0.0.6__tar.gz → 0.0.8__tar.gz

{tabsim-0.0.6 → tabsim-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tabsim
-Version: 0.0.6
+Version: 0.0.8
 Summary: Trajectory-based Radio Frequency Interference (RFI) simulations for radio interferometeric data.
 Author-email: Chris Finlay <christopher.finlay@epfl.ch>
 Maintainer-email: Chris Finlay <christopher.finlay@epfl.ch>

{tabsim-0.0.6 → tabsim-0.0.8}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tabsim"
-version = "0.0.6"
+version = "0.0.8"
 license = {file = "LICENSE"}
 readme = "README.md"
 # dynamic = ["version", "readme"]

{tabsim-0.0.6 → tabsim-0.0.8}/tabsim/dask/coordinates.py

@@ -243,6 +243,22 @@ def GEO_to_XYZ_vmap1(geo: Array, times: Array) -> Array:
 
 GEO_to_XYZ_vmap1.__doc__ = coord.GEO_to_XYZ_vmap1.__doc__
 
+from skyfield.api import Distance, load
+from skyfield.toposlib import ITRSPosition
+import numpy as np
+from numpy.typing import NDArray
+
+def itrs_to_gcrs_sf(pos_itrs: NDArray, times_jd: NDArray) -> NDArray:
+
+    ts = load.timescale()
+    t_sf = ts.ut1_jd(np.array(times_jd))
+
+    pos_gcrs = np.stack(
+        [ITRSPosition(Distance(m=pos)).at(t_sf).position.m.T for pos in pos_itrs], axis=1
+    )
+
+    return pos_gcrs
+
 
 def ITRF_to_XYZ(itrf: Array, gsa: Array) -> Array:
     n_time = gsa.shape[0]

{tabsim-0.0.6 → tabsim-0.0.8}/tabsim/dask/observation.py

@@ -11,6 +11,7 @@ from tabsim.dask.coordinates import (
     ENU_to_GEO,
     GEO_to_XYZ_vmap0,
     ITRF_to_XYZ,
+    itrs_to_gcrs_sf,
     orbit_vmap,
     radec_to_lmn,
     angular_separation,
@@ -329,7 +330,18 @@ class Observation(Telescope):
         self.mag_uvw = da.linalg.norm(self.bl_uvw[0], axis=-1)
         self.syn_bw = beam_size(self.mag_uvw.max().compute(), freqs.max())
 
-        self.ants_xyz = ITRF_to_XYZ(self.ITRF, self.gsa)
+        # The following calculation of antenna positions in the GCRS frame does not take nutation
+        # into consideration. This leads to a small offset in the antenna positions compared to reality.
+        # self.ants_xyz = ITRF_to_XYZ(self.ITRF, self.gsa)
+        # The following calculation using skyfield takes nutation into consideration and leads to more
+        # accurate antenna positions.
+        self.ants_xyz = da.asarray(
+            itrs_to_gcrs_sf(
+                np.asarray(self.ITRF),
+                np.asarray(mjd_to_jd(self.times_mjd_fine.compute())),
+            )
+        ).rechunk((self.time_fine_chunk, self.n_ant, 3))
+
         self.vis_rfi = da.zeros(
             shape=(self.n_time, self.n_bl, self.n_freq),
             chunks=(self.time_chunk, self.bl_chunk, self.freq_chunk),

{tabsim-0.0.6 → tabsim-0.0.8}/tabsim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tabsim
-Version: 0.0.6
+Version: 0.0.8
 Summary: Trajectory-based Radio Frequency Interference (RFI) simulations for radio interferometeric data.
 Author-email: Chris Finlay <christopher.finlay@epfl.ch>
 Maintainer-email: Chris Finlay <christopher.finlay@epfl.ch>