Skip to content

A fix for pre-1962-Jan-20 observations #1144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mschwamb merged 5 commits into from
May 17, 2025
Merged

A fix for pre-1962-Jan-20 observations #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c8bc183
A fix for pre-1962-Jan-20 observations
matthewholman Apr 25, 2025
2695176
ran black
matthewholman Apr 26, 2025
8bb41d5
First stab at unit test -- still incomplete
bernardinelli May 16, 2025
b347eb7
Update test_simulation_parsing.py
bernardinelli May 16, 2025
8c2523a
remove comment test is incomplete
mschwamb May 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/sorcha/ephemeris/simulation_geometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,16 @@ def barycentricObservatoryRates(et, obsCode, observatories, Rearth=RADIUS_EARTH_
pos = posvel[0:3]
vel = posvel[3:6]
# Get the matrix that rotates from the Earth's equatorial body fixed frame to the J2000 equatorial frame.
m = spice.pxform("ITRF93", "J2000", et)
mp = spice.pxform("ITRF93", "J2000", et + delta_et)
mm = spice.pxform("ITRF93", "J2000", et - delta_et)
# We don't need to compute this repeatedly
et_1962 = spice.str2et("1962-Jan-20")
if et >= et_1962:
m = spice.pxform("ITRF93", "J2000", et)
mp = spice.pxform("ITRF93", "J2000", et + delta_et)
mm = spice.pxform("ITRF93", "J2000", et - delta_et)
else:
m = spice.pxform("IAU_EARTH", "J2000", et)
mp = spice.pxform("IAU_EARTH", "J2000", et + delta_et)
mm = spice.pxform("IAU_EARTH", "J2000", et - delta_et)
# Get the MPC's unit vector from the geocenter to
# the observatory
obsVec = observatories.ObservatoryXYZ[obsCode]
Expand Down
21 changes: 21 additions & 0 deletions tests/ephemeris/test_simulation_parsing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
import sorcha.ephemeris.simulation_parsing as sp
from sorcha.utilities.dataUtilitiesForTests import get_test_filepath
from sorcha.utilities.sorchaConfigs import auxiliaryConfigs
import sorcha.ephemeris.simulation_geometry as sg
import sorcha.ephemeris.simulation_setup as ss


def test_observatory_compared_to_original():
Expand All @@ -27,3 +29,22 @@ def test_observatory_for_moving_observatories():
obs = observatory.ObservatoryXYZ

assert obs["250"] == (None, None, None)


def test_observatory_before_1962():
auxconfigs = auxiliaryConfigs()
observatory = sp.Observatory(
auxconfigs=auxconfigs, args=None, oc_file=get_test_filepath("ObsCodes_test.json")
)

et = -1229083166.3680687 # thanks to Rahil Makadia

pos, _ = sg.barycentricObservatoryRates(et, "Z20", observatory)

x, y, z = -7.426461821563405e07, 1.177545544454091e08, 5.105719899396534e07 # taken from JPL

# note these should not match precisely because pre-1962 we're using an approximation
# but this is good enough
assert np.isclose(pos[0], x, 5)
assert np.isclose(pos[1], y, 5)
assert np.isclose(pos[2], z, 5)