From cc9ee5a69a6145c576d5ca3de83c47ef9ce34e22 Mon Sep 17 00:00:00 2001
From: acpaquette <acpaquette@usgs.gov>
Date: Mon, 5 Jun 2023 12:16:50 -0700
Subject: [PATCH] Two sun positions (#542)
* Enforced getting two sun positions if instrument is not a framer
* Updated tests
* Updated changelog
* Removed leftover prints
* One more leftover print
---
CHANGELOG.md | 3 ++
ale/base/data_naif.py | 4 +-
.../data/isds/chandrayaan_mrffr_isd.json | 31 ++++++++++-----
.../pytests/data/isds/chandrayannM3_isd.json | 31 ++++++++++-----
tests/pytests/data/isds/crism_isd.json | 31 ++++++++++-----
tests/pytests/data/isds/ctx_isd.json | 31 ++++++++++-----
tests/pytests/data/isds/hirise_isd.json | 31 ++++++++++-----
.../pytests/data/isds/kaguyami_isis_isd.json | 31 ++++++++++-----
tests/pytests/data/isds/kaguyatc_isd.json | 31 ++++++++++-----
.../pytests/data/isds/kaguyatc_isis_isd.json | 31 ++++++++++-----
tests/pytests/data/isds/lrolroc_isd.json | 31 ++++++++++-----
tests/pytests/data/isds/lrominirf_isd.json | 39 ++++++++++++-------
tests/pytests/data/isds/marci_isd.json | 31 ++++++++++-----
tests/pytests/data/isds/mexhrsc_isd.json | 31 ++++++++++-----
tests/pytests/data/isds/mexhrsc_isis_isd.json | 31 ++++++++++-----
tests/pytests/data/isds/mvic_mpf_isd.json | 31 ++++++++++-----
tests/pytests/data/isds/nhleisa_isd.json | 31 ++++++++++-----
tests/pytests/data/isds/nhmvic_tdi_isd.json | 31 ++++++++++-----
tests/pytests/test_data_naif.py | 1 +
tests/pytests/test_lro_drivers.py | 1 -
20 files changed, 347 insertions(+), 166 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29acad1..2666ef8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,9 @@ release.
## [Unreleased]
+### Changed
+- The NaifSpice class now gets two sun positions/velocities when a driver has more than one ephemeris time [#542](https://github.com/DOI-USGS/ale/pull/542)
+
### Fixed
- MexHrscIsisLabelNaifSpice and MexHrscPds3NaifSpice have had there ephemeris times changed and sampling factor updated. MexHrscIsisLabelNaifSpice has also had it's focal length, and focal plane translation updated to reflect those found in the MexHrscPds3NaifSpice driver [#541](https://github.com/DOI-USGS/ale/pull/541)
- MGS drivers now account for a time bias in the ephemeris data [#538](https://github.com/DOI-USGS/ale/pull/538)
diff --git a/ale/base/data_naif.py b/ale/base/data_naif.py
index 985abae..0f73b14 100644
--- a/ale/base/data_naif.py
+++ b/ale/base/data_naif.py
@@ -328,7 +328,9 @@ class NaifSpice():
: (sun_positions, sun_velocities)
a tuple containing a list of sun positions, a list of sun velocities
"""
- times = [self.center_ephemeris_time]
+ times = self.ephemeris_time
+ if len(times) > 1:
+ times = [times[0], times[-1]]
positions = []
velocities = []
diff --git a/tests/pytests/data/isds/chandrayaan_mrffr_isd.json b/tests/pytests/data/isds/chandrayaan_mrffr_isd.json
index face8eb..8a1a301 100644
--- a/tests/pytests/data/isds/chandrayaan_mrffr_isd.json
+++ b/tests/pytests/data/isds/chandrayaan_mrffr_isd.json
@@ -58667,24 +58667,35 @@
"reference_frame": 1
},
"sun_position": {
- "spk_table_start_time": 284618274.5028643,
- "spk_table_end_time": 284618274.5028643,
- "spk_table_original_size": 1,
+ "spk_table_start_time": 284618195.65060276,
+ "spk_table_end_time": 284618353.35512584,
+ "spk_table_original_size": 2,
"ephemeris_times": [
- 284618274.5028643
+ 284618195.65060276,
+ 284618353.35512584
],
"positions": [
[
- 43780497.0799206,
- -129064945.41639775,
- -55987592.45489679
+ 43778143.55392012,
+ -129065559.6861403,
+ -55987861.91428987
+ ],
+ [
+ 43782850.60459468,
+ -129064331.09970978,
+ -55987322.97221426
]
],
"velocities": [
[
- 29.84809594419459,
- 7.7898174083485205,
- 3.41947441993111
+ 29.84729868663574,
+ 7.7898328838071755,
+ 3.4171344179000442
+ ],
+ [
+ 29.84725641918031,
+ 7.791031989531533,
+ 3.4176990497686783
]
],
"reference_frame": 1
diff --git a/tests/pytests/data/isds/chandrayannM3_isd.json b/tests/pytests/data/isds/chandrayannM3_isd.json
index eb7c86c..7a338ed 100644
--- a/tests/pytests/data/isds/chandrayannM3_isd.json
+++ b/tests/pytests/data/isds/chandrayannM3_isd.json
@@ -390,24 +390,35 @@
"reference_frame": 1
},
"sun_position": {
- "spk_table_start_time": 299622941.73534995,
- "spk_table_end_time": 299622941.73534995,
- "spk_table_original_size": 1,
+ "spk_table_start_time": 299622941.60814995,
+ "spk_table_end_time": 299622941.86254996,
+ "spk_table_original_size": 2,
"ephemeris_times": [
- 299622941.73534995
+ 299622941.60814995,
+ 299622941.86254996
],
"positions": [
[
- -22279396.272817865,
- 138086310.683749,
- 59901633.861951254
+ -22279392.552556925,
+ 138086311.0772047,
+ 59901634.029351056
+ ],
+ [
+ -22279399.993010454,
+ 138086310.29030323,
+ 59901633.69455383
]
],
"velocities": [
[
- -29.247063986944152,
- -3.0931661850381134,
- -1.3160268288136903
+ -29.247063783209654,
+ -3.0931654356540093,
+ -1.3160264669418211
+ ],
+ [
+ -29.24706420755107,
+ -3.0931669393224728,
+ -1.3160271856310302
]
],
"reference_frame": 1
diff --git a/tests/pytests/data/isds/crism_isd.json b/tests/pytests/data/isds/crism_isd.json
index 44a7306..fa0f67e 100644
--- a/tests/pytests/data/isds/crism_isd.json
+++ b/tests/pytests/data/isds/crism_isd.json
@@ -654,24 +654,35 @@
"reference_frame": 1
},
"sun_position": {
- "spk_table_start_time": 221051479.28741914,
- "spk_table_end_time": 221051479.28741914,
- "spk_table_original_size": 1,
+ "spk_table_start_time": 221051477.42023167,
+ "spk_table_end_time": 221051481.15460664,
+ "spk_table_original_size": 2,
"ephemeris_times": [
- 221051479.28741914
+ 221051477.42023167,
+ 221051481.15460664
],
"positions": [
[
- 93940764.07503387,
- 187971285.58029893,
- 83678697.57627732
+ 93940806.93671662,
+ 187971272.44155774,
+ 83678690.39204721
+ ],
+ [
+ 93940721.21262354,
+ 187971298.71918067,
+ 83678704.760984
]
],
"velocities": [
[
- -22.955405861129986,
- 7.0366856928262855,
- 3.8477487712670118
+ -22.95540384928137,
+ 7.036689712027553,
+ 3.847750575389713
+ ],
+ [
+ -22.955407872190698,
+ 7.036681662141811,
+ 3.84774699181132
]
],
"reference_frame": 1
diff --git a/tests/pytests/data/isds/ctx_isd.json b/tests/pytests/data/isds/ctx_isd.json
index fe14f46..8b0f2cf 100644
--- a/tests/pytests/data/isds/ctx_isd.json
+++ b/tests/pytests/data/isds/ctx_isd.json
@@ -9522,24 +9522,35 @@
"reference_frame": 1
},
"sun_position": {
- "spk_table_start_time": 297088762.61698407,
- "spk_table_end_time": 297088762.61698407,
- "spk_table_original_size": 1,
+ "spk_table_start_time": 297088762.24158406,
+ "spk_table_end_time": 297088762.9923841,
+ "spk_table_original_size": 2,
"ephemeris_times": [
- 297088762.61698407
+ 297088762.24158406,
+ 297088762.9923841
],
"positions": [
[
- -208246643.08248276,
- -7677087.0664571,
- 2103548.9569992064
+ -208246643.00357282,
+ -7677078.093689713,
+ 2103553.070434021
+ ],
+ [
+ -208246643.1613922,
+ -7677096.039224213,
+ 2103544.8435644074
]
],
"velocities": [
[
- -0.2102016327000456,
- -23.901883516965434,
- -10.957471340434626
+ -0.21020277899317444,
+ -23.901883559525015,
+ -10.957471328254789
+ ],
+ [
+ -0.210200486378395,
+ -23.9018834749721,
+ -10.95747135139536
]
],
"reference_frame": 1
diff --git a/tests/pytests/data/isds/hirise_isd.json b/tests/pytests/data/isds/hirise_isd.json
index b423f16..d23e18c 100644
--- a/tests/pytests/data/isds/hirise_isd.json
+++ b/tests/pytests/data/isds/hirise_isd.json
@@ -55545,24 +55545,35 @@
"reference_frame": 1
},
"sun_position": {
- "spk_table_start_time": 217006139.13299,
- "spk_table_end_time": 217006139.13299,
- "spk_table_original_size": 1,
+ "spk_table_start_time": 217006138.29611498,
+ "spk_table_end_time": 217006139.969865,
+ "spk_table_original_size": 2,
"ephemeris_times": [
- 217006139.13299
+ 217006138.29611498,
+ 217006139.969865
],
"positions": [
[
- 175738271.88943973,
- 143628754.26985335,
- 61129946.335485235
+ 175738286.11725113,
+ 143628742.2022604,
+ 61129940.41598068
+ ],
+ [
+ 175738257.66166848,
+ 143628766.3374117,
+ 61129952.254949324
]
],
"velocities": [
[
- -17.00109476210922,
- 14.419806534007192,
- 7.0733195374384525
+ -17.00109325914085,
+ 14.419807760872878,
+ 7.073320063056424
+ ],
+ [
+ -17.00109626490064,
+ 14.41980530448351,
+ 7.073319017577917
]
],
"reference_frame": 1
diff --git a/tests/pytests/data/isds/kaguyami_isis_isd.json b/tests/pytests/data/isds/kaguyami_isis_isd.json
index 6eb5014..7ebadaa 100644
--- a/tests/pytests/data/isds/kaguyami_isis_isd.json
+++ b/tests/pytests/data/isds/kaguyami_isis_isd.json
@@ -7669,24 +7669,35 @@
"reference_frame": 1
},
"sun_position": {
- "spk_table_start_time": 274867901.9104442,
- "spk_table_end_time": 274867901.9104442,
- "spk_table_original_size": 1,
+ "spk_table_start_time": 274867895.6899549,
+ "spk_table_end_time": 274867908.1309335,
+ "spk_table_original_size": 2,
"ephemeris_times": [
- 274867901.9104442
+ 274867895.6899549,
+ 274867908.1309335
],
"positions": [
[
- -149953325.68465477,
- 13888655.391944038,
- 5991871.920307333
+ -149953311.62760228,
+ 13888829.516829316,
+ 5991947.758813328
+ ],
+ [
+ -149953339.74137488,
+ 13888481.267052742,
+ 5991796.081815939
]
],
"velocities": [
[
- -2.2597721717831663,
- -27.992161842665052,
- -12.191714225772127
+ -2.259825250416521,
+ -27.992152659378654,
+ -12.191726892668143
+ ],
+ [
+ -2.2597183442946336,
+ -27.992153157955677,
+ -12.191724232426582
]
],
"reference_frame": 1
diff --git a/tests/pytests/data/isds/kaguyatc_isd.json b/tests/pytests/data/isds/kaguyatc_isd.json
index 5b22679..a249a47 100644
--- a/tests/pytests/data/isds/kaguyatc_isd.json
+++ b/tests/pytests/data/isds/kaguyatc_isd.json
@@ -9499,24 +9499,35 @@
"reference_frame": 1
},
"sun_position": {
- "spk_table_start_time": 292234261.12293595,
- "spk_table_end_time": 292234261.12293595,
- "spk_table_original_size": 1,
+ "spk_table_start_time": 292234259.82293594,
+ "spk_table_end_time": 292234262.42293596,
+ "spk_table_original_size": 2,
"ephemeris_times": [
- 292234261.12293595
+ 292234259.82293594,
+ 292234262.42293596
],
"positions": [
[
- 144178551.68571115,
- 37762451.38900035,
- 16383592.93255027
+ 144178561.0230671,
+ 37762416.11617861,
+ 16383577.518869305
+ ],
+ [
+ 144178542.3483277,
+ 37762486.66186693,
+ 16383608.346249977
]
],
"velocities": [
[
- -7.182591965540109,
- 27.13295674511406,
- 11.856684602525405
+ -7.182581460388188,
+ 27.13295688010723,
+ 11.856684932714968
+ ],
+ [
+ -7.182602532408157,
+ 27.132956705864462,
+ 11.856684594590682
]
],
"reference_frame": 1
diff --git a/tests/pytests/data/isds/kaguyatc_isis_isd.json b/tests/pytests/data/isds/kaguyatc_isis_isd.json
index 7068d56..09218ad 100644
--- a/tests/pytests/data/isds/kaguyatc_isis_isd.json
+++ b/tests/pytests/data/isds/kaguyatc_isis_isd.json
@@ -9499,24 +9499,35 @@
"reference_frame": 1
},
"sun_position": {
- "spk_table_start_time": 292234261.12293595,
- "spk_table_end_time": 292234261.12293595,
- "spk_table_original_size": 1,
+ "spk_table_start_time": 292234259.82293594,
+ "spk_table_end_time": 292234262.42293596,
+ "spk_table_original_size": 2,
"ephemeris_times": [
- 292234261.12293595
+ 292234259.82293594,
+ 292234262.42293596
],
"positions": [
[
- 144178551.68571115,
- 37762451.38900035,
- 16383592.93255027
+ 144178561.0230671,
+ 37762416.11617861,
+ 16383577.518869305
+ ],
+ [
+ 144178542.3483277,
+ 37762486.66186693,
+ 16383608.346249977
]
],
"velocities": [
[
- -7.182591965540109,
- 27.13295674511406,
- 11.856684602525405
+ -7.182581460388188,
+ 27.13295688010723,
+ 11.856684932714968
+ ],
+ [
+ -7.182602532408157,
+ 27.132956705864462,
+ 11.856684594590682
]
],
"reference_frame": 1
diff --git a/tests/pytests/data/isds/lrolroc_isd.json b/tests/pytests/data/isds/lrolroc_isd.json
index 6bbbda8..e766beb 100644
--- a/tests/pytests/data/isds/lrolroc_isd.json
+++ b/tests/pytests/data/isds/lrolroc_isd.json
@@ -9514,24 +9514,35 @@
"reference_frame": 1
},
"sun_position": {
- "spk_table_start_time": 302228504.5749346,
- "spk_table_end_time": 302228504.5749346,
- "spk_table_original_size": 1,
+ "spk_table_start_time": 302228504.36824864,
+ "spk_table_end_time": 302228504.7816205,
+ "spk_table_original_size": 2,
"ephemeris_times": [
- 302228504.5749346
+ 302228504.36824864,
+ 302228504.7816205
],
"positions": [
[
- -91885596.62561403,
- 111066639.06681779,
- 48186230.75049896
+ -91885591.67016564,
+ 111066642.35740878,
+ 48186232.18490548
+ ],
+ [
+ -91885601.58109674,
+ 111066635.77620196,
+ 48186229.31608297
]
],
"velocities": [
[
- -23.975824271684395,
- -15.920790550010192,
- -6.940052703560941
+ -23.975824689980016,
+ -15.920789296510018,
+ -6.940052119943604
+ ],
+ [
+ -23.975823839345946,
+ -15.920791788281669,
+ -6.940053295529127
]
],
"reference_frame": 1
diff --git a/tests/pytests/data/isds/lrominirf_isd.json b/tests/pytests/data/isds/lrominirf_isd.json
index 08bd1c2..6f94057 100644
--- a/tests/pytests/data/isds/lrominirf_isd.json
+++ b/tests/pytests/data/isds/lrominirf_isd.json
@@ -8102,25 +8102,36 @@
"reference_frame": 1
},
"sun_position": {
- "spk_table_start_time": 325441419.0769223,
- "spk_table_end_time": 325441419.0769223,
- "spk_table_original_size": 1,
+ "spk_table_start_time": 325441417.4304223,
+ "spk_table_end_time": 325441420.7234223,
+ "spk_table_original_size": 2,
"ephemeris_times": [
- 325441419.0769223
+ 325441417.4304223,
+ 325441420.7234223
],
"positions": [
- [
- 124045259.44540907,
- 78574027.41897355,
- 34095053.07306483
- ]
+ [
+ 124045286.28809696,
+ 78573988.71546704,
+ 34095036.22492499
+ ],
+ [
+ 124045232.6026997,
+ 78574066.12247425,
+ 34095069.92120094
+ ]
],
"velocities": [
- [
- -16.302884213500743,
- 23.506531106609035,
- 10.23269909108695
- ]
+ [
+ -16.302871484581324,
+ 23.506535418627784,
+ 10.232700692916042
+ ],
+ [
+ -16.302896878786967,
+ 23.506527217470925,
+ 10.232696283121477
+ ]
],
"reference_frame": 1
}
diff --git a/tests/pytests/data/isds/marci_isd.json b/tests/pytests/data/isds/marci_isd.json
index 07319c4..79c80eb 100644
--- a/tests/pytests/data/isds/marci_isd.json
+++ b/tests/pytests/data/isds/marci_isd.json
@@ -9583,24 +9583,35 @@
"reference_frame": 1
},
"sun_position": {
- "spk_table_start_time": 691074311.8595536,
- "spk_table_end_time": 691074311.8595536,
- "spk_table_original_size": 1,
+ "spk_table_start_time": 691074268.9595536,
+ "spk_table_end_time": 691074354.7595536,
+ "spk_table_original_size": 2,
"ephemeris_times": [
- 691074311.8595536
+ 691074268.9595536,
+ 691074354.7595536
],
"positions": [
[
- 188334624.38200557,
- 132097076.91643292,
- 55508576.420679264
+ 188335292.55492228,
+ 132096412.1619859,
+ 55508253.483690254
+ ],
+ [
+ 188333956.20654827,
+ 132097741.66753776,
+ 55508899.35564914
]
],
"velocities": [
[
- -15.57515647070855,
- 15.495412010680884,
- 7.527625079318881
+ -15.575074975147844,
+ 15.495459462512285,
+ 7.527669060438871
+ ],
+ [
+ -15.575236788334324,
+ 15.49534595922567,
+ 7.527621364573017
]
],
"reference_frame": 1
diff --git a/tests/pytests/data/isds/mexhrsc_isd.json b/tests/pytests/data/isds/mexhrsc_isd.json
index 0774465..083aa6a 100644
--- a/tests/pytests/data/isds/mexhrsc_isd.json
+++ b/tests/pytests/data/isds/mexhrsc_isd.json
@@ -354,24 +354,35 @@
"reference_frame": 1
},
"sun_position": {
- "spk_table_start_time": 255744697.38696516,
- "spk_table_end_time": 255744697.38696516,
- "spk_table_original_size": 1,
+ "spk_table_start_time": 255744599.02748165,
+ "spk_table_end_time": 255744684.34504557,
+ "spk_table_original_size": 2,
"ephemeris_times": [
- 255744697.38696516
+ 255744599.02748165,
+ 255744684.34504557
],
"positions": [
[
- 99139014.67821987,
- -200427816.2457205,
- -94608347.52240176
+ 99136929.53828166,
+ -200428537.63629806,
+ -94608622.07352574
+ ],
+ [
+ 99138738.20092882,
+ -200427911.89904302,
+ -94608383.92687146
]
],
"velocities": [
[
- 21.199131828075274,
- 7.3343154546823355,
- 2.7913498057574033
+ 21.199222172569485,
+ 7.334134527307004,
+ 2.791259509826079
+ ],
+ [
+ 21.199143743332474,
+ 7.334293076913804,
+ 2.791334350681398
]
],
"reference_frame": 1
diff --git a/tests/pytests/data/isds/mexhrsc_isis_isd.json b/tests/pytests/data/isds/mexhrsc_isis_isd.json
index 2352476..4fe3c7c 100644
--- a/tests/pytests/data/isds/mexhrsc_isis_isd.json
+++ b/tests/pytests/data/isds/mexhrsc_isis_isd.json
@@ -359,24 +359,35 @@
"reference_frame": 1
},
"sun_position": {
- "spk_table_start_time": 255744697.39357847,
- "spk_table_end_time": 255744697.39357847,
- "spk_table_original_size": 1,
+ "spk_table_start_time": 255744599.02748165,
+ "spk_table_end_time": 255744684.34504557,
+ "spk_table_original_size": 2,
"ephemeris_times": [
- 255744697.39357847
+ 255744599.02748165,
+ 255744684.34504557
],
"positions": [
[
- 99139014.81802115,
- -200427816.19745806,
- -94608347.50384377
+ 99136929.53828166,
+ -200428537.63629806,
+ -94608622.07352574
+ ],
+ [
+ 99138738.20092882,
+ -200427911.89904302,
+ -94608383.92687146
]
],
"velocities": [
[
- 21.19913182204962,
- 7.334315465997904,
- 2.7913498135665433
+ 21.199222172569485,
+ 7.334134527307004,
+ 2.791259509826079
+ ],
+ [
+ 21.199143743332474,
+ 7.334293076913804,
+ 2.791334350681398
]
],
"reference_frame": 1
diff --git a/tests/pytests/data/isds/mvic_mpf_isd.json b/tests/pytests/data/isds/mvic_mpf_isd.json
index 938db66..52f9339 100644
--- a/tests/pytests/data/isds/mvic_mpf_isd.json
+++ b/tests/pytests/data/isds/mvic_mpf_isd.json
@@ -3245,24 +3245,35 @@
"reference_frame": 1
},
"sun_position": {
- "spk_table_start_time": 486576443.42086315,
- "spk_table_end_time": 486576443.42086315,
- "spk_table_original_size": 1,
+ "spk_table_start_time": 486576426.80886316,
+ "spk_table_end_time": 486576460.0328631,
+ "spk_table_original_size": 2,
"ephemeris_times": [
- 486576443.42086315
+ 486576426.80886316,
+ 486576460.0328631
],
"positions": [
[
- -1177914753.1626072,
- 4446832755.331802,
- 1742748954.8640296
+ -1177914663.7622929,
+ 4446832768.593636,
+ 1742748932.4112859
+ ],
+ [
+ -1177914842.5641637,
+ 4446832742.0690365,
+ 1742748977.3182514
]
],
"velocities": [
[
- -5.381708146926016,
- -0.7983566392585635,
- 1.3516423436328768
+ -5.381704616446048,
+ -0.7983538988828659,
+ 1.3516414931938052
+ ],
+ [
+ -5.381711677443236,
+ -0.7983593794591725,
+ 1.35164319498837
]
],
"reference_frame": 1
diff --git a/tests/pytests/data/isds/nhleisa_isd.json b/tests/pytests/data/isds/nhleisa_isd.json
index 94714f7..72436b6 100644
--- a/tests/pytests/data/isds/nhleisa_isd.json
+++ b/tests/pytests/data/isds/nhleisa_isd.json
@@ -8691,24 +8691,35 @@
"reference_frame": 1
},
"sun_position": {
- "spk_table_start_time": 487928745.5376103,
- "spk_table_end_time": 487928745.5376103,
- "spk_table_original_size": 1,
+ "spk_table_start_time": 487928588.0336103,
+ "spk_table_end_time": 487928903.0416103,
+ "spk_table_original_size": 2,
"ephemeris_times": [
- 487928745.5376103
+ 487928588.0336103,
+ 487928903.0416103
],
"positions": [
[
- -1185193768.8241498,
- 4445753700.5882435,
- 1744608601.9349077
+ -1185192920.7179058,
+ 4445753826.328262,
+ 1744608381.6299028
+ ],
+ [
+ -1185194616.9264162,
+ 4445753574.851499,
+ 1744608822.2421715
]
],
"velocities": [
[
- -5.384652174178511,
- -0.798318658709526,
- 1.3987335960827767
+ -5.384684731621295,
+ -0.7983449665065855,
+ 1.3987282485477626
+ ],
+ [
+ -5.38461959997192,
+ -0.7982923542223871,
+ 1.3987388633936644
]
],
"reference_frame": 1
diff --git a/tests/pytests/data/isds/nhmvic_tdi_isd.json b/tests/pytests/data/isds/nhmvic_tdi_isd.json
index b2e4512..06d7ea8 100644
--- a/tests/pytests/data/isds/nhmvic_tdi_isd.json
+++ b/tests/pytests/data/isds/nhmvic_tdi_isd.json
@@ -9564,24 +9564,35 @@
"reference_frame": 1
},
"sun_position": {
- "spk_table_start_time": 225914469.40369397,
- "spk_table_end_time": 225914469.40369397,
- "spk_table_original_size": 1,
+ "spk_table_start_time": 225914465.70569476,
+ "spk_table_end_time": 225914473.10169315,
+ "spk_table_original_size": 2,
"ephemeris_times": [
- 225914469.40369397
+ 225914465.70569476,
+ 225914473.10169315
],
"positions": [
[
- 311514431.9424406,
- 680227161.5551487,
- 283981784.4504464
+ 311514475.8856171,
+ 680227146.728369,
+ 283981777.02503234
+ ],
+ [
+ 311514387.9977659,
+ 680227176.3825058,
+ 283981791.8761116
]
],
"velocities": [
[
- -11.883162573292852,
- 4.009483920067549,
- 2.007988528896123
+ -11.883162097081541,
+ 4.009484622523188,
+ 2.0079887272529304
+ ],
+ [
+ -11.883163060694933,
+ 4.009483291484416,
+ 2.00798816582188
]
],
"reference_frame": 1
diff --git a/tests/pytests/test_data_naif.py b/tests/pytests/test_data_naif.py
index 6c370b9..e8047d1 100644
--- a/tests/pytests/test_data_naif.py
+++ b/tests/pytests/test_data_naif.py
@@ -93,6 +93,7 @@ class test_data_naif(unittest.TestCase):
assert not self.driver.correct_lt_to_surface
def test_sun_position(self):
+ self.driver.ephemeris_time = [297088762.61698407]
sun_positions, sun_velocities, times = self.driver.sun_position
assert len(sun_positions) == 1
np.testing.assert_allclose(sun_positions[0], [-127052102329.16032, 139728839049.65073, -88111530293.94502])
diff --git a/tests/pytests/test_lro_drivers.py b/tests/pytests/test_lro_drivers.py
index 44d1453..6fd8ca5 100644
--- a/tests/pytests/test_lro_drivers.py
+++ b/tests/pytests/test_lro_drivers.py
@@ -51,7 +51,6 @@ def test_load(test_kernels, label_type, image, kernel_type):
compare_isd = get_isd('lro_isis')
isd_obj = json.loads(isd_str)
- print(json.dumps(isd_obj, indent=2))
comparison = compare_dicts(isd_obj, compare_isd)
assert comparison == []
--
GitLab