Skip to content

Commit e5b8d3e

Browse files
ChristopherRabotinChristopherRabotin
authored
Merge pull request #348 from nyx-space/gh-346-bis
Allow 100 nanosecond leeway in querying DAF files
2 parents 2086cc6 + 6f43aa9 commit e5b8d3e

18 files changed

+66
-52
lines changed

‎.github/workflows/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
wget -O data/de430.bsp http://public-data.nyxspace.com/anise/de430.bsp
2424
wget -O data/de440s.bsp http://public-data.nyxspace.com/anise/de440s.bsp
2525
wget -O data/de440.bsp http://public-data.nyxspace.com/anise/de440.bsp
26-
wget -O data/pck08.pca http://public-data.nyxspace.com/anise/v0.4/pck08.pca
26+
wget -O data/pck08.pca http://public-data.nyxspace.com/anise/v0.5/pck08.pca
2727
wget -O data/gmat-hermite.bsp http://public-data.nyxspace.com/anise/ci/gmat-hermite.bsp
2828
wget -O data/gmat-hermite-big-endian.bsp http://public-data.nyxspace.com/anise/ci/gmat-hermite-big-endian.bsp
2929
wget -O data/variable-seg-size-hermite.bsp http://public-data.nyxspace.com/anise/ci/variable-seg-size-hermite.bsp

‎.github/workflows/python.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
wget -O data/de430.bsp http://public-data.nyxspace.com/anise/de430.bsp
2828
wget -O data/de440s.bsp http://public-data.nyxspace.com/anise/de440s.bsp
2929
wget -O data/de440.bsp http://public-data.nyxspace.com/anise/de440.bsp
30-
wget -O data/pck08.pca http://public-data.nyxspace.com/anise/v0.4/pck08.pca
31-
wget -O data/pck11.pca http://public-data.nyxspace.com/anise/v0.4/pck11.pca
30+
wget -O data/pck08.pca http://public-data.nyxspace.com/anise/v0.5/pck08.pca
31+
wget -O data/pck11.pca http://public-data.nyxspace.com/anise/v0.5/pck11.pca
3232
3333
- uses: actions/setup-python@v5
3434
with:
@@ -226,8 +226,8 @@ jobs:
226226
wget -O data/de430.bsp http://public-data.nyxspace.com/anise/de430.bsp
227227
wget -O data/de440s.bsp http://public-data.nyxspace.com/anise/de440s.bsp
228228
wget -O data/de440.bsp http://public-data.nyxspace.com/anise/de440.bsp
229-
wget -O data/pck08.pca http://public-data.nyxspace.com/anise/v0.4/pck08.pca
230-
wget -O data/pck11.pca http://public-data.nyxspace.com/anise/v0.4/pck11.pca
229+
wget -O data/pck08.pca http://public-data.nyxspace.com/anise/v0.5/pck08.pca
230+
wget -O data/pck11.pca http://public-data.nyxspace.com/anise/v0.5/pck11.pca
231231
232232
- name: Build sdist
233233
uses: PyO3/maturin-action@v1

‎.github/workflows/rust.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ jobs:
4444
wget -O data/de440s.bsp http://public-data.nyxspace.com/anise/de440s.bsp
4545
wget -O data/de440.bsp http://public-data.nyxspace.com/anise/de440.bsp
4646
wget -O data/de440_type3.bsp http://public-data.nyxspace.com/anise/de440_type3.bsp
47-
wget -O data/pck08.pca http://public-data.nyxspace.com/anise/v0.4/pck08.pca
48-
wget -O data/pck11.pca http://public-data.nyxspace.com/anise/v0.4/pck11.pca
49-
wget -O data/moon_fk.epa http://public-data.nyxspace.com/anise/v0.4/moon_fk.epa
47+
wget -O data/pck08.pca http://public-data.nyxspace.com/anise/v0.5/pck08.pca
48+
wget -O data/pck11.pca http://public-data.nyxspace.com/anise/v0.5/pck11.pca
49+
wget -O data/moon_fk.epa http://public-data.nyxspace.com/anise/v0.5/moon_fk.epa
5050
wget -O data/moon_pa_de440_200625.bpc http://public-data.nyxspace.com/anise/moon_pa_de440_200625.bpc
5151
wget -O data/gmat-hermite.bsp http://public-data.nyxspace.com/anise/ci/gmat-hermite.bsp
5252
wget -O data/gmat-hermite-big-endian.bsp http://public-data.nyxspace.com/anise/ci/gmat-hermite-big-endian.bsp
@@ -111,8 +111,8 @@ jobs:
111111
wget -O data/de440s.bsp http://public-data.nyxspace.com/anise/de440s.bsp
112112
wget -O data/de440.bsp http://public-data.nyxspace.com/anise/de440.bsp
113113
wget -O data/de440_type3.bsp http://public-data.nyxspace.com/anise/de440_type3.bsp
114-
wget -O data/pck08.pca http://public-data.nyxspace.com/anise/v0.4/pck08.pca
115-
wget -O data/pck11.pca http://public-data.nyxspace.com/anise/v0.4/pck11.pca
114+
wget -O data/pck08.pca http://public-data.nyxspace.com/anise/v0.5/pck08.pca
115+
wget -O data/pck11.pca http://public-data.nyxspace.com/anise/v0.5/pck11.pca
116116
wget -O data/gmat-hermite.bsp http://public-data.nyxspace.com/anise/ci/gmat-hermite.bsp
117117
wget -O data/gmat-hermite-big-endian.bsp http://public-data.nyxspace.com/anise/ci/gmat-hermite-big-endian.bsp
118118
wget -O data/variable-seg-size-hermite.bsp http://public-data.nyxspace.com/anise/ci/variable-seg-size-hermite.bsp
@@ -185,8 +185,8 @@ jobs:
185185
wget -O data/de440s.bsp http://public-data.nyxspace.com/anise/de440s.bsp
186186
wget -O data/de440.bsp http://public-data.nyxspace.com/anise/de440.bsp
187187
wget -O data/de440_type3.bsp http://public-data.nyxspace.com/anise/de440_type3.bsp
188-
wget -O data/pck08.pca http://public-data.nyxspace.com/anise/v0.4/pck08.pca
189-
wget -O data/pck11.pca http://public-data.nyxspace.com/anise/v0.4/pck11.pca
188+
wget -O data/pck08.pca http://public-data.nyxspace.com/anise/v0.5/pck08.pca
189+
wget -O data/pck11.pca http://public-data.nyxspace.com/anise/v0.5/pck11.pca
190190
wget -O data/gmat-hermite.bsp http://public-data.nyxspace.com/anise/ci/gmat-hermite.bsp
191191
wget -O data/gmat-hermite-big-endian.bsp http://public-data.nyxspace.com/anise/ci/gmat-hermite-big-endian.bsp
192192
wget -O data/variable-seg-size-hermite.bsp http://public-data.nyxspace.com/anise/ci/variable-seg-size-hermite.bsp

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ For convenience, Nyx Space provides a few important SPICE files on a public buck
5858

5959
+ [de440s.bsp](http://public-data.nyxspace.com/anise/de440s.bsp): JPL's latest ephemeris dataset from 1900 until 20250
6060
+ [de440.bsp](http://public-data.nyxspace.com/anise/de440.bsp): JPL's latest long-term ephemeris dataset
61-
+ [pck08.pca](http://public-data.nyxspace.com/anise/v0.4/pck08.pca): planetary constants ANISE (`pca`) kernel, built from the JPL gravitational data [gm_de431.tpc](http://public-data.nyxspace.com/anise/gm_de431.tpc) and JPL's plantary constants file [pck00008.tpc](http://public-data.nyxspace.com/anise/pck00008.tpc)
62-
+ [pck11.pca](http://public-data.nyxspace.com/anise/v0.4/pck11.pca): planetary constants ANISE (`pca`) kernel, built from the JPL gravitational data [gm_de431.tpc](http://public-data.nyxspace.com/anise/gm_de431.tpc) and JPL's plantary constants file [pck00011.tpc](http://public-data.nyxspace.com/anise/pck00011.tpc)
63-
+ [moon_fk.epa](http://public-data.nyxspace.com/anise/v0.4/moon_fk.epa): Euler Parameter ANISE (`epa`) kernel, built from the JPL Moon Frame Kernel `moon_080317.txt`
61+
+ [pck08.pca](http://public-data.nyxspace.com/anise/v0.5/pck08.pca): planetary constants ANISE (`pca`) kernel, built from the JPL gravitational data [gm_de431.tpc](http://public-data.nyxspace.com/anise/gm_de431.tpc) and JPL's plantary constants file [pck00008.tpc](http://public-data.nyxspace.com/anise/pck00008.tpc)
62+
+ [pck11.pca](http://public-data.nyxspace.com/anise/v0.5/pck11.pca): planetary constants ANISE (`pca`) kernel, built from the JPL gravitational data [gm_de431.tpc](http://public-data.nyxspace.com/anise/gm_de431.tpc) and JPL's plantary constants file [pck00011.tpc](http://public-data.nyxspace.com/anise/pck00011.tpc)
63+
+ [moon_fk.epa](http://public-data.nyxspace.com/anise/v0.5/moon_fk.epa): Euler Parameter ANISE (`epa`) kernel, built from the JPL Moon Frame Kernel `moon_080317.txt`
6464

6565
You may load any of these using the `load()` shortcut that will determine the file type upon loading, e.g. `let almanac = Almanac::new("pck08.pca").unwrap();` or in Python `almanac = Almanac("pck08.pca")`. To automatically download remote assets, from the Nyx Cloud or elsewhere, use the MetaAlmanac: `almanac = MetaAlmanac("ci_config.dhall").process()` in Python.
6666

‎anise-gui/src/bpc.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,15 @@ pub fn bpc_ui(
5858
ui.label(name);
5959
});
6060

61+
row.col(|ui| match orientation_name_from_id(summary.frame_id) {
62+
Some(name) => {
63+
ui.label(format!("{name} ({})", summary.frame_id));
64+
}
65+
None => {
66+
ui.label(format!("{}", summary.frame_id));
67+
}
68+
});
69+
6170
row.col(|ui| {
6271
if show_unix {
6372
ui.text_edit_singleline(&mut format!(
@@ -80,15 +89,6 @@ pub fn bpc_ui(
8089
};
8190
});
8291

83-
row.col(|ui| match orientation_name_from_id(summary.frame_id) {
84-
Some(name) => {
85-
ui.label(format!("{name} ({})", summary.frame_id));
86-
}
87-
None => {
88-
ui.label(format!("{}", summary.frame_id));
89-
}
90-
});
91-
9292
row.col(
9393
|ui| match orientation_name_from_id(summary.inertial_frame_id) {
9494
Some(name) => {

‎anise-gui/src/ui.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ impl eframe::App for UiApp {
9696
egui::TopBottomPanel::top("header").show(ctx, |ui| {
9797
ui.horizontal_centered(|ui| {
9898
ui.vertical_centered(|ui| {
99-
ui.heading("ANISE v0.4");
99+
ui.heading("ANISE v0.5");
100100
ui.label("A modern rewrite of NASA's SPICE toolkit");
101101
ui.hyperlink_to("Contact", "https://7ug5imdtt8v.typeform.com/to/neFvVW3p");
102102
ui.hyperlink_to(

‎anise-py/anise.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ The MetaAlmanac will download the DE440s.bsp file, the PCK0008.PCA, the full Moo
312312
313313
# File list
314314
- <http://public-data.nyxspace.com/anise/de440s.bsp>
315-
- <http://public-data.nyxspace.com/anise/v0.4/pck08.pca>
315+
- <http://public-data.nyxspace.com/anise/v0.5/pck08.pca>
316316
- <http://public-data.nyxspace.com/anise/moon_pa_de440_200625.bpc>
317317
- <https://naif.jpl.nasa.gov/pub/naif/generic_kernels/pck/earth_latest_high_prec.bpc>
318318

‎anise-py/tutorials/Tutorial 02 - Loading remote SPICE and ANISE files (meta almanac).ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@
9494
", uri = \"http://public-data.nyxspace.com/anise/de440s.bsp\"\n",
9595
"}\n",
9696
", { crc32 = Some 2899443223\n",
97-
", uri = \"http://public-data.nyxspace.com/anise/v0.4/pck11.pca\"\n",
97+
", uri = \"http://public-data.nyxspace.com/anise/v0.5/pck11.pca\"\n",
9898
"}\n",
9999
", { crc32 = Some 2133296540\n",
100-
", uri = \"http://public-data.nyxspace.com/anise/v0.4/moon_fk.epa\"\n",
100+
", uri = \"http://public-data.nyxspace.com/anise/v0.5/moon_fk.epa\"\n",
101101
"}\n",
102102
", { crc32 = Some 1817759242\n",
103103
", uri = \"http://public-data.nyxspace.com/anise/moon_pa_de440_200625.bpc\"\n",
@@ -238,7 +238,7 @@
238238
"name": "stdout",
239239
"output_type": "stream",
240240
"text": [
241-
"MetaAlmanac { files: [MetaFile { uri: \"http://public-data.nyxspace.com/anise/de440s.bsp\", crc32: Some(1921414410) }, MetaFile { uri: \"http://public-data.nyxspace.com/anise/v0.4/pck11.pca\", crc32: Some(2899443223) }, MetaFile { uri: \"http://public-data.nyxspace.com/anise/v0.4/moon_fk.epa\", crc32: Some(2133296540) }, MetaFile { uri: \"http://public-data.nyxspace.com/anise/moon_pa_de440_200625.bpc\", crc32: Some(1817759242) }, MetaFile { uri: \"https://naif.jpl.nasa.gov/pub/naif/generic_kernels/pck/earth_latest_high_prec.bpc\", crc32: None }] }\n"
241+
"MetaAlmanac { files: [MetaFile { uri: \"http://public-data.nyxspace.com/anise/de440s.bsp\", crc32: Some(1921414410) }, MetaFile { uri: \"http://public-data.nyxspace.com/anise/v0.5/pck11.pca\", crc32: Some(2899443223) }, MetaFile { uri: \"http://public-data.nyxspace.com/anise/v0.5/moon_fk.epa\", crc32: Some(2133296540) }, MetaFile { uri: \"http://public-data.nyxspace.com/anise/moon_pa_de440_200625.bpc\", crc32: Some(1817759242) }, MetaFile { uri: \"https://naif.jpl.nasa.gov/pub/naif/generic_kernels/pck/earth_latest_high_prec.bpc\", crc32: None }] }\n"
242242
]
243243
}
244244
],
@@ -502,7 +502,7 @@
502502
"only_de440s = Almanac(\"../../data/de440s.bsp\").load(\"../../data/pck11.pca\")\n",
503503
"print(only_de440s)\n",
504504
"# Now load a PCA from the Nyx Space cloud\n",
505-
"de440s_and_moon = only_de440s.load_from_metafile(MetaFile(\"http://public-data.nyxspace.com/anise/v0.4/moon_fk.epa\", 2133296540))\n",
505+
"de440s_and_moon = only_de440s.load_from_metafile(MetaFile(\"http://public-data.nyxspace.com/anise/v0.5/moon_fk.epa\", 2133296540))\n",
506506
"print(de440s_and_moon)"
507507
]
508508
},

‎anise-py/tutorials/Tutorial 05 - Using frame kernels and text planetary kernels.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@
299299
"\n",
300300
"Here are the general steps:\n",
301301
"\n",
302-
"1. Load the latest Almanac, and check (by printing it) that it includes both EPA and PCA data. Else, load the moon_fk.epa file from the Nyx Space Cloud using a MetaFile with the URL <http://public-data.nyxspace.com/anise/v0.4/moon_fk.epa>.\n",
302+
"1. Load the latest Almanac, and check (by printing it) that it includes both EPA and PCA data. Else, load the moon_fk.epa file from the Nyx Space Cloud using a MetaFile with the URL <http://public-data.nyxspace.com/anise/v0.5/moon_fk.epa>.\n",
303303
"2. Define a time series over a year with a granularity of 12 hours. This crater is on the South Pole of the Moon, and its visibility is often below the horizon of an object as far north as Paris.\n",
304304
"3. For each epoch, define Paris as an `Orbit` instance from its longitude and latitde (recall that the constants include the mean Earth angular rotation rate), in the IAU_EARTH frame. Also build the crater in the IAU_MOON frame.\n",
305305
"4. Finally, call the AER function of the Almanac with each epoch to compute the AER data. Plot it!"

‎anise/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,9 @@ For convenience, Nyx Space provides a few important SPICE files on a public buck
183183

184184
+ [de440s.bsp](http://public-data.nyxspace.com/anise/de440s.bsp): JPL's latest ephemeris dataset from 1900 until 20250
185185
+ [de440.bsp](http://public-data.nyxspace.com/anise/de440.bsp): JPL's latest long-term ephemeris dataset
186-
+ [pck08.pca](http://public-data.nyxspace.com/anise/v0.4/pck08.pca): planetary constants ANISE (`pca`) kernel, built from the JPL gravitational data [gm_de431.tpc](http://public-data.nyxspace.com/anise/gm_de431.tpc) and JPL's plantary constants file [pck00008.tpc](http://public-data.nyxspace.com/anise/pck00008.tpc)
187-
+ [pck11.pca](http://public-data.nyxspace.com/anise/v0.4/pck11.pca): planetary constants ANISE (`pca`) kernel, built from the JPL gravitational data [gm_de431.tpc](http://public-data.nyxspace.com/anise/gm_de431.tpc) and JPL's plantary constants file [pck00011.tpc](http://public-data.nyxspace.com/anise/pck00011.tpc)
188-
+ [moon_fk.epa](http://public-data.nyxspace.com/anise/v0.4/moon_fk.epa): Euler Parameter ANISE (`epa`) kernel, built from the JPL Moon Frame Kernel `moon_080317.txt`
186+
+ [pck08.pca](http://public-data.nyxspace.com/anise/v0.5/pck08.pca): planetary constants ANISE (`pca`) kernel, built from the JPL gravitational data [gm_de431.tpc](http://public-data.nyxspace.com/anise/gm_de431.tpc) and JPL's plantary constants file [pck00008.tpc](http://public-data.nyxspace.com/anise/pck00008.tpc)
187+
+ [pck11.pca](http://public-data.nyxspace.com/anise/v0.5/pck11.pca): planetary constants ANISE (`pca`) kernel, built from the JPL gravitational data [gm_de431.tpc](http://public-data.nyxspace.com/anise/gm_de431.tpc) and JPL's plantary constants file [pck00011.tpc](http://public-data.nyxspace.com/anise/pck00011.tpc)
188+
+ [moon_fk.epa](http://public-data.nyxspace.com/anise/v0.5/moon_fk.epa): Euler Parameter ANISE (`epa`) kernel, built from the JPL Moon Frame Kernel `moon_080317.txt`
189189

190190
You may load any of these using the `load()` shortcut that will determine the file type upon loading, e.g. `let almanac = Almanac::new("pck08.pca").unwrap();` or in Python `almanac = Almanac("pck08.pca")`. To automatically download remote assets, from the Nyx Cloud or elsewhere, use the MetaAlmanac: `almanac = MetaAlmanac("ci_config.dhall").process(true)` in Python.
191191

‎anise/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fn main() {
1515

1616
let embedded_files = [
1717
(
18-
"http://public-data.nyxspace.com/anise/v0.4/pck11.pca",
18+
"http://public-data.nyxspace.com/anise/v0.5/pck11.pca",
1919
format!("{}/../data/pck11.pca", env!("CARGO_MANIFEST_DIR")),
2020
),
2121
(

‎anise/src/almanac/metaload/metaalmanac.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ impl MetaAlmanac {
8787
///
8888
/// # File list
8989
/// - <http://public-data.nyxspace.com/anise/de440s.bsp>
90-
/// - <http://public-data.nyxspace.com/anise/v0.4/pck11.pca>
90+
/// - <http://public-data.nyxspace.com/anise/v0.5/pck11.pca>
9191
/// - <http://public-data.nyxspace.com/anise/moon_pa_de440_200625.bpc>
9292
/// - <https://naif.jpl.nasa.gov/pub/naif/generic_kernels/pck/earth_latest_high_prec.bpc>
9393
///
@@ -165,7 +165,7 @@ impl MetaAlmanac {
165165
///
166166
/// # File list
167167
/// - <http://public-data.nyxspace.com/anise/de440s.bsp>
168-
/// - <http://public-data.nyxspace.com/anise/v0.4/pck08.pca>
168+
/// - <http://public-data.nyxspace.com/anise/v0.5/pck08.pca>
169169
/// - <http://public-data.nyxspace.com/anise/moon_pa_de440_200625.bpc>
170170
/// - <https://naif.jpl.nasa.gov/pub/naif/generic_kernels/pck/earth_latest_high_prec.bpc>
171171
///
@@ -238,8 +238,8 @@ impl MetaAlmanac {
238238
///
239239
/// # File list
240240
/// - <http://public-data.nyxspace.com/anise/de440s.bsp>
241-
/// - <http://public-data.nyxspace.com/anise/v0.4/pck11.pca>
242-
/// - <http://public-data.nyxspace.com/anise/v0.4/moon_fk.epa>
241+
/// - <http://public-data.nyxspace.com/anise/v0.5/pck11.pca>
242+
/// - <http://public-data.nyxspace.com/anise/v0.5/moon_fk.epa>
243243
/// - <http://public-data.nyxspace.com/anise/moon_pa_de440_200625.bpc>
244244
/// - <https://naif.jpl.nasa.gov/pub/naif/generic_kernels/pck/earth_latest_high_prec.bpc>
245245
///
@@ -261,11 +261,11 @@ impl Default for MetaAlmanac {
261261
crc32: Some(0x7286750a),
262262
},
263263
MetaFile {
264-
uri: nyx_cloud_stor.join("v0.4/pck11.pca").unwrap().to_string(),
264+
uri: nyx_cloud_stor.join("v0.5/pck11.pca").unwrap().to_string(),
265265
crc32: Some(0x8213b6e9),
266266
},
267267
MetaFile {
268-
uri: nyx_cloud_stor.join("v0.4/moon_fk.epa").unwrap().to_string(),
268+
uri: nyx_cloud_stor.join("v0.5/moon_fk.epa").unwrap().to_string(),
269269
crc32: Some(0xb93ba21),
270270
},
271271
MetaFile {

‎anise/src/almanac/metaload/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ mod meta_test {
143143
, uri = "http://public-data.nyxspace.com/anise/de440s.bsp"
144144
}
145145
, { crc32 = Some 0x8213b6e9
146-
, uri = "http://public-data.nyxspace.com/anise/v0.4/pck11.pca"
146+
, uri = "http://public-data.nyxspace.com/anise/v0.5/pck11.pca"
147147
}
148148
, { crc32 = Some 0xb93ba21
149-
, uri = "http://public-data.nyxspace.com/anise/v0.4/moon_fk.epa"
149+
, uri = "http://public-data.nyxspace.com/anise/v0.5/moon_fk.epa"
150150
}
151151
, { crc32 = Some 0xcde5ca7d
152152
, uri = "http://public-data.nyxspace.com/anise/moon_pa_de440_200625.bpc"

0 commit comments

Comments
 (0)