Wise fov rotation

CHANGELOG.md

@@ -21,6 +21,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fixed a time offset in the FOV's downloaded from IRSA WISE/NEOWISE. They were offset
   by 4.4 seconds.
+- Fixed rotation approximation in WISE/NEOWISE field of views which was causing a small
+  percentage of objects to not be found during FOV checks when they were close to the
+  edge of the field.
 
 
 ## [0.3.0] - 2024 - 8 - 28

src/kete/rust/fovs/definitions.rs

@@ -1,6 +1,6 @@
-use nalgebra::Vector3;
 use kete_core::fov::{self, NeosBand};
 use kete_core::fov::{FovLike, SkyPatch};
+use nalgebra::Vector3;
 use pyo3::{exceptions, prelude::*};
 
 use crate::vector::VectorLike;
@@ -156,8 +156,8 @@ impl From<fov::FOV> for AllowedFOV {
 
 #[pymethods]
 impl PyWiseCmos {
-    #[new]
-    pub fn new(
+    #[staticmethod]
+    pub fn from_pointing(
         pointing: VectorLike,
         rotation: f64,
         observer: PyState,
@@ -176,6 +176,20 @@ impl PyWiseCmos {
         ))
     }
 
+    #[new]
+    pub fn new(
+        corners: [VectorLike; 4],
+        observer: PyState,
+        frame_num: u64,
+        scan_id: String,
+    ) -> Self {
+        let corners: [Vector3<f64>; 4] = corners.map(|x| x.into_vec(observer.frame()));
+        let scan_id = scan_id.into();
+        PyWiseCmos(fov::WiseCmos::from_corners(
+            corners, observer.0, frame_num, scan_id,
+        ))
+    }
+
     /// Position of the observer in this FOV.
     #[getter]
     pub fn observer(&self) -> PyState {

src/kete/wise.py

@@ -13,7 +13,7 @@
 from . import spice
 from .cache import cache_path, download_file
 from .time import Time
-from .vector import Vector
+from .vector import Vector, Frames
 from .irsa import IRSA_URL, query_irsa_tap, plot_fits_image, zoom_plot, annotate_plot
 from .deprecation import rename
 
@@ -570,7 +570,20 @@ def fetch_WISE_fovs(phase):
         return FOVList.load(filename)
 
     table = phase.frame_meta_table
-    cols = ["scan_id", "frame_num", "mjd", "ra", "dec"]
+    cols = [
+        "scan_id",
+        "frame_num",
+        "mjd",
+        "w1ra1",
+        "w1ra2",
+        "w1ra3",
+        "w1ra4",
+        "w1dec1",
+        "w1dec2",
+        "w1dec3",
+        "w1dec4",
+        "crota",
+    ]
     mjd_start = Time(phase.jd_start).mjd
     mjd_end = Time(phase.jd_end).mjd
 
@@ -583,13 +596,29 @@ def fetch_WISE_fovs(phase):
     res["jd"] = jd
 
     fovs = []
-    for row in res.itertuples():
+    for _, row in res.iterrows():
         state = spice.get_state("WISE", row.jd)
 
-        pointing = Vector.from_ra_dec(row.ra, row.dec).as_ecliptic
+        # Each band has a slightly different size on sky.
+        # Kete represents all bands simultaneously, so this information is not kept
+        # track of. In order to deal with this, here we load the W1 ra/dec, and then
+        # push the corners out by 1 arc-minute to act as a bit of a buffer region.
+
+        corners = []
+        for i in range(4):
+            corners.append(Vector.from_ra_dec(row[f"w1ra{i+1}"], row[f"w1dec{i+1}"]))
+
+        pointing = np.mean(corners, axis=0)
+        pointing = Vector(pointing, frame=Frames.Equatorial)
+
+        # shifting the corners out by 1 arc-minute
+        shifted_corners = []
+        for corner in corners:
+            rot_vec = np.cross(pointing, corner)
+            shifted_corners.append(corner.rotate_around(rot_vec, 1 / 60))
+
         fov = WiseCmos(
-            pointing,
-            0.0,
+            shifted_corners[::-1],
             state,
             row.frame_num,
             row.scan_id,

src/kete_core/src/fov/wise.rs

@@ -1,4 +1,6 @@
 //! # WISE Fov definitions.
+use core::f64;
+
 use super::{Contains, FovLike, Frame, OnSkyRectangle, SkyPatch, FOV};
 use crate::constants::WISE_WIDTH;
 use crate::prelude::*;
@@ -42,6 +44,23 @@ impl WiseCmos {
             scan_id,
         }
     }
+
+    /// Create a Wise fov from corners
+    pub fn from_corners(
+        corners: [Vector3<f64>; 4],
+        observer: State,
+        frame_num: u64,
+        scan_id: Box<str>,
+    ) -> Self {
+        let patch = OnSkyRectangle::from_corners(corners, observer.frame);
+        Self {
+            patch,
+            observer,
+            frame_num,
+            rotation: f64::NAN,
+            scan_id,
+        }
+    }
 }
 
 impl FovLike for WiseCmos {

src/kete_core/src/propagation/radau.rs

@@ -180,7 +180,7 @@ where
                 integrator.metadata,
             ));
         }
-        let mut next_step_size: f64 = 1.0_f64.copysign(integrator.final_time - integrator.cur_time);
+        let mut next_step_size: f64 = 0.1_f64.copysign(integrator.final_time - integrator.cur_time);
 
         let mut step_failures = 0;
         loop {
@@ -190,7 +190,7 @@ where
             match integrator.step(next_step_size) {
                 Ok(s) => {
                     next_step_size = s;
-                    if integrator.cur_time == integrator.final_time {
+                    if (integrator.cur_time - integrator.final_time).abs() < 1e-12 {
                         return Ok((
                             integrator.cur_state,
                             integrator.cur_state_der,