tabsim 0.0.7__tar.gz → 0.0.9__tar.gz

{tabsim-0.0.7 → tabsim-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tabsim
-Version: 0.0.7
+Version: 0.0.9
 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>
@@ -695,6 +695,7 @@ Requires-Dist: astropy
 Requires-Dist: spacetrack
 Requires-Dist: skyfield
 Requires-Dist: numpy
+Requires-Dist: pyyaml
 Provides-Extra: gpu
 Requires-Dist: jax[cuda12]; extra == "gpu"
 Provides-Extra: sat

{tabsim-0.0.7 → tabsim-0.0.9}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tabsim"
-version = "0.0.7"
+version = "0.0.9"
 license = {file = "LICENSE"}
 readme = "README.md"
 # dynamic = ["version", "readme"]
@@ -19,9 +19,9 @@ description = "Trajectory-based Radio Frequency Interference (RFI) simulations f
 
 requires-python = ">=3.9"
 dependencies = [
-    "jax", "dask", "xarray", "zarr<3.0.0", 
-    "dask-ms>=0.2.21", "scipy", "tqdm", "matplotlib", 
-    "astropy", "spacetrack", "skyfield", "numpy", 
+    "jax", "dask", "xarray", "zarr<3.0.0",
+    "dask-ms>=0.2.21", "scipy", "tqdm", "matplotlib",
+    "astropy", "spacetrack", "skyfield", "numpy", "pyyaml",
 ]
 
 [project.optional-dependencies]
@@ -52,3 +52,5 @@ ast-region = "tabsim.scripts.ast_region:main"
 flag-data = "tabsim.scripts.flag_data:main"
 sim-vis = "tabsim.scripts.sim_vis:main"
 write-config = "tabsim.scripts.write_config_from_ms:main"
+tabsim-setup-spacetrack = "tabsim.scripts.setup_spacetrack_login:main"
+tabsim-import-tles = "tabsim.scripts.import_tle_files:main"

{tabsim-0.0.7 → tabsim-0.0.9}/tabsim/config.py

@@ -526,12 +526,21 @@ def add_tle_satellite_sources(
     ]
     if np.any(tle_cond):
 
-        if spacetrack_path:
+        # Load SpaceTrack credentials
+        if spacetrack_path and os.path.exists(spacetrack_path):
+            # Load from specified path if file exists
             st_ = yaml_load(spacetrack_path)
+            username = st_["username"]
+            password = st_["password"]
         else:
-            raise ValueError(
-                "Space-Track login details must be given to simulate TLE based satellites"
-            )
+            # Try loading from standard locations
+            from tabsim.tle import load_spacetrack_credentials
+            username, password = load_spacetrack_credentials()
+
+            if username is None or password is None:
+                print("Warning: No SpaceTrack credentials found. Skipping TLE satellite sources.")
+                print("To set up credentials, run: tabsim-setup-spacetrack")
+                return
 
         if sat_["norad_ids_path"] is None:
             norad_ids = sat_["norad_ids"]
@@ -549,8 +558,8 @@ def add_tle_satellite_sources(
         )
 
         norad_ids, tles = get_visible_satellite_tles(
-            st_["username"],
-            st_["password"],
+            username,
+            password,
             times_check,
             obs.latitude,
             obs.longitude,

{tabsim-0.0.7 → tabsim-0.0.9}/tabsim/dask/observation.py

@@ -330,8 +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())
 
+        # 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)
-        self.ants_xyz = da.asarray(itrs_to_gcrs_sf(np.asarray(self.ITRF), np.asarray(mjd_to_jd(self.times_mjd_fine.compute()))))
+        # 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),