merging dev into CSM branch in preparation for PR (#4192)

* Ckwriter App and Test Update (#4126) * Convert ckwriter to new app format * Updated ckwriter tests to gtest and fixed angular velocities in the ThreeImageNetwork fixture * Removed old/unnecessary includes * Removed old ckwriter test makefiles * Added Code of Conduct that points to TSC (#4124) * Update qview tools to better support RA/DEC measurements (#4125) * jigsaw to app conversion and remove unnecessary tests * Updated based on comments * Updated spacing * Adds apollo fixture for jigsaw tests * Updated to use pvl control network * Switch to using function to compare whole csv lines * Updated to add more individual line comparisons * Updated based on comments * Remove accidentally re-added line * removed ISISROOT path * Remove incorrect comparison part of test * Adds jigsaw BundleXYZ test * Update qview MeasureTool to add an option to calculate distances using RA/DEC and update qview to show DEC/RA rather than LAT/LON in lower-right corner * Add changelog * Added text to description by Dave Humm. Closes #3860 (#4107) * Added text to description by Dave Humm. Closes #3860 * Forgot to add to the change log file * Update after review * Updated after review * added socetlinescankeywords tests (#4128) * added socetlinescankeywords tests * removed prints * added no blob test * removed prints * addressed comments * removed prefix * Xmlfix (#4134) * Added text to description by Dave Humm. Closes #3860 * Forgot to add to the change log file * Update after review * Updated after review * Fixed broken xmls * Update lronaccal.xml * Shadow App and Test Update (#4118) * Add dn populated dem fixture * Convert the shapow app into the new app format * Translate the base and multiplier from a label * Add dem cube and updated tests * Removed old shadow tests * Fixed demCube fixed label loading * Updated shadow tests and demCube fixture * Lronac2pds App and Test Update (#4135) * Converted lronac2pds to new application format * Updated tests for lronac2pds to gtests * Removed old lronac2pds test makefiles * Removed local path * Addressed PR comments * Hidtmgen conversion + gtests (#4137) * Initial hidtmgen conversion + gtests * Initial hidtmgen tests * Removed compile and deprication warnings. Fixes #4110 * Spkwriter App and Test Update (#4140) * Fixed small bug in spk writer * Converted spkwriter app * Converted tests to Gtests * Removed old tests make files * Removed old spiceinit makefiles and fixed test (#4145) * Removed old spiceinit makefiles and fixed test * Updated spiceinit ck config to use regex for fk * Fixed comment typo * Hicolormos tests (#4133) * converted hicolormos * added colormost things idk * added test * finished tests * removed old tests * mislabeled fixture * missed a spot * more missed sport * removed include * uuuuuuuuuggggh * smaller cube * removed blobs * Removed duplicate inclusion for mappt (#4153) * Removed duplicate inclusion for mappt * Removed exclusion too * Changelog update (#4157) * Fixed changelog and added #4150 * More changelog clean-up * Lronac2isis tests added (#4141) * added new files * added lronac2isis tests * added data (important) * static funcs * Himos App and Test Update (#4156) * Updated himos to new application format * Added new gtests for himos * Removed old himos tests * Addressed excess white spaceing * Added static declaration on app helper functions * Removed unnecessary static declaration * Ringsautomos tests added (#4155) * added ring automos tests * uuuugh * comments * fixed typo * messing up your branchm not even once * Initial demprep conversion + gtests (#4158) * pds2isis gtest (#4144) * write tests with cropped data * add cropped data * test DN's and remove accidental paths * remove accidental prints * fix build failure * remove local path * Update .zenodo.json (#4173) * Updated cropping notebooks to work with pvl 1.0.0 (#4159) * Updated lo_reimported notebooke * Updated kaguya notebook * Updated chan notebook * Changed path * Updated marci notebook * Updated lo notebook * Updated lo notebooks * Added mimap notebook * ApolloPanStitch App and Test Update (#4164) * Updated apollopanstitcher app format * Fixed typo * Updated setoutputcube for ProcessMosaic * Initial stab at the apollopanstitcher gtest * Updated test name * Updated file name * Updated test and removed redundant ui access * Removed old test makefiles * added nocam2map tests (#4167) * added tests * changed include guards to all lower * reduce conversion and gtests (#4174) * inital reduce conversion and gtests * removed comment per PR feedback * Removed log variables in tests. * Automos App and Test Update (#4166) * App conversion for automos * Updated tests for automos * Removed old automos tests * Tested applog output in default test and removed other applog variables * Added north/south pole tests for demprep (#4176) * Added north/south pole tests for demprep * Added missing data files for n/s pole tests. * include changes to main.cpp (#4182) * Std2isis gtests (#4172) * added std2isis tests * removed old tests * added unittests * removed image importer unittest * addressed comments Co-authored-by: acpaquette <acpaquette@usgs.gov> Co-authored-by: Kristin Berry <kberry@usgs.gov> Co-authored-by: Stuart Sides <ssides@usgs.gov> Co-authored-by: Kelvin Rodriguez <kr788@nau.edu> Co-authored-by: AustinSanders <arsanders@usgs.gov> Co-authored-by: Tim Giroux <62255438+tgiroux@users.noreply.github.com> Co-authored-by: Amy Stamile <74275278+amystamile-usgs@users.noreply.github.com> Co-authored-by: Kaitlyn Lee <kdl222@nau.edu>
DOI-USGS · Dec 10, 2020 · 68bd30b · 68bd30b
1 parent 56b68b0
commit 68bd30b
Show file tree

Hide file tree

Showing 295 changed files with 35,197 additions and 8,447 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -30,7 +30,7 @@
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
 <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
 <!--- - [ ] My code follows the code style of this project. -->
-- [ ] I have read and agree to abide by the [Code of Conduct](https://usgs-astrogeology.github.io/code/)
+- [ ] I have read and agree to abide by the [Code of Conduct](https://github.com/USGS-Astrogeology/ISIS3/blob/dev/Code-Of-Conduct.md)
 - [ ] I have read the [**CONTRIBUTING**](https://github.com/USGS-Astrogeology/ISIS3/blob/dev/CONTRIBUTING.md) document.
 - [ ] My change requires a change to the documentation.
 - [ ] I have updated the documentation accordingly.

diff --git a/.zenodo.json b/.zenodo.json
@@ -169,6 +169,10 @@
     {
       "name": "Silva, Victor"
     },
+    {
+      "affiliation": "United States Geological Survey, Astro Geology Science Center",
+      "name": "Stamile, Amy"
+    },
     {
       "name": "Stapleton, Summer"
     },
@@ -198,4 +202,4 @@
   "license": "cc-zero",
   "access_right": "open",
   "upload_type": "software"
-}
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,10 +32,14 @@ update the Unreleased link so that it compares against the latest release tag.
 
 ### Added
 
- - Added the new csminit application and CSM Library loading to the IsisPreferences file. Together these allow users to get CSM state strings from ISD files. Once CSM camera model support is added, these will be used to setup a Cube to use a CSM camera model.
+- Added documentation to lronaccal and lrowaccal to describe why there are negative DNs in I/F calibrated images. [#3860](https://github.com/USGS-Astrogeology/ISIS3/issues/3860)
+- Update qview MeasureTool to add an option to calculate distances using RA/DEC and update qview to show DEC/RA rather than LAT/LON in lower-right corner [#3371](https://github.com/USGS-Astrogeology/ISIS3/issues/3371)
+- Added the new csminit application and CSM Library loading to the IsisPreferences file. Together these allow users to get CSM state strings from ISD files. Once CSM camera model support is added, these will be used to setup a Cube to use a CSM camera model.
 
+### Fixed
 
-- Fixed so required files are reported instead of continuing without them. [#4038](https://github.com/USGS-Astrogeology/ISIS3/issues/4038)
+- Fixed lrowaccal so required SPICE files are reported instead of continuing without them. [#4038](https://github.com/USGS-Astrogeology/ISIS3/issues/4038)
+- Fixed not being able to enable USECOORDLIST argument in mappt. [#4150](https://github.com/USGS-Astrogeology/ISIS3/issues/4150)
 
 ## [4.3.0] - 2020-10-02
 

diff --git a/Code-Of-Conduct.md b/Code-Of-Conduct.md
@@ -0,0 +1,3 @@
+# Code of Conduct
+
+This project uses the Planetary Software Code of Conduct which can be found at https://github.com/planetarysoftware/TSC/blob/master/Code-Of-Conduct.md
diff --git a/isis/notebooks/crop_chandrayaan.ipynb b/isis/notebooks/crop_chandrayaan.ipynb
diff --git a/isis/notebooks/crop_kaguya.ipynb b/isis/notebooks/crop_kaguya.ipynb
diff --git a/isis/notebooks/crop_lo.ipynb b/isis/notebooks/crop_lo.ipynb
diff --git a/isis/notebooks/crop_lo_reimport.ipynb b/isis/notebooks/crop_lo_reimport.ipynb
diff --git a/isis/notebooks/crop_marci.ipynb b/isis/notebooks/crop_marci.ipynb
diff --git a/isis/notebooks/crop_mimap.ipynb b/isis/notebooks/crop_mimap.ipynb
diff --git a/isis/src/CMakeLists.txt b/isis/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 #===============================================================================
-set(CORE_LIST base database control qisis system)
+set(CORE_LIST base database control qisis system socet)
 
 get_subdirectory_list(${CMAKE_CURRENT_LIST_DIR} modules)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Code of Conduct

		This project uses the Planetary Software Code of Conduct which can be found at https://github.com/planetarysoftware/TSC/blob/master/Code-Of-Conduct.md