Skip to content
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

updated ORex data area in IsisPref #4221

Merged
merged 12 commits into from
Mar 11, 2021
Merged

updated ORex data area in IsisPref #4221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3ab4b33
updated ORex data area in IsisPref
Dec 24, 2020
5d4b424
added entry in changelog
Dec 24, 2020
061e974
modified osirisrex path
robotprogrammer22 Dec 29, 2020
4b63237
tests
Dec 31, 2020
19fe869
Merge branch 'orexpref' of https://github.com/Kelvinrr/ISIS3 into ore…
Dec 31, 2020
71762c2
added SCLK
Feb 17, 2021
f53ea42
asd;fkja;sdiljfl;ksakedjfl;kjas
Kelvinrr Mar 5, 2021
6679c20
makefile change
Kelvinrr Mar 8, 2021
5a97789
forcing predicted
Kelvinrr Mar 8, 2021
44f1229
recon for polycam
Kelvinrr Mar 8, 2021
8b67ee8
unittest fix
Kelvinrr Mar 10, 2021
82e6146
removed unittest
Kelvinrr Mar 10, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ release.
- The isis3VarInit script is now just called isisVarInit and allows for more robust paths. [#3945](https://github.com/USGS-Astrogeology/ISIS3/pull/3945)
- Isis2raw will now output straight to a 32bit file (no stretch) when stretch is set to None and bittype is set to 32bit. [#3878](https://github.com/USGS-Astrogeology/ISIS3/issues/3878)
- Findimageoverlaps can now have calculations and writes happen at the same time or sequentially. [#4047](https://github.com/USGS-Astrogeology/ISIS3/pull/4047)
- IsisPreferences has had the default path to Osirisrex updated to point to new kernels released by NAIF [#4060](https://github.com/USGS-Astrogeology/ISIS3/issues/4060)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would be a good opportunity to add that we have support for the OREx Bennu data.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The TestPreference file needs to have the same change. Changing this may cause some tests to fail.


### Fixed

Expand Down
2 changes: 1 addition & 1 deletion isis/IsisPreferences
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ Group = DataDirectory
Near = $ISISDATA/near
NewHorizons = $ISISDATA/newhorizons
Odyssey = $ISISDATA/odyssey
OsirisRex = $ISISDATA/../datalocal/osirisrex
OsirisRex = $ISISDATA/osirisrex
Rolo = $ISISDATA/rolo
Rosetta = $ISISDATA/rosetta
Smart1 = $ISISDATA/smart1
Expand Down
2 changes: 1 addition & 1 deletion isis/TestPreferences
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ Group = DataDirectory
Near = $ISISDATA/near
NewHorizons = $ISISDATA/newhorizons
Odyssey = $ISISDATA/odyssey
OsirisRex = $ISISDATA/../datalocal/osirisrex
OsirisRex = $ISISDATA/osirisrex
Rolo = $ISISDATA/rolo
Rosetta = $ISISDATA/rosetta
Smart1 = $ISISDATA/smart1
Expand Down
155 changes: 0 additions & 155 deletions isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.truth
View file
Open in desktop

This file was deleted.

183 changes: 0 additions & 183 deletions isis/src/osirisrex/objs/OsirisRexOcamsCamera/unitTest.cpp
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion isis/src/osirisrex/tsts/mapcam/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ commands:
from=$(OUTPUT)/20190303T100344S990_map_iofL2pan_V001-spiceinit.cub \
ckpredict=t \
spkpredict=t \
extra='$$osirisrex/kernels/pck/bennu_v10.tpc' \
ckrecon=f \
spkrecon=f \
SCLK='$$osirisrex/kernels/sclk/SCLK.tsc' \
extra='$$osirisrex/kernels/pck/bennu_v10.tpc' \
>& /dev/null;

# phocube first image
Expand Down
7 changes: 3 additions & 4 deletions isis/src/osirisrex/tsts/polycam/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ commands:
# spiceinit first image
spiceinit $(TSTARGS) \
from=$(OUTPUT)/2019-01-13T23_35_59.000_PCAM_L2b_V001.cub \
ckpredict=t \
spkpredict=t \
extra='$$osirisrex/kernels/pck/bennu_v10.tpc' \
>& /dev/null;
SCLK='$$osirisrex/kernels/sclk/SCLK.tsc' \
extra='$$osirisrex/kernels/pck/bennu_v10.tpc' \
> /dev/null;

# # phocube first image
# # create backplane with dn, phase angle, emission angle, incidence angle, and pixel resolution
Expand Down
Loading