From aa27b715722f4bf9f7156357d41082d02fc32b1b Mon Sep 17 00:00:00 2001 From: amystamile-usgs Date: Tue, 16 Feb 2021 15:02:04 -0700 Subject: [PATCH 1/6] Remove references to ISIS3 and replace with references to ISIS --- .github/ISSUE_TEMPLATE/3_Support_question.md | 6 +- README.md | 18 +- isis/IsisPreferences | 14 +- isis/TestPreferences | 14 +- .../translations/ClipperEisInstrument.trn | 2 +- isis/appdata/translations/README.TXT | 2 +- .../translations/pds4ExportArray2DImage.trn | 5 +- .../translations/pds4ExportArray3DImage.trn | 6 +- .../pds4ExportArray3DSpectrum.trn | 6 +- .../pds4ExportArray3DSpectrumBinSet.trn | 6 +- .../pds4ExportArray3DSpectrumUniform.trn | 4 +- .../translations/pds4ExportBandBin.trn | 22 +- .../translations/pds4ExportBandBinImage.trn | 16 +- .../pds4ExportBandBinSpectrum.trn | 22 +- .../pds4ExportBandBinSpectrumBinSet.trn | 16 +- .../pds4ExportBandBinSpectrumUniform.trn | 38 +- .../pds4ExportDisplaySettings.trn | 14 +- .../pds4ExportIdentificationArea.trn | 11 +- .../translations/pds4ExportInstrument.trn | 18 +- .../pds4ExportTargetFromInstrument.trn | 4 +- .../pds4ExportTargetFromMapping.trn | 4 +- .../pdsImportLambertAzimuthalEqualArea.trn | 4 +- .../pdsProjectionLineSampToXY.def | 18 +- .../translations/voyager_na_bandbin.trn | 5 +- .../translations/voyager_wa_bandbin.trn | 11 +- isis/make/config.darwin-10.5 | 4 +- isis/make/config.darwin-MacOSX10_10 | 2 +- isis/make/config.darwin-MacOSX10_11 | 2 +- isis/make/config.darwin-MacOSX10_13 | 2 +- isis/make/config.darwin-MacOSX10_14 | 4 +- isis/make/config.darwin-MacOSX10_15 | 4 +- isis/make/config.darwin-MacOSX10_6 | 4 +- isis/make/config.darwin-MacOSX10_8 | 4 +- isis/make/config.linux-x86_32 | 4 +- isis/make/config.linux-x86_64 | 4 +- isis/make/config.linux-x86_64_Debian8 | 4 +- isis/make/config.linux-x86_64_Fedora21 | 4 +- isis/make/config.linux-x86_64_Fedora25 | 4 +- isis/make/config.linux-x86_64_Ubuntu14_04 | 4 +- isis/sipfiles/BundleAdjust.sip | 2 +- .../apps/apollopaninit/apollopaninit.xml | 12 +- .../apps/autoregtemplate/autoregtemplate.xml | 9 +- isis/src/base/apps/blend/blend.xml | 8 +- isis/src/base/apps/cam2cam/cam2cam.cpp | 12 +- isis/src/base/apps/cam2map/cam2map.xml | 4 +- isis/src/base/apps/caminfo/caminfo.xml | 230 +++++----- isis/src/base/apps/crop/crop.cpp | 20 +- isis/src/base/apps/deriv/work/deriv.html | 38 +- isis/src/base/apps/equalizer/equalizer.xml | 2 +- isis/src/base/apps/errors/errors.xml | 6 +- isis/src/base/apps/fx/fx.xml | 396 ++++++++--------- .../base/apps/interestcube/interestcube.xml | 74 +-- isis/src/base/apps/isis2pds/isis2pds.cpp | 2 +- isis/src/base/apps/isis2pds/isis2pds.xml | 28 +- isis/src/base/apps/mapgrid/mapgrid.xml | 14 +- isis/src/base/apps/noproj/main.cpp | 4 +- isis/src/base/apps/pds2isis/pds2isis.xml | 20 +- isis/src/base/apps/phocube/phocube.xml | 12 +- .../base/apps/phoempglobal/phoempglobal.xml | 420 +++++++++--------- isis/src/base/apps/photomet/photomet.xml | 6 +- isis/src/base/apps/raw2isis/raw2isis.xml | 12 +- .../base/apps/ringscam2map/ringscam2map.xml | 328 +++++++------- isis/src/base/apps/shadow/shadow.xml | 2 +- isis/src/base/apps/shadowtau/shadowtau.xml | 300 ++++++------- isis/src/base/apps/smtk/smtk.xml | 300 ++++++------- isis/src/base/apps/stats/stats.cpp | 4 +- isis/src/base/apps/std2isis/std2isis.xml | 66 +-- .../base/objs/Anisotropic1/Anisotropic1.cpp | 4 +- .../src/base/objs/Application/Application.cpp | 4 +- .../CameraDistortionMap.cpp | 69 ++- isis/src/base/objs/Cube/Cube.cpp | 2 +- isis/src/base/objs/Cube/Cube.h | 6 +- isis/src/base/objs/DemShape/DemShape.h | 8 +- .../objs/EllipsoidShape/EllipsoidShape.cpp | 8 +- .../base/objs/EllipsoidShape/EllipsoidShape.h | 10 +- isis/src/base/objs/Environment/Environment.h | 16 +- .../EquatorialCylindricalShape.cpp | 6 +- .../EquatorialCylindricalShape.h | 4 +- .../objs/ExportPdsTable/ExportPdsTable.cpp | 100 ++--- .../base/objs/ExportPdsTable/ExportPdsTable.h | 46 +- isis/src/base/objs/Hapke/Hapke.h | 2 +- .../objs/ImportPdsTable/ImportPdsTable.cpp | 6 +- .../base/objs/ImportPdsTable/ImportPdsTable.h | 47 +- isis/src/base/objs/JP2Error/JP2Error.cpp | 4 +- isis/src/base/objs/JP2Error/JP2Error.h | 4 +- .../NumericalApproximation.h | 2 +- .../objs/Pipeline/PipelineApplication.cpp | 4 +- isis/src/base/objs/PlaneShape/PlaneShape.cpp | 6 +- isis/src/base/objs/PlaneShape/PlaneShape.h | 8 +- .../ProcessExportPds/ProcessExportPds.cpp | 2 +- .../ProcessExportPds4/ProcessExportPds4.cpp | 366 +++++++-------- .../ProcessImportPds/ProcessImportPds.cpp | 8 +- .../objs/ProgramLauncher/ProgramLauncher.cpp | 2 +- .../ProgramLauncher/ProgramLauncher.truth | 12 +- .../base/objs/ProgramLauncher/unitTest.cpp | 4 +- .../SerialNumberList/SerialNumberList.cpp | 22 +- isis/src/base/objs/ShapeModel/ShapeModel.cpp | 58 +-- isis/src/base/objs/ShapeModel/ShapeModel.h | 12 +- .../ShapeModelFactory/ShapeModelFactory.cpp | 28 +- .../ShapeModelFactory/ShapeModelFactory.h | 4 +- .../base/objs/SpicePosition/SpicePosition.cpp | 2 +- .../base/objs/SpiceRotation/SpiceRotation.h | 6 +- isis/src/base/objs/Table/Table.h | 39 +- isis/src/base/objs/TableField/TableField.h | 32 +- isis/src/base/objs/Target/Target.h | 12 +- .../XmlToPvlTranslationManager.cpp | 38 +- isis/src/cassini/apps/ciss2isis/ciss2isis.xml | 18 +- isis/src/cassini/apps/vims2isis/vims2isis.xml | 18 +- isis/src/cassini/apps/vimscal/main.cpp | 2 +- isis/src/cassini/apps/vimscal/makecubes.py | 34 +- .../clementine/apps/clem2isis/clem2isis.xml | 18 +- isis/src/clipper/apps/eis2isis/main.cpp | 62 +-- isis/src/control/apps/cnet2mat/cnet2mat.xml | 22 +- isis/src/control/apps/cnetadd/cnetadd.xml | 272 ++++++------ .../control/apps/cnetbin2pvl/cnetbin2pvl.xml | 4 +- isis/src/control/apps/cnetcheck/cnetcheck.xml | 54 +-- .../control/apps/cnetextract/cnetextract.xml | 12 +- .../control/apps/cnetpvl2bin/cnetpvl2bin.xml | 10 +- .../control/apps/cnetwinnow/cnetwinnow.xml | 18 +- isis/src/control/apps/coreg/coreg.xml | 130 +++--- isis/src/control/apps/deltack/deltack.xml | 244 +++++----- isis/src/control/apps/jigsaw/jigsaw.xml | 4 +- isis/src/control/apps/mat2cnet/main.cpp | 12 +- isis/src/control/apps/mat2cnet/mat2cnet.xml | 28 +- .../apps/mat2cnet/tsts/errors/Makefile | 2 +- isis/src/control/apps/pointreg/pointreg.xml | 380 ++++++++-------- .../control/objs/BundleAdjust/BundleAdjust.h | 8 +- .../ControlNetFileHeaderV0002.proto | 2 +- .../ControlNetFileHeaderV0005.proto | 2 +- .../ControlNetFileProtoV0001.proto | 2 +- .../ControlNetLogDataProtoV0001.proto | 2 +- .../ControlPointFileEntryV0002.proto | 2 +- .../ControlPointFileEntryV0005.proto | 2 +- isis/src/dev/apps/camdev/camdev.xml | 8 +- .../src/docsys/Application/build/TOCindex.xsl | 15 +- .../Application/build/TOCindex_alpha.xsl | 15 +- .../Application/build/TOCindex_category.xsl | 15 +- .../Application/build/TOCindex_oldvnew.xsl | 23 +- .../styles/IsisApplicationDocStyle.xsl | 19 +- .../ProgTester/IsisApplicationDocStyle.xsl | 15 +- .../Tabbed/styles/IsisApplicationDocStyle.xsl | 21 +- isis/src/docsys/Object/build/Developer.conf | 6 +- .../docsys/Object/build/isisDoxyDefs.doxydef | 68 +-- isis/src/docsys/build/ApiChanges.xsl | 10 +- isis/src/docsys/build/General.xsl | 15 +- isis/src/docsys/build/Guides.xsl | 17 +- .../src/docsys/build/IsisPrimaryPageBuild.xsl | 23 +- isis/src/docsys/build/IsisSubPageBuild.xsl | 19 +- isis/src/docsys/build/ParameterChanges.xsl | 10 +- isis/src/docsys/build/TechnicalInfo.xsl | 8 +- isis/src/docsys/build/UserDocs.xsl | 4 +- isis/src/docsys/build/menu.xsl | 2 +- .../CodingStandards/CodingStandards.xml | 109 +++-- .../ControlNetworks/ControlNetworks.xml | 10 +- .../EnvironmentAndPreferencesSetup.xml | 2 +- .../documents/InstallGuide/InstallGuide.xml | 4 +- .../LabelDictionary/LabelDictionary.xml | 2 +- .../LegacyInstallGuide/LegacyInstallGuide.xml | 2 +- .../documents/PatternMatch/PatternMatch.xml | 70 +-- .../PreferenceDictionary.xml | 12 +- .../apps/amica2isis/HayabusaAmicaKernels.trn | 2 +- .../hayabusa/apps/amica2isis/amica2isis.xml | 182 ++++---- .../hyb1pds4gen/HayabusaAmicaPds4Export.trn | 10 +- .../hyb1pds4gen/HayabusaNirsPds4Export.trn | 6 +- .../hayabusa/apps/hyb1pds4gen/hyb1pds4gen.xml | 54 +-- .../apps/nirs2isis/HayabusaNirsKernels.trn | 2 +- .../apps/hyb2onc2isis/Hayabusa2OncArchive.trn | 7 +- .../apps/hyb2onc2isis/Hayabusa2OncBandBin.trn | 2 +- .../hyb2onc2isis/Hayabusa2OncInstrument.trn | 2 +- .../apps/hyb2onc2isis/Hayabusa2OncKernels.trn | 2 +- .../apps/hyb2onc2isis/hyb2onc2isis.xml | 78 ++-- .../juno/apps/junocam2isis/junocam2isis.xml | 16 +- isis/src/juno/apps/junocam2isis/main.cpp | 69 ++- .../apps/kaguyami2isis/kaguyami2isis.xml | 4 +- .../apps/kaguyatc2isis/KaguyaTcKernels.trn | 2 +- .../apps/kaguyatc2isis/kaguyatc2isis.xml | 42 +- .../src/kaguya/apps/mimap2isis/mimap2isis.xml | 10 +- isis/src/lo/apps/lo2isis/lo2isis.xml | 10 +- isis/src/lo/apps/lopdsgen/lopdsgen.xml | 46 +- isis/src/lo/apps/lopdsgen/main.cpp | 2 +- .../LoCameraFiducialMap.cpp | 4 +- .../LoCameraFiducialMap/LoCameraFiducialMap.h | 6 +- isis/src/lro/apps/lromakeflat/lromakeflat.xml | 14 +- isis/src/mariner/apps/mar102isis/main.cpp | 2 +- isis/src/mariner/apps/mar10cal/mar10cal.xml | 48 +- isis/src/mgs/apps/mocgap/mocgap.xml | 10 +- isis/src/mro/apps/crism2isis/crism2isis.cpp | 2 +- isis/src/mro/apps/hideal2pds/hideal2pds.xml | 42 +- isis/src/mro/apps/hirdrgen/hirdrgen.xml | 46 +- isis/src/mro/apps/pds2hideal/pds2hideal.xml | 22 +- isis/src/mro/objs/HiLab/HiLab.h | 54 +-- isis/src/near/apps/msi2isis/main.cpp | 90 ++-- isis/src/near/apps/msi2isis/msi2isis.xml | 50 +-- .../NewHorizonsLeisaArchive_fit.trn | 2 +- .../NewHorizonsLeisaInstrument_fit.trn | 2 +- .../NewHorizonsLorriArchive_fit.trn | 2 +- .../NewHorizonsLorriInstrument_fit.trn | 2 +- .../mvic2isis/NewHorizonsMvicArchive_fit.trn | 2 +- .../NewHorizonsMvicInstrument_fit.trn | 2 +- .../odyssey/apps/thmbasemap1/thmbasemap1.xml | 54 +-- .../ocams2isis/OsirisRexOcamsBandBin_fit.trn | 2 +- .../OsirisRexOcamsInstrument_fit.trn | 4 +- .../ocams2isis/OsirisRexOcamsKernels_fit.trn | 4 +- isis/src/qisis/apps/ipce/ipce.xml | 28 +- .../objs/Directory/SensorGetInfoWorkOrder.h | 2 +- .../Directory/ViewControlNet3DWorkOrder.h | 2 +- .../TargetBodyDisplayProperties.h | 3 +- isis/src/rolo/apps/rolo2isis/rolo2isis.xml | 14 +- .../socetframesettings/socetframesettings.xml | 2 +- .../socetlinescankeywords.xml | 2 +- .../apps/prtloganalyzer/ProgramAnalyzer.cpp | 358 ++++++++------- .../apps/prtloganalyzer/ProgramAnalyzer.h | 22 +- .../apps/prtloganalyzer/prtloganalyzer.xml | 244 +++++----- isis/src/system/objs/Kernel/Kernel.h | 2 +- .../apps/tgocassis2isis/TgoCassisArchive.trn | 7 +- .../apps/tgocassis2isis/TgoCassisBandBin.trn | 2 +- .../TgoCassisExportedInstrument.trn | 2 +- .../tgocassis2isis/TgoCassisInstrument.trn | 2 +- .../apps/tgocassis2isis/TgoCassisMapping.trn | 14 +- .../apps/tgocassis2isis/TgoCassisMosaic.trn | 12 +- .../tgocassis2isis/TgoCassisMosaicBandBin.trn | 6 +- isis/src/tgo/apps/tgocassis2isis/main.cpp | 14 +- .../apps/tgocassisrdrgen/TgoCassisExport.trn | 8 +- isis/src/voyager/apps/voy2isis/voy2isis.xml | 40 +- .../apps/voy2isis/voyager_na_bandbin.trn | 5 +- .../apps/voy2isis/voyager_wa_bandbin.trn | 11 +- isis/tests/BundleMeasureTests.cpp | 4 +- 227 files changed, 3668 insertions(+), 3720 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/3_Support_question.md b/.github/ISSUE_TEMPLATE/3_Support_question.md index 75fba21942..18699939f1 100644 --- a/.github/ISSUE_TEMPLATE/3_Support_question.md +++ b/.github/ISSUE_TEMPLATE/3_Support_question.md @@ -1,13 +1,13 @@ --- name: ⛔ Support Question -about: See https://astrodiscuss.usgs.gov for questions about using ISIS3 and other Astrogeology Science Center software. +about: See https://astrodiscuss.usgs.gov for questions about using ISIS and other Astrogeology Science Center software. --- -We use Github issues solely for discussing bugs, documentation issues, and new features. +We use Github issues solely for discussing bugs, documentation issues, and new features. For -questions about using ISIS3 or other ASC software, please use +questions about using ISIS or other ASC software, please use any of the support alternatives: https://astrodiscuss.usgs.gov or https://gitter.im/USGS-Astrogeology/IAA A great resource about asking high quality questions that generate high quality answers is available from the StackOverflow community: [How do I ask a good question?](https://stackoverflow.com/help/how-to-ask) diff --git a/README.md b/README.md index 4abd4e1576..48124bface 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ This installation guide is for ISIS users interested in installing ISIS (3.6.0)+ To use the default values for: `$ISISROOT, $ISISDATA, $ISISTESTDATA`, run the ISIS variable initialization script with default arguments. - To do this, for versions of ISIS 4.2.0 and earlier, use: + To do this, for versions of ISIS 4.2.0 and earlier, use: python $CONDA_PREFIX/scripts/isis3VarInit.py @@ -101,11 +101,11 @@ This installation guide is for ISIS users interested in installing ISIS (3.6.0)+ Executing this script with no arguments will result in $ISISDATA=$CONDA\_PREFIX/data, and $ISISTESTDATA=$CONDA\_PREFIX/testdata. The user can specify different directories for both of these optional values: - For ISIS 4.2.0 and earlier, use: + For ISIS 4.2.0 and earlier, use: python $CONDA_PREFIX/scripts/isis3VarInit.py --data-dir=[path to data directory] --test-dir=[path to test data directory] - For versions of ISIS after 4.2.0, use: + For versions of ISIS after 4.2.0, use: python $CONDA_PREFIX/scripts/isisVarInit.py --data-dir=[path to data directory] --test-dir=[path to test data directory] @@ -285,12 +285,12 @@ Here are the minimum hardware requirements To build and compile ISIS requires following the instructions listed below, which are given on the GitHub wiki page for the ISIS project: - [Getting Started With GitHub](https://github.com/USGS-Astrogeology/ISIS3/wiki/Developing-ISIS3-with-cmake#getting-started-with-github) -- [Building ISIS3 With cmake](https://github.com/USGS-Astrogeology/ISIS3/wiki/Developing-ISIS3-with-cmake#building-isis3) -- [New ISIS3 environmental variables and their meanings](https://github.com/USGS-Astrogeology/ISIS3/wiki/Developing-ISIS3-with-cmake#new-environmental-variable-meanings) +- [Building ISIS With cmake](https://github.com/USGS-Astrogeology/ISIS3/wiki/Developing-ISIS3-with-cmake#building-isis3) +- [New ISIS environmental variables and their meanings](https://github.com/USGS-Astrogeology/ISIS3/wiki/Developing-ISIS3-with-cmake#new-environmental-variable-meanings) - [Custom data and test directories](https://github.com/USGS-Astrogeology/ISIS3/wiki/Developing-ISIS3-with-cmake#custom-data-and-test-data-directories) - [Cleaning builds](https://github.com/USGS-Astrogeology/ISIS3/wiki/Developing-ISIS3-with-cmake#cleaning-builds) - [Building individual applications/objects](https://github.com/USGS-Astrogeology/ISIS3/wiki/Developing-ISIS3-with-cmake#building-individual-isis3-applicationsobjects) -- [Building ISIS3 documentation](https://github.com/USGS-Astrogeology/ISIS3/wiki/Developing-ISIS3-with-cmake#building-isis3-documentation) +- [Building ISIS documentation](https://github.com/USGS-Astrogeology/ISIS3/wiki/Developing-ISIS3-with-cmake#building-isis3-documentation) - [What to do if you encounter any problems](https://github.com/USGS-Astrogeology/ISIS3/wiki/Developing-ISIS3-with-cmake#problems) ## Citing ISIS @@ -308,7 +308,7 @@ Under the root directory of the ISIS Data Area pointed to by the ISISDATA/ISIS3D ### Versions of the ISIS Data Area -In ISIS version 4.1.0, several files previously stored in the data area closely associated with ISIS applications were moved into version control with the ISIS source code. Additionally, the environment variables used for the ISIS Data Area and the rsync location for the ISIS Data Area were also updated. +In ISIS version 4.1.0, several files previously stored in the data area closely associated with ISIS applications were moved into version control with the ISIS source code. Additionally, the environment variables used for the ISIS Data Area and the rsync location for the ISIS Data Area were also updated. The correct environment variable names and rsync modules to use for the ISIS Data Area for each version of ISIS are summarized in the table below: @@ -326,7 +326,7 @@ The ISIS Data rsync module specifies where to rsync the data from and is the nam If you plan to work with data from all missions, then the download will require about 520 GB for all the ancillary data. However, most of this volume is taken up by SPICE files. We have a [Web service](#isis-spice-web-service) that can be used in lieu of downloading all of the SPICE files. This reduces the total download size to about 10 GB. -### Full ISIS3 Data Download +### Full ISIS Data Download The ISIS Data Area is hosted on rsync servers and not through conda channels like the ISIS binaries. This requires using the rsync command from within a terminal window within your Unix distribution, or from within WSL if running Windows 10. Downloading all mission data requires over 520 GB of disk space. If you want to acquire only certain mission data [click here](#Mission-Specific-Data-Downloads). To download all ISIS data files, continue reading. @@ -335,7 +335,7 @@ To download all ISIS data, enter the following commands in the location where yo cd $ISISDATA rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isisdata/data/ . -For earlier versions, use: +For earlier versions, use: cd $ISIS3DATA rsync -azv --delete --partial isisdist.astrogeology.usgs.gov::isis3data/data/ . diff --git a/isis/IsisPreferences b/isis/IsisPreferences index 76eeede208..f90e2d320a 100644 --- a/isis/IsisPreferences +++ b/isis/IsisPreferences @@ -10,7 +10,7 @@ # # ProgressBarPercent = 1 | 2 | 5 | 10 # ProgressBar = On | Off -# GuiStyle = windows | motif | cde | motifplus | +# GuiStyle = windows | motif | cde | motifplus | # platinum | sgi | kde | aqua # GuiHelpBrowser = { your preferred browser, may need path } # GuiFontName = helvetica | times | charter | any legal font @@ -52,16 +52,16 @@ EndGroup ######################################################## # Specify which ray-tracing engine to use for shape # models. -# +# # Leave the ShapeModel Group commented-out to continue -# using the ISIS3 default. +# using the ISIS default. # # RayTraceEngine = Bullet | Embree # OnError = Continue | Fail # Tolerance = { numerical value that will be set as the # tolerance for the Bullet or Embree shape -# model } -# +# model } +# ######################################################## #Group = ShapeModel @@ -88,7 +88,7 @@ EndGroup # window displaying the error. # Off - in command-line mode - only the results are # reported to the terminal, or -# in the case of an error, +# in the case of an error, # the error is reported in Pvl # to the terminal. # - in interactive mode - same as command-line mode, @@ -119,7 +119,7 @@ Group = CubeCustomization Overwrite = Allow Format = Attached History = On - MaximumSize = 12 + MaximumSize = 12 EndGroup ######################################################## diff --git a/isis/TestPreferences b/isis/TestPreferences index 788c8ec67e..047befd5c5 100644 --- a/isis/TestPreferences +++ b/isis/TestPreferences @@ -10,7 +10,7 @@ # # ProgressBarPercent = 1 | 2 | 5 | 10 # ProgressBar = On | Off -# GuiStyle = windows | motif | cde | motifplus | +# GuiStyle = windows | motif | cde | motifplus | # platinum | sgi | kde | aqua # GuiHelpBrowser = { your preferred browser, may need path } # GuiFontName = helvetica | times | charter | any legal font @@ -52,16 +52,16 @@ EndGroup ######################################################## # Specify which ray-tracing engine to use for shape # models. -# +# # Leave the ShapeModel Group commented-out to continue -# using the ISIS3 default. +# using the ISIS default. # # RayTraceEngine = Bullet | Embree # OnError = Continue | Fail # Tolerance = { numerical value that will be set as the # tolerance for the Bullet or Embree shape -# model } -# +# model } +# ######################################################## #Group = ShapeModel @@ -88,7 +88,7 @@ EndGroup # window displaying the error. # Off - in command-line mode - only the results are # reported to the terminal, or -# in the case of an error, +# in the case of an error, # the error is reported in Pvl # to the terminal. # - in interactive mode - same as command-line mode, @@ -119,7 +119,7 @@ Group = CubeCustomization Overwrite = Allow Format = Attached History = On - MaximumSize = 12 + MaximumSize = 12 EndGroup ######################################################## diff --git a/isis/appdata/translations/ClipperEisInstrument.trn b/isis/appdata/translations/ClipperEisInstrument.trn index 8a6e70e686..942f9da131 100644 --- a/isis/appdata/translations/ClipperEisInstrument.trn +++ b/isis/appdata/translations/ClipperEisInstrument.trn @@ -1,5 +1,5 @@ # Translates Europa Clipper EIS xml labels into the Instrument PvlGroup values -# for the ingested ISIS3 cube labels. +# for the ingested ISIS cube labels. # # The Dependencies keyword specifies a tag or attribute at the same level as # the InputKey that uniquely identifies the InputKey. diff --git a/isis/appdata/translations/README.TXT b/isis/appdata/translations/README.TXT index ddc7661824..728c19607b 100644 --- a/isis/appdata/translations/README.TXT +++ b/isis/appdata/translations/README.TXT @@ -1,4 +1,4 @@ -MissionName2DataDir.trn - Converts Mision names into the Isis3 preference name +MissionName2DataDir.trn - Converts Mision names into the ISIS preference name used to access mission specific data (e.g. space craft clock kernels). This file replaced Missions.trn as of Isis 3.1.12. diff --git a/isis/appdata/translations/pds4ExportArray2DImage.trn b/isis/appdata/translations/pds4ExportArray2DImage.trn index a544ae75f4..d459cb93d8 100644 --- a/isis/appdata/translations/pds4ExportArray2DImage.trn +++ b/isis/appdata/translations/pds4ExportArray2DImage.trn @@ -1,5 +1,5 @@ -# Translates ISIS3 cube information to Array_2D_Image section of PDS4 label -# +# Translates ISIS cube information to Array_2D_Image section of PDS4 label +# # history 2018-05-11 Jeannie Backer - Original version. Group = ImageLocalId @@ -54,4 +54,3 @@ Group = Lines OutputPosition = (Product_Observational, File_Area_Observational, Array_2D_Image, new@Axis_Array) Translation = (*, *) End_Group - diff --git a/isis/appdata/translations/pds4ExportArray3DImage.trn b/isis/appdata/translations/pds4ExportArray3DImage.trn index 208044861f..c775f9c26e 100644 --- a/isis/appdata/translations/pds4ExportArray3DImage.trn +++ b/isis/appdata/translations/pds4ExportArray3DImage.trn @@ -1,5 +1,5 @@ -# Translates ISIS3 cube information to Array_3D_Image section of PDS4 label -# +# Translates ISIS cube information to Array_3D_Image section of PDS4 label +# # history 2017-11-03 Jeannie Backer - Original version. # history 2017-11-22 Jeannie Backer - Added ImageLocalId. @@ -65,5 +65,3 @@ Group = Samples OutputPosition = (Product_Observational, File_Area_Observational, Array_3D_Image, new@Axis_Array) Translation = (*, *) End_Group - - diff --git a/isis/appdata/translations/pds4ExportArray3DSpectrum.trn b/isis/appdata/translations/pds4ExportArray3DSpectrum.trn index 987e79eb11..24d248ad05 100644 --- a/isis/appdata/translations/pds4ExportArray3DSpectrum.trn +++ b/isis/appdata/translations/pds4ExportArray3DSpectrum.trn @@ -1,5 +1,5 @@ -# Translates ISIS3 cube information to Array_3D_Spectrum section of PDS4 label -# +# Translates ISIS cube information to Array_3D_Spectrum section of PDS4 label +# # history 2018-05-09 Jeannie Backer - Original version. Group = ImageLocalId @@ -64,5 +64,3 @@ Group = Samples OutputPosition = (Product_Observational, File_Area_Observational, Array_3D_Spectrum, new@Axis_Array) Translation = (*, *) End_Group - - diff --git a/isis/appdata/translations/pds4ExportArray3DSpectrumBinSet.trn b/isis/appdata/translations/pds4ExportArray3DSpectrumBinSet.trn index 987e79eb11..24d248ad05 100644 --- a/isis/appdata/translations/pds4ExportArray3DSpectrumBinSet.trn +++ b/isis/appdata/translations/pds4ExportArray3DSpectrumBinSet.trn @@ -1,5 +1,5 @@ -# Translates ISIS3 cube information to Array_3D_Spectrum section of PDS4 label -# +# Translates ISIS cube information to Array_3D_Spectrum section of PDS4 label +# # history 2018-05-09 Jeannie Backer - Original version. Group = ImageLocalId @@ -64,5 +64,3 @@ Group = Samples OutputPosition = (Product_Observational, File_Area_Observational, Array_3D_Spectrum, new@Axis_Array) Translation = (*, *) End_Group - - diff --git a/isis/appdata/translations/pds4ExportArray3DSpectrumUniform.trn b/isis/appdata/translations/pds4ExportArray3DSpectrumUniform.trn index 6d5d0653e3..de76ba31f1 100644 --- a/isis/appdata/translations/pds4ExportArray3DSpectrumUniform.trn +++ b/isis/appdata/translations/pds4ExportArray3DSpectrumUniform.trn @@ -1,4 +1,4 @@ -# ISIS3 to PDS4 export of ISIS3 cube information to Array_3D_Spectrum +# ISIS to PDS4 export of ISIS cube information to Array_3D_Spectrum # for uniformly sampled spectral arrays. # # Based on requirements and options specified in @@ -73,5 +73,3 @@ Group = Samples OutputPosition = (Product_Observational, File_Area_Observational, Array_3D_Spectrum, new@Axis_Array) Translation = (*, *) End_Group - - diff --git a/isis/appdata/translations/pds4ExportBandBin.trn b/isis/appdata/translations/pds4ExportBandBin.trn index fc6bd006b4..64cb973807 100644 --- a/isis/appdata/translations/pds4ExportBandBin.trn +++ b/isis/appdata/translations/pds4ExportBandBin.trn @@ -1,22 +1,22 @@ -# Initial ISIS3 to PDS4 export of ISIS3 BandBin group to PDS4 sp +# Initial ISIS to PDS4 export of ISIS BandBin group to PDS4 sp # # Sections of an example PDS4 output label are included above the relevant translation groups # # history 2017-11-06 Kristin Berry - Original Version -# history 2017-11-14 Jeannie Backer - Changed width and center to optional and added other -# InputKeys to look for. -# history 2017-11-15 Kristin Berry - Updated after more research into requirements. +# history 2017-11-14 Jeannie Backer - Changed width and center to optional and added other +# InputKeys to look for. +# history 2017-11-15 Kristin Berry - Updated after more research into requirements. # The entire Spectral_Characteristics class is optional - + # # # Description -# +# Group = bin_width_desc Auto - InputDefault = UNK + InputDefault = UNK OutputName = sp:bin_width_desc OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, sp:Spectral_Characteristics) Translation = (*, *) @@ -68,7 +68,7 @@ End_Group # Needs val from enumeration Group = bin_set_local_reference_type Auto - InputDefault = TBD + InputDefault = TBD InputPosition = (IsisCube, BandBin) OutputName = sp:local_reference_type OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, sp:Spectral_Characteristics, sp:Axis_Bin_Set, sp:Local_Internal_Reference) @@ -171,7 +171,7 @@ Group = BinWidth2 End_Group -# Optional, see NH LEISA for example of ISIS3 input cube that has this. +# Optional, see NH LEISA for example of ISIS input cube that has this. Group = original_bin_number Auto Optional @@ -188,7 +188,7 @@ Group = FilterName1 Optional InputKey = FilterName InputPosition = (IsisCube, BandBin) - OutputName = sp:filter_name + OutputName = sp:filter_name OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, sp:Spectral_Characteristics, sp:Axis_Bin_Set, sp:Bin, sp:Filter) Translation = (*, *) End_Group @@ -199,7 +199,7 @@ Group = FilterName2 Optional InputKey = Name InputPosition = (IsisCube, BandBin) - OutputName = sp:filter_name + OutputName = sp:filter_name OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, sp:Spectral_Characteristics, sp:Axis_Bin_Set, sp:Bin, sp:Filter) Translation = (*, *) End_Group diff --git a/isis/appdata/translations/pds4ExportBandBinImage.trn b/isis/appdata/translations/pds4ExportBandBinImage.trn index e49f5472d2..d8e676d623 100644 --- a/isis/appdata/translations/pds4ExportBandBinImage.trn +++ b/isis/appdata/translations/pds4ExportBandBinImage.trn @@ -1,5 +1,5 @@ -# Initial ISIS3 to PDS4 export of ISIS3 BandBin group to PDS4 imaging discipline. -# This can be used for Array_3D_Image or Array_2D_Image objects. +# Initial ISIS to PDS4 export of ISIS BandBin group to PDS4 imaging discipline. +# This can be used for Array_3D_Image or Array_2D_Image objects. # Note that the LocalIdentifierReference value (written to img:local_identifier_reference) # is required to match the local_identifier value in the File_Area_Observational>File section. # @@ -50,7 +50,7 @@ Group = FilterName1 Optional InputKey = FilterName InputPosition = (IsisCube, BandBin) - OutputName = img:filter_name + OutputName = img:filter_name OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, img:Imaging, img:Image_Product_Information, img:Filter) Translation = (*, *) End_Group @@ -61,7 +61,7 @@ Group = FilterName2 Optional InputKey = Name InputPosition = (IsisCube, BandBin) - OutputName = img:filter_name + OutputName = img:filter_name OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, img:Imaging, img:Image_Product_Information, img:Filter) Translation = (*, *) End_Group @@ -72,7 +72,7 @@ Group = FilterName3 Optional InputKey = FilterId InputPosition = (IsisCube, BandBin) - OutputName = img:filter_name + OutputName = img:filter_name OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, img:Imaging, img:Image_Product_Information, img:Filter) Translation = (*, *) End_Group @@ -83,7 +83,7 @@ Group = FilterId1 Optional InputKey = FilterId InputPosition = (IsisCube, BandBin) - OutputName = img:filter_id + OutputName = img:filter_id OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, img:Imaging, img:Image_Product_Information, img:Filter) Translation = (*, *) End_Group @@ -94,7 +94,7 @@ Group = FilterId2 Optional InputKey = FilterName InputPosition = (IsisCube, BandBin) - OutputName = img:filter_id + OutputName = img:filter_id OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, img:Imaging, img:Image_Product_Information, img:Filter) Translation = (*, *) End_Group @@ -105,7 +105,7 @@ Group = FilterId3 Optional InputKey = Name InputPosition = (IsisCube, BandBin) - OutputName = img:filter_id + OutputName = img:filter_id OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, img:Imaging, img:Image_Product_Information, img:Filter) Translation = (*, *) End_Group diff --git a/isis/appdata/translations/pds4ExportBandBinSpectrum.trn b/isis/appdata/translations/pds4ExportBandBinSpectrum.trn index 3b016a1063..546d5648fa 100644 --- a/isis/appdata/translations/pds4ExportBandBinSpectrum.trn +++ b/isis/appdata/translations/pds4ExportBandBinSpectrum.trn @@ -1,24 +1,24 @@ -# Initial ISIS3 to PDS4 export of ISIS3 BandBin group for PDS4 spectral arrays. +# Initial ISIS to PDS4 export of ISIS BandBin group for PDS4 spectral arrays. # # Sections of an example PDS4 output label are included above the relevant translation groups. # # history 2017-11-06 Kristin Berry - Original Version. -# history 2017-11-14 Jeannie Backer - Changed width and center to optional and added other -# InputKeys to look for. -# history 2017-11-15 Kristin Berry - Updated after more research into requirements. -# history 2018-05-11 Jeannie Backer - Added default values for references. +# history 2017-11-14 Jeannie Backer - Changed width and center to optional and added other +# InputKeys to look for. +# history 2017-11-15 Kristin Berry - Updated after more research into requirements. +# history 2018-05-11 Jeannie Backer - Added default values for references. # Combined redundant translations. # The entire Spectral_Characteristics class is optional - + # # # Description -# +# Group = BinWidthDescription Auto - InputDefault = UNK + InputDefault = UNK OutputName = sp:bin_width_desc OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, sp:Spectral_Characteristics) Translation = (*, *) @@ -60,7 +60,7 @@ End_Group # Needs val from enumeration Group = BinSetLocalReferenceType Auto - InputDefault = spectral_characteristics_to_array_axis + InputDefault = spectral_characteristics_to_array_axis InputPosition = (IsisCube, BandBin) OutputName = sp:local_reference_type OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, sp:Spectral_Characteristics, sp:Axis_Bin_Set, sp:Local_Internal_Reference) @@ -147,7 +147,7 @@ Group = BinWidth End_Group #??? check units -# Optional, see NH LEISA for example of ISIS3 input cube that has this. +# Optional, see NH LEISA for example of ISIS input cube that has this. #Group = OriginalBinNumber # Auto # Optional @@ -166,7 +166,7 @@ Group = FilterName InputKey = FilterName InputKey = Name InputPosition = (IsisCube, BandBin) - OutputName = sp:filter_name + OutputName = sp:filter_name OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, sp:Spectral_Characteristics, sp:Axis_Bin_Set, sp:Bin, sp:Filter) Translation = (*, *) End_Group diff --git a/isis/appdata/translations/pds4ExportBandBinSpectrumBinSet.trn b/isis/appdata/translations/pds4ExportBandBinSpectrumBinSet.trn index e13259d78b..f0d37504db 100644 --- a/isis/appdata/translations/pds4ExportBandBinSpectrumBinSet.trn +++ b/isis/appdata/translations/pds4ExportBandBinSpectrumBinSet.trn @@ -1,7 +1,7 @@ -# Initial ISIS3 to PDS4 export of ISIS3 BandBin group for PDS4 spectral arrays. -# -# See https://pds.nasa.gov/pds4/sp/v1/PDS4_SP_1100.xsd -# and https://pds.nasa.gov/pds4/sp/v1/PDS4_SP_1100.sch +# Initial ISIS to PDS4 export of ISIS BandBin group for PDS4 spectral arrays. +# +# See https://pds.nasa.gov/pds4/sp/v1/PDS4_SP_1100.xsd +# and https://pds.nasa.gov/pds4/sp/v1/PDS4_SP_1100.sch # for requirements. # # Sections of an example PDS4 output label are included above the relevant translation groups. @@ -10,14 +10,14 @@ # The entire Spectral_Characteristics class is optional - + # # # Description -# +# Group = BinWidthDescription Auto - InputDefault = UNK + InputDefault = UNK OutputName = sp:bin_width_desc OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, sp:Spectral_Characteristics) Translation = (*, *) @@ -57,7 +57,7 @@ End_Group # enumerated value Group = BinSetLocalReferenceType Auto - InputDefault = spectral_characteristics_to_array_axis + InputDefault = spectral_characteristics_to_array_axis OutputName = sp:local_reference_type OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, sp:Spectral_Characteristics, sp:Axis_Bin_Set, sp:Local_Internal_Reference) Translation = (*, *) diff --git a/isis/appdata/translations/pds4ExportBandBinSpectrumUniform.trn b/isis/appdata/translations/pds4ExportBandBinSpectrumUniform.trn index 0ddbff0c2c..6a631f53ba 100644 --- a/isis/appdata/translations/pds4ExportBandBinSpectrumUniform.trn +++ b/isis/appdata/translations/pds4ExportBandBinSpectrumUniform.trn @@ -1,35 +1,35 @@ -# Initial ISIS3 to PDS4 export of ISIS3 BandBin group for PDS4 uniformly sampled spectral arrays. +# Initial ISIS to PDS4 export of ISIS BandBin group for PDS4 uniformly sampled spectral arrays. # # Sections of an example PDS4 output label are included above the relevant translation groups. -# Based on requirements and options specified in +# Based on requirements and options specified in # https://pds.nasa.gov/datastandards/schema/released/sp/v1/PDS4_SP_1100.xsd # and https://pds.nasa.gov/datastandards/schema/released/sp/v1/PDS4_SP_1100.sch -# -# Spectral_Characteristics:Local_Internal_Reference:local_identifier_reference -# = Array_3D_Spectrum:local_identifier +# +# Spectral_Characteristics:Local_Internal_Reference:local_identifier_reference +# = Array_3D_Spectrum:local_identifier # = Spectral_Array_Object -# Spectral_Characteristics:Local_Internal_Reference:local_reference_type -# = Axis_Uniformly_Sampled:Local_Internal_Reference:local_reference_type +# Spectral_Characteristics:Local_Internal_Reference:local_reference_type +# = Axis_Uniformly_Sampled:Local_Internal_Reference:local_reference_type # = spectral_characteristics_to_array_axis -# Axis_Uniformly_Sampled:local_identifier_reference -# = Axis_Array:axis_name +# Axis_Uniformly_Sampled:local_identifier_reference +# = Axis_Array:axis_name # = Band # # history 2017-11-06 Kristin Berry - Original Version. -# history 2017-11-14 Jeannie Backer - Changed width and center to optional and added other -# InputKeys to look for. -# history 2017-11-15 Kristin Berry - Updated after more research into requirements. -# history 2018-05-11 Jeannie Backer - Added default values for references. +# history 2017-11-14 Jeannie Backer - Changed width and center to optional and added other +# InputKeys to look for. +# history 2017-11-15 Kristin Berry - Updated after more research into requirements. +# history 2018-05-11 Jeannie Backer - Added default values for references. # Combined redundant translations. # # # Description -# +# # Move this to mission translation file? Group = BinWidthDescription Auto - InputDefault = UNK + InputDefault = UNK OutputName = sp:bin_width_desc OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, sp:Spectral_Characteristics) Translation = (*, *) @@ -71,7 +71,7 @@ End_Group # Needs val from enumeration Group = AxisLocalReferenceType Auto - InputDefault = spectral_characteristics_to_array_axis + InputDefault = spectral_characteristics_to_array_axis InputPosition = (IsisCube, BandBin) OutputName = sp:local_reference_type OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, sp:Spectral_Characteristics, sp:Axis_Uniformly_Sampled, sp:Local_Internal_Reference) @@ -90,16 +90,16 @@ End_Group Group = SamplingParameterType Auto - InputDefault = wavelength + InputDefault = wavelength OutputName = sp:sampling_parameter_type OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, sp:Spectral_Characteristics, sp:Axis_Uniformly_Sampled) Translation = (*, *) End_Group -# +# #Group = SamplingInterval # Auto -# InputDefault = 0.0 +# InputDefault = 0.0 # OutputName = sp:sampling_interval # OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, sp:Spectral_Characteristics, sp:Axis_Uniformly_Sampled) # Translation = (*, *) diff --git a/isis/appdata/translations/pds4ExportDisplaySettings.trn b/isis/appdata/translations/pds4ExportDisplaySettings.trn index c167e232fa..2a194de035 100644 --- a/isis/appdata/translations/pds4ExportDisplaySettings.trn +++ b/isis/appdata/translations/pds4ExportDisplaySettings.trn @@ -1,5 +1,5 @@ -# Exports the display settings from ISIS3 to PDS4. -# +# Exports the display settings from ISIS to PDS4. +# # history 2017-10-26 Jeannie Backer - Original version. # history 2017-11-15 Kristin Berry - Moved HorizontalDisplayAxis into this file from pds4Export.trn # added LocalIdentifierReference and DisplaySettingsToArray @@ -34,7 +34,7 @@ End_Group Group = HorizontalDisplayAxis Auto - InputDefault = Sample + InputDefault = Sample OutputName = disp:horizontal_display_axis # OutputSiblings = ("disp:horizontal_display_direction|Left To Right", # "disp:vertical_display_axis|Line", @@ -48,16 +48,16 @@ Group = HorizontalDisplayDirection Auto InputDefault = "Left to Right" OutputName = disp:horizontal_display_direction - OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, disp:Display_Settings, + OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, disp:Display_Settings, disp:Display_Direction) Translation = (*, *) End_Group Group = VerticalDisplayAxis Auto - InputDefault = Line + InputDefault = Line OutputName = disp:vertical_display_axis - OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, disp:Display_Settings, + OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, disp:Display_Settings, disp:Display_Direction) Translation = (*, *) End_Group @@ -66,7 +66,7 @@ Group = VerticalDisplayDirection Auto InputDefault = "Top to Bottom" OutputName = disp:vertical_display_direction - OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, disp:Display_Settings, + OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, disp:Display_Settings, disp:Display_Direction) Translation = (*, *) End_Group diff --git a/isis/appdata/translations/pds4ExportIdentificationArea.trn b/isis/appdata/translations/pds4ExportIdentificationArea.trn index 2813e2a5c6..9e90d15a45 100644 --- a/isis/appdata/translations/pds4ExportIdentificationArea.trn +++ b/isis/appdata/translations/pds4ExportIdentificationArea.trn @@ -1,10 +1,10 @@ -# Translation for Identification Area section of export from ISIS3 cube to PDS4 product. +# Translation for Identification Area section of export from ISIS cube to PDS4 product. # For now, these are hardcoded values. # # Note these translations must be are ordered based on the required PDS4 order. # -# history 2017-11-07 Jeannie Backer - Original version. -# history 2017-11-15 Kristin Berry - Updated order groups are output in for PDS4 compliancy. +# history 2017-11-07 Jeannie Backer - Original version. +# history 2017-11-15 Kristin Berry - Updated order groups are output in for PDS4 compliancy. # Could be DataSetId for some missions Group = LogicalId @@ -29,7 +29,7 @@ Group = ProductTitle Auto InputKey = ProductDescription InputPosition = (IsisCube, Archive) - InputDefault = "PDS4 product exported from ISIS3 cube." + InputDefault = "PDS4 product exported from ISIS cube." OutputName = title OutputPosition = (Product_Observational, Identification_Area) Translation = (*, *) @@ -50,6 +50,3 @@ Group = ProductClass OutputPosition = (Product_Observational, Identification_Area) Translation = (*, *) End_Group - - - diff --git a/isis/appdata/translations/pds4ExportInstrument.trn b/isis/appdata/translations/pds4ExportInstrument.trn index d3a9f756b1..54d88df908 100644 --- a/isis/appdata/translations/pds4ExportInstrument.trn +++ b/isis/appdata/translations/pds4ExportInstrument.trn @@ -1,4 +1,4 @@ -# Translate ISIS3 Instrument group values to PDS4. +# Translate ISIS Instrument group values to PDS4. # # history 2017-10-31 Jeannie Backer - Original version # history 2017-11-17 Kristin Berry - Added reference_type @@ -8,7 +8,7 @@ # Time Coordinate Group = StartDateTime Auto - InputKey = StartTime + InputKey = StartTime InputPosition = (IsisCube, Instrument) InputDefault = "" OutputName = start_date_time @@ -30,7 +30,7 @@ End_Group # Investigation Area Group = MissionName Auto - InputKey = SpacecraftName + InputKey = SpacecraftName InputPosition = (IsisCube, Instrument) InputDefault = TBD OutputName = name @@ -50,7 +50,7 @@ End_Group Group = MissionInternalReference Auto InputDefault = data_to_investigation - OutputName = reference_type + OutputName = reference_type OutputPosition = (Product_Observational, Observation_Area, Investigation_Area, Internal_Reference) Translation = (*, *) End_Group @@ -58,10 +58,10 @@ End_Group # Observing System Group = SpacecraftName Auto - InputKey = SpacecraftName + InputKey = SpacecraftName InputPosition = (IsisCube, Instrument) InputDefault = TBD - OutputName = name + OutputName = name OutputSiblings = (type|Spacecraft) OutputPosition = (Product_Observational, Observation_Area, Observing_System, new@Observing_System_Component) Translation = (*, *) @@ -69,10 +69,10 @@ End_Group Group = InstrumentName Auto - InputKey = InstrumentId + InputKey = InstrumentId InputPosition = (IsisCube, Instrument) InputDefault = TBD - OutputName = name + OutputName = name OutputSiblings = (type|Instrument) OutputPosition = (Product_Observational, Observation_Area, Observing_System, new@Observing_System_Component) Translation = (*, *) @@ -81,7 +81,7 @@ End_Group Group = ExposureDuration Auto Optional - InputKey = ExposureDuration + InputKey = ExposureDuration InputPosition = (IsisCube, Instrument) OutputName = img:exposure_duration OutputAttributes = unit|s diff --git a/isis/appdata/translations/pds4ExportTargetFromInstrument.trn b/isis/appdata/translations/pds4ExportTargetFromInstrument.trn index df9e95bb49..539552e5ab 100644 --- a/isis/appdata/translations/pds4ExportTargetFromInstrument.trn +++ b/isis/appdata/translations/pds4ExportTargetFromInstrument.trn @@ -1,10 +1,10 @@ -# Translate ISIS3 TargetName to PDS4 Target name and type. +# Translate ISIS TargetName to PDS4 Target name and type. # Translations are alphabetically sorted by output value, then by input value. # # history 2017-11-03 Jeannie Backer - Original version # history 2017-11-08 Jeannie Backer - Removed redundant translations after input to translation # was made case insensitive. - + Group = TargetName Auto InputKey = TargetName diff --git a/isis/appdata/translations/pds4ExportTargetFromMapping.trn b/isis/appdata/translations/pds4ExportTargetFromMapping.trn index 8824b3fad8..692db73ef0 100644 --- a/isis/appdata/translations/pds4ExportTargetFromMapping.trn +++ b/isis/appdata/translations/pds4ExportTargetFromMapping.trn @@ -1,8 +1,8 @@ -# Translate ISIS3 TargetName to PDS4 Target name and type. +# Translate ISIS TargetName to PDS4 Target name and type. # Translations are alphabetically sorted by output value, then by input value. # # history 2017-11-03 Jeannie Backer - Original version - + Group = TargetName Auto InputKey = TargetName diff --git a/isis/appdata/translations/pdsImportLambertAzimuthalEqualArea.trn b/isis/appdata/translations/pdsImportLambertAzimuthalEqualArea.trn index c2536f1325..2a31a86682 100644 --- a/isis/appdata/translations/pdsImportLambertAzimuthalEqualArea.trn +++ b/isis/appdata/translations/pdsImportLambertAzimuthalEqualArea.trn @@ -1,5 +1,5 @@ -# Translation file for importing PDS IMAGE_MAP_PROJECTION labels for -# Lambert Azimuthal Equal-Area projection in ISIS3. +# Translation file for importing PDS IMAGE_MAP_PROJECTION labels for +# Lambert Azimuthal Equal-Area projection in ISIS. # 2011-06-30 Jeannie Backer - Original Version Group = CenterLatitude Auto diff --git a/isis/appdata/translations/pdsProjectionLineSampToXY.def b/isis/appdata/translations/pdsProjectionLineSampToXY.def index 01a091a8a9..9c04186c8d 100644 --- a/isis/appdata/translations/pdsProjectionLineSampToXY.def +++ b/isis/appdata/translations/pdsProjectionLineSampToXY.def @@ -1,6 +1,6 @@ -# This file is used by the ProcessImportPds class to define the offset and +# This file is used by the ProcessImportPds class to define the offset and # multiplication factors used to convert PDS 3 SampleProjectionOffset -# and LineProjectionOffset to ISIS3 UpperLeftX and UpperLeftY. +# and LineProjectionOffset to ISIS UpperLeftX and UpperLeftY. # # The Keyword defines which keyword is searched for in the pds file. The # Pattern is then used to match the value in the defined keyword. If there @@ -19,20 +19,20 @@ # Anytime a new group is added to this file, all 6 keywords must to be # defined (Keyword, Pattern, xMult, yMult, xOff, yOff). # -# @history 2007-04-10 Tracie Sucharski, Original version with +# @history 2007-04-10 Tracie Sucharski, Original version with # Isis2 definitions. -# @history 2008-06-10 Jeff Anderson, Fixed Magellan to be more specific to +# @history 2008-06-10 Jeff Anderson, Fixed Magellan to be more specific to # FMAPS and MIDRS # @history 2008-10-01 Steven Lambright, Fixed Isis 2 offsets, fixed cassini radars # Keyword/Pattern values. Commented and fixed MIDR offsets. -# @history 2011-01-26 Janet Barrett, Added support for Kaguya Terrain Camera +# @history 2011-01-26 Janet Barrett, Added support for Kaguya Terrain Camera # (TC_MAP) # @history 2011-11-16 Jeff Anderson, Added support for LROC data # @history 2012-03-04 Janet Barrett, Added support for Kaguya Terrain Camera # Ortho data (TCO_MAP) # @history 2017-05-25 J Bonn KAGUYA TERRAIN CAMERA and KAGUYA TERRAIN CAMERA -# ORTHO entires to +0.5 yoff,yoff per ticket m04506 -# @history 2017-05-26 T Hare With ticket m02244 fix, Removed entires that no +# ORTHO entires to +0.5 yoff,yoff per ticket m04506 +# @history 2017-05-26 T Hare With ticket m02244 fix, Removed entires that no # longer need an override including: CHANDRAYAAN and LRO # MINIRF, CASSINI RADAR, LROC PDS RDR, MESSENGER DEM, and # HRSC PDS products. Added new entry for MGS MOLA @@ -50,7 +50,7 @@ Object = ProjectionOffsetMults xMult = -1.0 yMult = 1.0 xOff = -0.5 - yOff = 1.0 + yOff = 1.0 End_Group # VIKING ORBITER @@ -114,5 +114,3 @@ Object = ProjectionOffsetMults End_Group End_Object - - diff --git a/isis/appdata/translations/voyager_na_bandbin.trn b/isis/appdata/translations/voyager_na_bandbin.trn index 2604aa33a2..3c78349ae4 100644 --- a/isis/appdata/translations/voyager_na_bandbin.trn +++ b/isis/appdata/translations/voyager_na_bandbin.trn @@ -1,6 +1,6 @@ # -# This ISIS 3 translation file is used to create ISIS 3 band bin cube labels -# from Voyager ".IMG" labels. Other sections of the ISIS 3 labels are +# This ISIS translation file is used to create ISIS band bin cube labels +# from Voyager ".IMG" labels. Other sections of the ISIS labels are # handled by other translation files. # @@ -72,4 +72,3 @@ Group = BandWidth Translation = (0.090000, 7) Translation = (0.0, *) End_Group - diff --git a/isis/appdata/translations/voyager_wa_bandbin.trn b/isis/appdata/translations/voyager_wa_bandbin.trn index 9cd291a2ff..293fd22e7d 100644 --- a/isis/appdata/translations/voyager_wa_bandbin.trn +++ b/isis/appdata/translations/voyager_wa_bandbin.trn @@ -1,15 +1,15 @@ # -# This ISIS 3 translation file is used to create ISIS 3 band bin cube labels -# from Voyager ".IMG" labels for the WA camera. Other sections of the ISIS 3 +# This ISIS translation file is used to create ISIS band bin cube labels +# from Voyager ".IMG" labels for the WA camera. Other sections of the ISIS # labels are handled by other translation files. # -# This translation contains the known filter names for the WA +# This translation contains the known filter names for the WA # camera. It translates them one for one. The (*,*) would have worked, but # they are listed for documentation purposes. Note the filter name does not # correspond directly to the filter number unless the camera is known (NA, WA). -# Note: NAD is not listed in some references instead SODIUM is listed. +# Note: NAD is not listed in some references instead SODIUM is listed. Group = FilterName Auto InputKey = FILTER_NAME @@ -99,11 +99,10 @@ Group = BandWidth Translation = (0.110000, 6) Translation = (0.090000, 7) Translation = (0.0, *) - + Translation = (0.010000, CH4_JS) Translation = (0.010000, CH4_U) Translation = (0.110000, GREEN) Translation = ( ,NAD) Translation = (0.002000, SODIUM) End_Group - diff --git a/isis/make/config.darwin-10.5 b/isis/make/config.darwin-10.5 index f4fc96c455..2d12917f94 100644 --- a/isis/make/config.darwin-10.5 +++ b/isis/make/config.darwin-10.5 @@ -206,11 +206,11 @@ PROTOC = $(ISIS3OPT)/bin/protoc #--------------------------------------------------------------------------- # Set up for kakadu # The Kakadu library is proprietary. The source files cannot be distributed -# with ISIS3. If you need to rebuild ISIS3 on your system, then you will +# with ISIS. If you need to rebuild ISIS on your system, then you will # need to modify the lines below that pertain to the location of the # header files and library on your system. The compilation flag, ENABLEJP2K, # should be set to true if you are building with the Kakadu library and -# you want to use the JPEG2000 specific code in the ISIS3 system. Otherwise, +# you want to use the JPEG2000 specific code in the ISIS system. Otherwise, # set the ENABLEJP2K flag to false. #--------------------------------------------------------------------------- KAKADUINCDIR = -I$(ISIS3LOCAL)/include/kakadu/v6_3-00967N diff --git a/isis/make/config.darwin-MacOSX10_10 b/isis/make/config.darwin-MacOSX10_10 index dc757df2e1..0ffe304ca3 100644 --- a/isis/make/config.darwin-MacOSX10_10 +++ b/isis/make/config.darwin-MacOSX10_10 @@ -250,7 +250,7 @@ PROTOC = $(ISIS3OPT)/bin/protoc #--------------------------------------------------------------------------- # Set up for kakadu # The Kakadu library is proprietary. The source files cannot be distributed -# with ISIS3. If you need to rebuild ISIS3 on your system, then you will +# with ISIS. If you need to rebuild ISIS3 on your system, then you will # need to modify the lines below that pertain to the location of the # header files and library on your system. The compilation flag, ENABLEJP2K, # should be set to true if you are building with the Kakadu library and diff --git a/isis/make/config.darwin-MacOSX10_11 b/isis/make/config.darwin-MacOSX10_11 index ecd72e9532..59b7d41488 100644 --- a/isis/make/config.darwin-MacOSX10_11 +++ b/isis/make/config.darwin-MacOSX10_11 @@ -291,7 +291,7 @@ PROTOC = $(ISIS3OPT)/bin/protoc #--------------------------------------------------------------------------- # Set up for kakadu # The Kakadu library is proprietary. The source files cannot be distributed -# with ISIS3. If you need to rebuild ISIS3 on your system, then you will +# with ISIS. If you need to rebuild ISIS3 on your system, then you will # need to modify the lines below that pertain to the location of the # header files and library on your system. The compilation flag, ENABLEJP2K, # should be set to true if you are building with the Kakadu library and diff --git a/isis/make/config.darwin-MacOSX10_13 b/isis/make/config.darwin-MacOSX10_13 index a2134dfcd3..ebc9d41a6d 100644 --- a/isis/make/config.darwin-MacOSX10_13 +++ b/isis/make/config.darwin-MacOSX10_13 @@ -291,7 +291,7 @@ PROTOC = $(ISIS3OPT)/bin/protoc #--------------------------------------------------------------------------- # Set up for kakadu # The Kakadu library is proprietary. The source files cannot be distributed -# with ISIS3. If you need to rebuild ISIS3 on your system, then you will +# with ISIS. If you need to rebuild ISIS3 on your system, then you will # need to modify the lines below that pertain to the location of the # header files and library on your system. The compilation flag, ENABLEJP2K, # should be set to true if you are building with the Kakadu library and diff --git a/isis/make/config.darwin-MacOSX10_14 b/isis/make/config.darwin-MacOSX10_14 index a2134dfcd3..9a24dd1686 100644 --- a/isis/make/config.darwin-MacOSX10_14 +++ b/isis/make/config.darwin-MacOSX10_14 @@ -291,11 +291,11 @@ PROTOC = $(ISIS3OPT)/bin/protoc #--------------------------------------------------------------------------- # Set up for kakadu # The Kakadu library is proprietary. The source files cannot be distributed -# with ISIS3. If you need to rebuild ISIS3 on your system, then you will +# with ISIS. If you need to rebuild ISIS on your system, then you will # need to modify the lines below that pertain to the location of the # header files and library on your system. The compilation flag, ENABLEJP2K, # should be set to true if you are building with the Kakadu library and -# you want to use the JPEG2000 specific code in the ISIS3 system. Otherwise, +# you want to use the JPEG2000 specific code in the ISIS system. Otherwise, # set the ENABLEJP2K flag to false. # # Added abililty to automatically detect the existance of the Kakadu include diff --git a/isis/make/config.darwin-MacOSX10_15 b/isis/make/config.darwin-MacOSX10_15 index f658bb33bd..0ca9be8600 100644 --- a/isis/make/config.darwin-MacOSX10_15 +++ b/isis/make/config.darwin-MacOSX10_15 @@ -291,11 +291,11 @@ PROTOC = $(ISIS3OPT)/bin/protoc #--------------------------------------------------------------------------- # Set up for kakadu # The Kakadu library is proprietary. The source files cannot be distributed -# with ISIS3. If you need to rebuild ISIS3 on your system, then you will +# with ISIS. If you need to rebuild ISIS on your system, then you will # need to modify the lines below that pertain to the location of the # header files and library on your system. The compilation flag, ENABLEJP2K, # should be set to true if you are building with the Kakadu library and -# you want to use the JPEG2000 specific code in the ISIS3 system. Otherwise, +# you want to use the JPEG2000 specific code in the ISIS system. Otherwise, # set the ENABLEJP2K flag to false. # # Added abililty to automatically detect the existance of the Kakadu include diff --git a/isis/make/config.darwin-MacOSX10_6 b/isis/make/config.darwin-MacOSX10_6 index 68246b397f..96f610b568 100644 --- a/isis/make/config.darwin-MacOSX10_6 +++ b/isis/make/config.darwin-MacOSX10_6 @@ -247,11 +247,11 @@ PROTOC = $(ISIS3OPT)/bin/protoc #--------------------------------------------------------------------------- # Set up for kakadu # The Kakadu library is proprietary. The source files cannot be distributed -# with ISIS3. If you need to rebuild ISIS3 on your system, then you will +# with ISIS. If you need to rebuild ISIS on your system, then you will # need to modify the lines below that pertain to the location of the # header files and library on your system. The compilation flag, ENABLEJP2K, # should be set to true if you are building with the Kakadu library and -# you want to use the JPEG2000 specific code in the ISIS3 system. Otherwise, +# you want to use the JPEG2000 specific code in the ISIS system. Otherwise, # set the ENABLEJP2K flag to false. # # Added abililty to automatically detect the existance of the Kakadu include diff --git a/isis/make/config.darwin-MacOSX10_8 b/isis/make/config.darwin-MacOSX10_8 index 366f156856..b544d7accb 100644 --- a/isis/make/config.darwin-MacOSX10_8 +++ b/isis/make/config.darwin-MacOSX10_8 @@ -250,11 +250,11 @@ PROTOC = $(ISIS3OPT)/bin/protoc #--------------------------------------------------------------------------- # Set up for kakadu # The Kakadu library is proprietary. The source files cannot be distributed -# with ISIS3. If you need to rebuild ISIS3 on your system, then you will +# with ISIS. If you need to rebuild ISIS on your system, then you will # need to modify the lines below that pertain to the location of the # header files and library on your system. The compilation flag, ENABLEJP2K, # should be set to true if you are building with the Kakadu library and -# you want to use the JPEG2000 specific code in the ISIS3 system. Otherwise, +# you want to use the JPEG2000 specific code in the ISIS system. Otherwise, # set the ENABLEJP2K flag to false. # # Added abililty to automatically detect the existance of the Kakadu include diff --git a/isis/make/config.linux-x86_32 b/isis/make/config.linux-x86_32 index 9f6edeb255..79babaf640 100644 --- a/isis/make/config.linux-x86_32 +++ b/isis/make/config.linux-x86_32 @@ -186,11 +186,11 @@ PROTOC = $(ISIS3LOCAL)/bin/protoc #--------------------------------------------------------------------------- # Set up for kakadu # The Kakadu library is proprietary. The source files cannot be distributed -# with ISIS3. If you need to rebuild ISIS3 on your system, then you will +# with ISIS. If you need to rebuild ISIS on your system, then you will # need to modify the lines below that pertain to the location of the # header files and library on your system. The compilation flag, ENABLEJP2K, # should be set to true if you are building with the Kakadu library and -# you want to use the JPEG2000 specific code in the ISIS3 system. Otherwise, +# you want to use the JPEG2000 specific code in the ISIS system. Otherwise, # set the ENABLEJP2K flag to false. #--------------------------------------------------------------------------- KAKADUINCDIR = -I$(ISIS3LOCAL)/include/kakadu/v6_3-00967N diff --git a/isis/make/config.linux-x86_64 b/isis/make/config.linux-x86_64 index f9d039a523..761505632b 100644 --- a/isis/make/config.linux-x86_64 +++ b/isis/make/config.linux-x86_64 @@ -222,11 +222,11 @@ PROTOC = $(ISIS3LOCAL)/bin/protoc #--------------------------------------------------------------------------- # Set up for kakadu # The Kakadu library is proprietary. The source files cannot be distributed -# with ISIS3. If you need to rebuild ISIS3 on your system, then you will +# with ISIS. If you need to rebuild ISIS on your system, then you will # need to modify the lines below that pertain to the location of the # header files and library on your system. The compilation flag, ENABLEJP2K, # should be set to true if you are building with the Kakadu library and -# you want to use the JPEG2000 specific code in the ISIS3 system. Otherwise, +# you want to use the JPEG2000 specific code in the ISIS system. Otherwise, # set the ENABLEJP2K flag to false. # # Added abililty to automatically detect the existance of the Kakadu include diff --git a/isis/make/config.linux-x86_64_Debian8 b/isis/make/config.linux-x86_64_Debian8 index 376ef9c0cd..ac7cd2be07 100644 --- a/isis/make/config.linux-x86_64_Debian8 +++ b/isis/make/config.linux-x86_64_Debian8 @@ -220,11 +220,11 @@ PROTOC = $(ISIS3LOCAL)/bin/protoc #--------------------------------------------------------------------------- # Set up for kakadu # The Kakadu library is proprietary. The source files cannot be distributed -# with ISIS3. If you need to rebuild ISIS3 on your system, then you will +# with ISIS. If you need to rebuild ISIS on your system, then you will # need to modify the lines below that pertain to the location of the # header files and library on your system. The compilation flag, ENABLEJP2K, # should be set to true if you are building with the Kakadu library and -# you want to use the JPEG2000 specific code in the ISIS3 system. Otherwise, +# you want to use the JPEG2000 specific code in the ISIS system. Otherwise, # set the ENABLEJP2K flag to false. # # Added abililty to automatically detect the existance of the Kakadu include diff --git a/isis/make/config.linux-x86_64_Fedora21 b/isis/make/config.linux-x86_64_Fedora21 index b2bbbcf509..853ca7613d 100644 --- a/isis/make/config.linux-x86_64_Fedora21 +++ b/isis/make/config.linux-x86_64_Fedora21 @@ -224,11 +224,11 @@ PROTOC = $(ISIS3LOCAL)/bin/protoc #--------------------------------------------------------------------------- # Set up for kakadu # The Kakadu library is proprietary. The source files cannot be distributed -# with ISIS3. If you need to rebuild ISIS3 on your system, then you will +# with ISIS. If you need to rebuild ISIS on your system, then you will # need to modify the lines below that pertain to the location of the # header files and library on your system. The compilation flag, ENABLEJP2K, # should be set to true if you are building with the Kakadu library and -# you want to use the JPEG2000 specific code in the ISIS3 system. Otherwise, +# you want to use the JPEG2000 specific code in the ISIS system. Otherwise, # set the ENABLEJP2K flag to false. # # Added abililty to automatically detect the existance of the Kakadu include diff --git a/isis/make/config.linux-x86_64_Fedora25 b/isis/make/config.linux-x86_64_Fedora25 index 54e80fe6c0..ef8823c86f 100644 --- a/isis/make/config.linux-x86_64_Fedora25 +++ b/isis/make/config.linux-x86_64_Fedora25 @@ -224,11 +224,11 @@ PROTOC = $(ISIS3LOCAL)/bin/protoc #--------------------------------------------------------------------------- # Set up for kakadu # The Kakadu library is proprietary. The source files cannot be distributed -# with ISIS3. If you need to rebuild ISIS3 on your system, then you will +# with ISIS. If you need to rebuild ISIS on your system, then you will # need to modify the lines below that pertain to the location of the # header files and library on your system. The compilation flag, ENABLEJP2K, # should be set to true if you are building with the Kakadu library and -# you want to use the JPEG2000 specific code in the ISIS3 system. Otherwise, +# you want to use the JPEG2000 specific code in the ISIS system. Otherwise, # set the ENABLEJP2K flag to false. # # Added abililty to automatically detect the existance of the Kakadu include diff --git a/isis/make/config.linux-x86_64_Ubuntu14_04 b/isis/make/config.linux-x86_64_Ubuntu14_04 index 5cd34f7551..0d032e1ea3 100644 --- a/isis/make/config.linux-x86_64_Ubuntu14_04 +++ b/isis/make/config.linux-x86_64_Ubuntu14_04 @@ -221,11 +221,11 @@ PROTOC = $(ISIS3LOCAL)/bin/protoc #--------------------------------------------------------------------------- # Set up for kakadu # The Kakadu library is proprietary. The source files cannot be distributed -# with ISIS3. If you need to rebuild ISIS3 on your system, then you will +# with ISIS. If you need to rebuild ISIS on your system, then you will # need to modify the lines below that pertain to the location of the # header files and library on your system. The compilation flag, ENABLEJP2K, # should be set to true if you are building with the Kakadu library and -# you want to use the JPEG2000 specific code in the ISIS3 system. Otherwise, +# you want to use the JPEG2000 specific code in the ISIS system. Otherwise, # set the ENABLEJP2K flag to false. # # Added abililty to automatically detect the existance of the Kakadu include diff --git a/isis/sipfiles/BundleAdjust.sip b/isis/sipfiles/BundleAdjust.sip index 3365780bff..76c089a58b 100644 --- a/isis/sipfiles/BundleAdjust.sip +++ b/isis/sipfiles/BundleAdjust.sip @@ -1,4 +1,4 @@ -// SIP Wrapper to the ISIS3 bundle class +// SIP Wrapper to the ISIS bundle class %Include type_conversions.sip diff --git a/isis/src/apollo/apps/apollopaninit/apollopaninit.xml b/isis/src/apollo/apps/apollopaninit/apollopaninit.xml index 8e0d737d17..0f41b7d7f0 100644 --- a/isis/src/apollo/apps/apollopaninit/apollopaninit.xml +++ b/isis/src/apollo/apps/apollopaninit/apollopaninit.xml @@ -8,9 +8,9 @@ This program will import a merged JPEG2000 Apollo Panaramic Image. - JPEG2000 files (JP2) is supported in the ISIS3 library. The JP2 file - can have any number of bands up to 16384. The output from a JP2 file - will be a multi-spectral ISIS3 image file. + JPEG2000 files (JP2) is supported in the ISIS library. The JP2 file + can have any number of bands up to 16384. The output from a JP2 file + will be a multi-spectral ISIS image file. @@ -105,7 +105,7 @@ GMT is space deliniated Year Month Day Hour Minute Seconds - + double @@ -169,7 +169,7 @@ Nominally the V/H can be calucalated from the other input parameters. However, during some periods of the mission the V/H sensor was stuck and did not adjust image to image. In those cases this manual override can be used. None - - + + diff --git a/isis/src/base/apps/autoregtemplate/autoregtemplate.xml b/isis/src/base/apps/autoregtemplate/autoregtemplate.xml index b497830561..beb5e5d264 100644 --- a/isis/src/base/apps/autoregtemplate/autoregtemplate.xml +++ b/isis/src/base/apps/autoregtemplate/autoregtemplate.xml @@ -78,7 +78,7 @@ - Pattern Matching in ISIS 3 + Pattern Matching in ISIS PatternMatch.html ../../../../documents/PatternMatch/ @@ -133,8 +133,8 @@ The new pattern and search chips will be this many times smaller than the originals. - Reduction factor used to speed up the pattern matching algorithm. The original pattern - and search chips are divided by this factor to get the size of the new pattern and + Reduction factor used to speed up the pattern matching algorithm. The original pattern + and search chips are divided by this factor to get the size of the new pattern and search chips. None @@ -522,7 +522,7 @@ - algorithm=MinimumDifference tolerance=0.7 reductionfactor=2 + algorithm=MinimumDifference tolerance=0.7 reductionfactor=2 interp=nearestneighbor psamp=15 pline=15 pmin=1200 pmax=2800 pvalidpercent=75 ssamp=31 sline=31 smin=1200 smax=2800 minimumzscore = 0.5 ssubchipvalidpercent = 80 distancetolerance=2.5 @@ -537,4 +537,3 @@ - diff --git a/isis/src/base/apps/blend/blend.xml b/isis/src/base/apps/blend/blend.xml index 90e5979b36..819a213c07 100644 --- a/isis/src/base/apps/blend/blend.xml +++ b/isis/src/base/apps/blend/blend.xml @@ -9,7 +9,7 @@

This application is a translation of the Davinci script "blend" (Arizona - State University, http://davinci.asu.edu) into Isis 3. The blending + State University, http://davinci.asu.edu) into ISIS. The blending process itself takes a list of Level2 cubes and blends them together along their overlapping areas by creating a "ramp" from one image to the other. @@ -21,7 +21,7 @@ values of the overlapping area are changed, however. Consequently, this application is best suited to blend images that are similar in contrast and/or brightness. As part of the THEMIS mosaicking pipeline, it is - customary to use the Isis 3 application "sigmastretch" (itself a + customary to use the ISIS application "sigmastretch" (itself a translation of another Davinci script, "sstretch") to reduce and contrast differences between images.

@@ -80,7 +80,7 @@ - Original translation of the Davinci "blend" script into Isis 3. + Original translation of the Davinci "blend" script into ISIS. Added new queue technique to create the ramp, resulting in significant @@ -256,7 +256,7 @@ Mosaic of the output images for blend - + This is the same subarea of a mosaic of the output images after being blended together. The seam from the "before" mosaic is now gone, and there is a smooth transition from one image to the other, diff --git a/isis/src/base/apps/cam2cam/cam2cam.cpp b/isis/src/base/apps/cam2cam/cam2cam.cpp index be8a6d256f..576d742015 100644 --- a/isis/src/base/apps/cam2cam/cam2cam.cpp +++ b/isis/src/base/apps/cam2cam/cam2cam.cpp @@ -27,16 +27,16 @@ namespace Isis { */ void cam2cam(UserInterface &ui) { Cube *icube = new Cube(); - icube->open(ui.GetFileName("FROM")); + icube->open(ui.GetFileName("FROM")); Cube *mcube = new Cube(); - mcube->open(ui.GetFileName("MATCH")); + mcube->open(ui.GetFileName("MATCH")); return cam2cam(icube, mcube, ui); } /** * Convert the pixels of a camera image to the geometry of a different camera - * image. This is the programmatic interface to the ISIS3 cam2cam + * image. This is the programmatic interface to the ISIS cam2cam * application. * * @param icube input cube to be transformed @@ -44,10 +44,10 @@ namespace Isis { * @param ui The User Interface to parse the parameters from */ void cam2cam(Cube *icube, Cube *mcube, UserInterface &ui) { - + ProcessRubberSheet m; m.SetInputCube(mcube); - Cube *ocube = m.SetOutputCube(ui.GetFileName("TO"), ui.GetOutputAttribute("TO"), + Cube *ocube = m.SetOutputCube(ui.GetFileName("TO"), ui.GetOutputAttribute("TO"), mcube->sampleCount(), mcube->lineCount(), mcube->bandCount()); // Set up the default reference band to the middle of the cube @@ -179,4 +179,4 @@ namespace Isis { return p_outputLines; } -} \ No newline at end of file +} diff --git a/isis/src/base/apps/cam2map/cam2map.xml b/isis/src/base/apps/cam2map/cam2map.xml index 296238f26c..870a3fd6cf 100644 --- a/isis/src/base/apps/cam2map/cam2map.xml +++ b/isis/src/base/apps/cam2map/cam2map.xml @@ -13,7 +13,7 @@ running cam2map. The map projection is defined using a PVL file which is specified in cam2map in the MAP parameter. Note: the system defaults to the Sinusoidal projection (ISIS projection based templates are located in $ISISROOT/appdata/templates/maps). - To learn more about using map projections in ISIS, refer to the ISIS Workshop + To learn more about using map projections in ISIS, refer to the ISIS Workshop "Learning About Map Projections". @@ -950,7 +950,7 @@ This example is the first of two different runs of cam2map demonstrating usage of MATCHMAP. In both this example and the next, - MATCHMAP is set to YES. In this case MAP is an Isis3 level 2 image. + MATCHMAP is set to YES. In this case MAP is an ISIS level 2 image. The mapping parameters of the output file will be read from the mapping group of the MAP level 2 image. diff --git a/isis/src/base/apps/caminfo/caminfo.xml b/isis/src/base/apps/caminfo/caminfo.xml index e227205f3a..f2f617aed8 100644 --- a/isis/src/base/apps/caminfo/caminfo.xml +++ b/isis/src/base/apps/caminfo/caminfo.xml @@ -3,12 +3,12 @@ - Outputs a PVL file that contains camera information. + Outputs a PVL file that contains camera information.

- This program compiles and outputs various spacecraft and instrument-related information such as + This program compiles and outputs various spacecraft and instrument-related information such as geometric, polygon, and mapping information.

@@ -20,22 +20,22 @@ running the spiceinit program from within caminfo.

- Some information in the output PVL file will consist of a compilation of information for all the - bands in the cube and will be listed in the "Common" object of the PVL. Other information for a given + Some information in the output PVL file will consist of a compilation of information for all the + bands in the cube and will be listed in the "Common" object of the PVL. Other information for a given band will be placed in the "BandSet" object of the PVL. The user can select the check boxes to control - the information that will be output to the PVL file. If the POLYGON or USELABEL option is chosen, + the information that will be output to the PVL file. If the POLYGON or USELABEL option is chosen, the image polygon is output in Well-Known Text format (WKT).

-

+

The output file can be in PVL or CSV (Comma Separated Value) format. The "APPEND" option allows - the new generated information to be appended to the output file. This is especially useful for - CSV file format. If the CSV format is chosen, only Camstats, Statistics and Geometry options - are allowed. Isis Label, Original Label and Polygon options are disabled for CSV format. + the new generated information to be appended to the output file. This is especially useful for + CSV file format. If the CSV format is chosen, only Camstats, Statistics and Geometry options + are allowed. Isis Label, Original Label and Polygon options are disabled for CSV format.

-

+

The following is an example of caminfo output generated when in PVL format:

-
 
+
 Object = Caminfo
   Object = Parameters
     Program     = caminfo
@@ -204,14 +204,14 @@ End
 
   

     Output values that do not have a minimum/maximum range associated with them
-    are calculated at the center of the image.  
+    are calculated at the center of the image.
   

   

     Definitions for most of the values output in the PVL file can be found in
-    the ISIS 3 documentation glossary including: SubSpacecraftLatitude,
+    the ISIS documentation glossary including: SubSpacecraftLatitude,
     SubSpacecraftLongitude, SubSolarLatitude,
-    SubSolarLongitude, NorthAzimuth, 
-    SpacecraftAzimuth, SubSolarAzimuth, 
+    SubSolarLongitude, NorthAzimuth,
+    SpacecraftAzimuth, SubSolarAzimuth,
     ObliqueLineResolution, ObliqueSampleResolution,
     ObliquePixelResolution, and ObliqueDetectorResolution
   

@@ -228,85 +228,85 @@ End
       Fixed WKT calls
     
     
-      Remove ToWKT calls and PolygonTools.h inclusion.  The geos package now 
-      has a method to return a WKT string, so the ToWKT method has been 
+      Remove ToWKT calls and PolygonTools.h inclusion.  The geos package now
+      has a method to return a WKT string, so the ToWKT method has been
       removed from the PolygonTools class.
     
-     
-      Made the following modifications:  fixed typo in PercentNull and 
-      MaximumLongitude keywords; use the base file name for generation of 
-      temporary files to further ensure uniqueness; run camstats once if 
-      there is only one band - doubles execution speed for single band 
-      images when CAMSTATS option is used; substitute the NULL string for 
-      all special pixel values; added corner pixel keywords for PDS 
-      compatibility; added phase, emission, incidence angles 
-      and line and sample pixel resolution at the center pixel; added test 
-      for intersection of longitude domain, north and south poles and 
-      keywords that report them; added option to output ISIS cube labels; 
+    
+      Made the following modifications:  fixed typo in PercentNull and
+      MaximumLongitude keywords; use the base file name for generation of
+      temporary files to further ensure uniqueness; run camstats once if
+      there is only one band - doubles execution speed for single band
+      images when CAMSTATS option is used; substitute the NULL string for
+      all special pixel values; added corner pixel keywords for PDS
+      compatibility; added phase, emission, incidence angles
+      and line and sample pixel resolution at the center pixel; added test
+      for intersection of longitude domain, north and south poles and
+      keywords that report them; added option to output ISIS cube labels;
       corrected computations for parallax and shadow keywords.
      
-      
-       Renamed the HasLongitudeDomain keyword to HasLongitudeBoundary.  
+     
+       Renamed the HasLongitudeDomain keyword to HasLongitudeBoundary.
        Makes more sense.
      
-      
-       Corrected method call to compute polygon with proper parameters as 
-       well as correct band number.  Added code to better honor specific 
-       cube attributes (such as band numbers) in computations.  Also will 
-       produce NULL valued keywords where NULLs are a produced instead of 
+     
+       Corrected method call to compute polygon with proper parameters as
+       well as correct band number.  Added code to better honor specific
+       cube attributes (such as band numbers) in computations.  Also will
+       produce NULL valued keywords where NULLs are a produced instead of
        the real value for the ISIS NULL pixel value.
      
      
-       Removed references to CubeInfo 
+       Removed references to CubeInfo
      
      
-       Added Camera Test option  to test for a valid camera at center of image 
+       Added Camera Test option  to test for a valid camera at center of image
        and return an error and end if a valid camera cannot be created.
      
-      
-       Reworked the output PVL format;  added more keywords to the Common object 
+     
+       Reworked the output PVL format;  added more keywords to the Common object
        that indicate versions and dates;  added more values to Geometry and
        Polygon object.
      
-      
-       Corrected generation of polygon for multi-band data.  It created a 
+     
+       Corrected generation of polygon for multi-band data.  It created a
        POLYGON union instead of the required MULTIPOLYGON.
      
-      
-       The target center distance and subspacecraft latitude were not properly 
-       propagated to the output PVL file and consequently were invalid.  This 
+     
+       The target center distance and subspacecraft latitude were not properly
+       propagated to the output PVL file and consequently were invalid.  This
        has been corrected.
      
-      
+     
        Added RightAscension, Declination, SubSolarGroundAzimuth, and
-       SubSpacecraftGroundAzimuth computations; added center line/sample image 
-       coordinate used to compute center geometry; added check of valid image 
-       line/sample coordinates when testing for north/south poles (some camera 
-       models return valid states when coordinates are outside of image 
+       SubSpacecraftGroundAzimuth computations; added center line/sample image
+       coordinate used to compute center geometry; added check of valid image
+       line/sample coordinates when testing for north/south poles (some camera
+       models return valid states when coordinates are outside of image
        boundaries).
      
-      
-       Modified to actually exclude the unconditional computation of the image 
-       polygon to assist in some geometry values.  It is no longer computed if 
-       the user does not select the POLYGON option.  The implications of this 
-       are that some of the keywords in the output Geometry group are no 
-       longer ever relevant.  These keywords were all moved to the Polygon 
-       group.  These keywords are:   CentroidLine, CentroidSample, 
-       CentroidLatitude, CentroidLongitude, CentroidRadius and SurfaceArea.  
-       User will no longer see these values if the POLYGON option is not 
-       selected.  Also the Radius keyword in the Polygon group has been 
+     
+       Modified to actually exclude the unconditional computation of the image
+       polygon to assist in some geometry values.  It is no longer computed if
+       the user does not select the POLYGON option.  The implications of this
+       are that some of the keywords in the output Geometry group are no
+       longer ever relevant.  These keywords were all moved to the Polygon
+       group.  These keywords are:   CentroidLine, CentroidSample,
+       CentroidLatitude, CentroidLongitude, CentroidRadius and SurfaceArea.
+       User will no longer see these values if the POLYGON option is not
+       selected.  Also the Radius keyword in the Polygon group has been
        removed as it is redundant with CentroidRadius.
      
-      
-       Added PIXINC parameter to allow user to specify number of pixels to 
+     
+       Added PIXINC parameter to allow user to specify number of pixels to
        skip around the perimeter of the image to compute the polygon.
      
-      
-       Fixed bug where image was a 0 longitude boundary crosser.  It would 
-       typically fail when determining centroid information unless converted 
-       to 180 domain.  This will also be used at the poles as it seems to work 
-       better in the 180 domain as well.  (This process projects the footprint 
-       to a Sinusoidal projection to determine area which requires an equal 
+     
+       Fixed bug where image was a 0 longitude boundary crosser.  It would
+       typically fail when determining centroid information unless converted
+       to 180 domain.  This will also be used at the poles as it seems to work
+       better in the 180 domain as well.  (This process projects the footprint
+       to a Sinusoidal projection to determine area which requires an equal
        area projection, such as Sinusoidal.)
      
      
@@ -314,21 +314,21 @@ End
        control limb and terminator polygon generation.
      
      
-       Allow disabling of shape model use when constructing polygons that 
+       Allow disabling of shape model use when constructing polygons that
        contain limbs.
      
      
-       Removed polygon options group and placed the options within output 
-       options. Added inclusion for parameters related to polygons to only be 
-       available when polygons are selected. Made TO option not have a 
-       default of None, updated documentation and modified formatting. 
+       Removed polygon options group and placed the options within output
+       options. Added inclusion for parameters related to polygons to only be
+       available when polygons are selected. Made TO option not have a
+       default of None, updated documentation and modified formatting.
      
      
        Replaced PIXINC with POLYSINC and POLYLINC. Renamed SINC and LINC to
        STATSSINC and STATSLINC.
      
      
-       Added option for the output file to be in CSV format and also ability 
+       Added option for the output file to be in CSV format and also ability
        to append to the existing output file.
      
      
@@ -360,7 +360,7 @@ End
     
     
         The computation of ParallaxX/ParallaxY and ShadowX/ShadowY values was
-        not properly implemented. Updated documentation with a new example. 
+        not properly implemented. Updated documentation with a new example.
         Fixes #1296.
     
     
@@ -414,7 +414,7 @@ End
         
       
       
-    
+
     
       
         string
@@ -434,7 +434,7 @@ End
              Create CSV output 
             
               Caminfo data to be generated in Comma Separated Value (CSV) format
-             
+            
              
                ISISLABEL
                ORIGINALLABEL
@@ -444,27 +444,27 @@ End
            
          
       
-      
+
       
         boolean
         false
         Append caminfo information to existing data file
-         Append caminfo information to existing file. This will append the 
-          caminfo data to the filename specified for the TO parameter beginning at a 
-          new line. 
+         Append caminfo information to existing file. This will append the
+          caminfo data to the filename specified for the TO parameter beginning at a
+          new line.
          
       
-      
+
       
         boolean
         
           Include geometry information
         
         
-          Get geometry information from the camera at the center of the image.  
-          These data are listed under the Geometry Object heading.  The keyword/values 
+          Get geometry information from the camera at the center of the image.
+          These data are listed under the Geometry Object heading.  The keyword/values
           contained therein are listed here:
-          
+
           

 
    

-     Finally, depending on the projection, problems can occur with cubes that fall on the 
-     projection ring longitude seam.  For example, if you are making a mosaic with 
-     RingLongitudeDomain = 360 and your cube crosses 0/360 seam, this program would compute the 
-     default ring longitude range of the cube to MinimumRingLongitude = 0 and 
-     MaximumRingLongitude = 360.  A very large output image could be created 
+     Finally, depending on the projection, problems can occur with cubes that fall on the
+     projection ring longitude seam.  For example, if you are making a mosaic with
+     RingLongitudeDomain = 360 and your cube crosses 0/360 seam, this program would compute the
+     default ring longitude range of the cube to MinimumRingLongitude = 0 and
+     MaximumRingLongitude = 360.  A very large output image could be created
      depending on the pixel resolution.  The RINGLONSEAM parameter allows you to selectively handle
-     this case. If you are making mosaics near the seam you will need to understand and alter the 
+     this case. If you are making mosaics near the seam you will need to understand and alter the
      default for this parameter.
      
-     Section 14 of The ISIS Workshop "Learning About Map Projections" includes an example to 
-     help illustrate the problem. Note that if the user chooses to match the map file, then the 
+     Section 14 of The ISIS Workshop "Learning About Map Projections" includes an example to
+     help illustrate the problem. Note that if the user chooses to match the map file, then the
      user can not set this parameter. The program will behave as if RINGLONSEAM="CONTINUE".
    

   
@@ -199,27 +199,27 @@
      
        Fixed lonseam option to work with minimize option correctly
      
-      
-       Fixed bug where the ground range was not pulled from the map file when 
+     
+       Fixed bug where the ground range was not pulled from the map file when
        it was supposed to be (using DEFAULTRANGE = MAP).
      
      
        Added the MATCHMAP option.
      
      
-       Removed references to CubeInfo 
+       Removed references to CubeInfo
      
      
        Changed MATCHMAP to default off
      
      
-       Changed MATCHMAP to have exclusions. If MATCHMAP is true, the PIXRES and DEFAULTRANGE 
+       Changed MATCHMAP to have exclusions. If MATCHMAP is true, the PIXRES and DEFAULTRANGE
        options can not be set. Changed the code to enforce MATCHMAP.
      
      
        Added the ability to change ProcessRubberSheet's tiling sizes. Now the Camera will decide upon the
        tiling sizes used in ProcessRubberSheet, in order to fix problems found with the push frame cameras which
-       have small framelet sizes (less than 64 pixels tall). This is a passive ability with respect to the user; 
+       have small framelet sizes (less than 64 pixels tall). This is a passive ability with respect to the user;
        no options or differences should be noticable.
      
      
@@ -242,7 +242,7 @@
        Updated documentation text, added glossary links, and improved compatability with Isis documentation.
      
      
-       Add forward and reverse patch rubbersheeting parameters.  
+       Add forward and reverse patch rubbersheeting parameters.
      
      
        Updated Spice members to be more compliant with Isis coding standards. References #972.
@@ -252,11 +252,11 @@
      
      
        Added appTests.  Test coverage appears low (60% scope, 60% line, 38% function), however these
-       tests cover a large portion in all three categories for the code that does not apply to the GUI helper methods. 
+       tests cover a large portion in all three categories for the code that does not apply to the GUI helper methods.
         References #775.
      
      
-       Re-added "if MATCHMAP" statements since the IsisAml is not interpreting exclusions as expected. 
+       Re-added "if MATCHMAP" statements since the IsisAml is not interpreting exclusions as expected.
        Added exclusion - if MATCHMAP is true, then the parameter RINGLONSEAM is excluded. References #775.
      
   
@@ -435,11 +435,11 @@
         Defines how the default ground range is determined
         MINIMIZE
         
-          This parameter is used to specify how the default ring ground ranges (radius and 
-          longitude) for the output map projected image is obtained.  The ground range can be 
-          obtained from the camera or map file.  Note the user can overide the default using the 
-          MINRINGRAD, MAXRINGRAD, MINRINGLON, MAXRINGLON parameters.  The purpose of the ground 
-          range is to define the coverage of the map projected image.  Essentially, the ground 
+          This parameter is used to specify how the default ring ground ranges (radius and
+          longitude) for the output map projected image is obtained.  The ground range can be
+          obtained from the camera or map file.  Note the user can overide the default using the
+          MINRINGRAD, MAXRINGRAD, MINRINGLON, MAXRINGLON parameters.  The purpose of the ground
+          range is to define the coverage of the map projected image.  Essentially, the ground
           range and pixel resolution are used to compute the size (samples and line) of the output image.
         
 
@@ -461,8 +461,8 @@
           
@@ -592,7 +592,7 @@
               If the cube crosses the seam, abort the program.
               
                 If the cube has a LongitudeDomain of 360 and the image crosses the seam at 0/360 degrees or
-                or the cube has a LongitudeDomain of 180 and the image crosses the seam at -180/180 degrees, 
+                or the cube has a LongitudeDomain of 180 and the image crosses the seam at -180/180 degrees,
                 then the program will exit with an error message.
               
             
@@ -600,8 +600,8 @@
             
@@ -652,25 +652,25 @@
         
         Warp algorithm
         
-          Used to choose the warping algorithm, either the forward patch algorithm or the reverse patch 
-          algorithm.   The default is to automatically choose the algorithm based on the input camera type 
+          Used to choose the warping algorithm, either the forward patch algorithm or the reverse patch
+          algorithm.   The default is to automatically choose the algorithm based on the input camera type
           (e.g., framing, linescan, pushframe).

- The following is the result of shadowtau; the bolded values are estimated + The following is the result of shadowtau; the bolded values are estimated tau and albedo values, respectively:

      PSP_001414_1780_RED5.cub, 54.3287, 17.7148, 70.0486, 0.0943, 0.0667265, 0.43133, 0.120277
@@ -76,23 +76,23 @@

- For each line in the table file above, the model results for the tau - and albedo of the surface are appended to - the end of the input line as shown in bold, and exported to the output - file. All the results are based on user-selected photometric and - atmospheric models, and either the default or user-modified parameter values. - Most of the parameters default to appropriate values for Mars red filter - images since it is the only other planet with modest atmospheric optical - depths besides Earth. The results from the program are useful as an initial value + For each line in the table file above, the model results for the tau + and albedo of the surface are appended to + the end of the input line as shown in bold, and exported to the output + file. All the results are based on user-selected photometric and + atmospheric models, and either the default or user-modified parameter values. + Most of the parameters default to appropriate values for Mars red filter + images since it is the only other planet with modest atmospheric optical + depths besides Earth. The results from the program are useful as an initial value for the "tau" parameter when a photometric correction is applied to the images.

- The surface and atmosphere models use the same assumptions as the - photomet photometric correction software, so the estimated - optical depths are useful for processing images with that program. In - other words, the optical depth calculated by this program is model-dependent; - however, it is exactly the model-dependent value that will produce the most - effective photometric correction in photomet. + The surface and atmosphere models use the same assumptions as the + photomet photometric correction software, so the estimated + optical depths are useful for processing images with that program. In + other words, the optical depth calculated by this program is model-dependent; + however, it is exactly the model-dependent value that will produce the most + effective photometric correction in photomet.


@@ -107,42 +107,42 @@ Name Required parameter names - + Hapkehen B0, hg1, hg2, hh, theta, wh - + Hapkeleg Theta, wh, bh, ch, hh, b0, zerob0st Lambert None - + LommelSeeliger None - + LunarLambert L - + LunarLambertEmpirical (Disabled until next release) Datafile - + LunarLambertMcEwen None - + Minnaert K - + MinnaertEmpirical (Disabled until next release) Datafile - +

@@ -152,7 +152,7 @@ Name Description -ISIS3 default +ISIS default Valid range @@ -266,7 +266,7 @@ incidence and emission angles, respective Function model name Required parameters - + Anisotropic1 Bha, hnorm, wha @@ -302,7 +302,7 @@ incidence and emission angles, respective Name Description -ISIS3 Default +ISIS Default Valid Range @@ -338,31 +338,31 @@ incidence and emission angles, respective 
 References:
- 
+
 Chandrasekhar, S., 1960.  Radiative Transfer. Dover, 393 pp.
-Hapke, B. W., 1981. Bidirectional reflectance spectroscopy 1: Theory. 
-   J. Geophys. Res., pp. 86,3039-3054. 
-Hapke, B., 1984. Bidirectional reflectance spectroscopy 3: Corrections for 
+Hapke, B. W., 1981. Bidirectional reflectance spectroscopy 1: Theory.
+   J. Geophys. Res., pp. 86,3039-3054.
+Hapke, B., 1984. Bidirectional reflectance spectroscopy 3: Corrections for
    macroscopic roughness. Icarus, 59, pp. 41-59.
-Hapke, B., 1986. Bidirectional reflectance spectroscopy 4: The extinction 
-   coefficient and the opposition effect. Icarus, 67, pp. 264-280. 
-Johnson, J. R., et al., 1999, Preliminary Results on Photometric Properties of 
-   Materials at the Sagan Memorial Station, Mars, J. Geophys. Res., 104, 8809. 
+Hapke, B., 1986. Bidirectional reflectance spectroscopy 4: The extinction
+   coefficient and the opposition effect. Icarus, 67, pp. 264-280.
+Johnson, J. R., et al., 1999, Preliminary Results on Photometric Properties of
+   Materials at the Sagan Memorial Station, Mars, J. Geophys. Res., 104, 8809.
 Kirk, R. L., Thompson, K. T., Becker, T. L., and Lee, E. M., 2000.
-   Photometric modelling for planetary cartography. Lunar Planet. Sci., XXXI, 
+   Photometric modelling for planetary cartography. Lunar Planet. Sci., XXXI,
    Abstract #2025, Lunar and Planetary Institute, Houston (CD-ROM).
-Kirk, R. L., Thompson, K. T., and Lee, E. M., 2001. Photometry of the 
-   martian atmosphere:  An improved practical model for cartography and 
-   photoclinometry. Lunar Planet. Sci., XXXII, Abstract #1874, Lunar and 
-   Planetary Institute, Houston (CD-ROM). 
-McEwen, A. S., 1991. Photometric functions for photoclinometry and other 
+Kirk, R. L., Thompson, K. T., and Lee, E. M., 2001. Photometry of the
+   martian atmosphere:  An improved practical model for cartography and
+   photoclinometry. Lunar Planet. Sci., XXXII, Abstract #1874, Lunar and
+   Planetary Institute, Houston (CD-ROM).
+McEwen, A. S., 1991. Photometric functions for photoclinometry and other
    applications.  Icarus, 92, pp. 298-311.
-Tanaka, K. L., and and Davis, P. A., 1988, Tectonic History of the Syria 
-   Planum Provice of Mars, J. Geophys. Res., 93, 14,893. 
-Thorpe, T. E., 1973, Mariner 9 Photometric Observations of Mars from 
+Tanaka, K. L., and and Davis, P. A., 1988, Tectonic History of the Syria
+   Planum Provice of Mars, J. Geophys. Res., 93, 14,893.
+Thorpe, T. E., 1973, Mariner 9 Photometric Observations of Mars from
    November 1971 through March 1972, Icarus, 20, 482.
-Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere 
-   from the Imager on Mars Pathfinder, J. Geophys. Res., 104, 8987 
+Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
+   from the Imager on Mars Pathfinder, J. Geophys. Res., 104, 8987
@@ -422,9 +422,9 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere Input text file name - Input text file name with Image ID, incidence, emission, and phase - angle of the measured dark shadow, average DN value of flat area - and average DN value of a dark shadowed area + Input text file name with Image ID, incidence, emission, and phase + angle of the measured dark shadow, average DN value of flat area + and average DN value of a dark shadowed area *.txt @@ -437,9 +437,9 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere Output text file name - Output text file name with the input ImageID, incidence, emission, - and phase angle of the measured dark shadow, average DN value of - flat area, average DN value of a dark shadowed area, plus the + Output text file name with the input ImageID, incidence, emission, + and phase angle of the measured dark shadow, average DN value of + flat area, average DN value of a dark shadowed area, plus the estimated tau (optical depth) and albedo (albedo of the surface) values appended to each input line. @@ -448,7 +448,7 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere - + combo @@ -461,15 +461,15 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
HAPKEHEN
- Derive model albedo using the complete Hapke model with Henyey-Greenstein - single-particle phase function whose coefficients are hg1 and hg2, - plus single scattering albedo wh, opposition surge parameters hh and + Derive model albedo using the complete Hapke model with Henyey-Greenstein + single-particle phase function whose coefficients are hg1 and hg2, + plus single scattering albedo wh, opposition surge parameters hh and b0, and macroscopic roughness theta. For a smooth model with opposition effect use theta=0.

- The table below shows the Hapke parameters for Mars from Johnson et + The table below shows the Hapke parameters for Mars from Johnson et al. (1999) for IMP data of Photometry Flats (soil) and may be reasonably - representative of Mars as a whole. Note that (hg1, hg2=1.0) is + representative of Mars as a whole. Note that (hg1, hg2=1.0) is equivalent to (-hg1, hg2=0.0).

@@ -507,21 +507,21 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
1.0
-
+
HAPKELEG
- Derive model albedo using complete Hapke model with Henyey Legendre - two-term Legendre polynomial phase function whose coefficients are bh - and ch, plus single scattering albedo wh, opposition surge parameters + Derive model albedo using complete Hapke model with Henyey Legendre + two-term Legendre polynomial phase function whose coefficients are bh + and ch, plus single scattering albedo wh, opposition surge parameters hh and b0, and macroscopic roughness theta. -
+
LAMBERT
- A simple photometric model which predicts that light incident on a - surface is scattered uniformly in all directions; the total amount - of reflected light depends on the incidence angle of the illumination. + A simple photometric model which predicts that light incident on a + surface is scattered uniformly in all directions; the total amount + of reflected light depends on the incidence angle of the illumination. This function does not depend upon the outgoing light direction. -
+
LOMMELSEELIGER
This model takes into account the radiance that results from @@ -530,28 +530,28 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere scattering (scattering of diffuse light which has made its way indirectly to the same position by being scattered one or more times). This model depends on the incidence and emission angles. -
+
LUNARLAMBERTMCEWEN
This model was developed specifically for use with the Moon, and designed to be used in conjunction with the Moon(MoonAlbedo) normalization model. -
-
LUNARLAMBERTEMPIRICAL, LUNARLAMBERT, + +
LUNARLAMBERTEMPIRICAL, LUNARLAMBERT, MINNAERTEMPIRICAL, and MINNAERT
These models combine a weighted sum of the LommelSeeliger and Lambert models. Given a suitable value for the LunarLambert - function weight, L, these models fit the true + function weight, L, these models fit the true reflectance behavior of many planetary surfaces equally well as the Hapke model. These models also depend on the incidence and emission angles. -
-
+ +

LUNARLAMBERTEMPIRICAL and MINNAERTEMPIRICAL photometric models, and - the parameter name DATAFILE are disabled until the next release. + the parameter name DATAFILE are disabled until the next release. There was a problem using the two functions listed above.

@@ -566,7 +566,7 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere Hapke-Henyey-Greenstein Photometric Model - Derive model albedo using complete Hapke model with Henyey-Greenstein + Derive model albedo using complete Hapke model with Henyey-Greenstein single-particle phase function. @@ -591,7 +591,7 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere Hapke Legendre Polynomial Photometric Model - Derive model albedo using complete Hapke model with Henyey Legendre + Derive model albedo using complete Hapke model with Henyey Legendre two-term Legendre polynomial phase function. @@ -640,7 +640,7 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere This model takes into account the radiance - that results from single scattering (scattering of collimated + that results from single scattering (scattering of collimated incident light). @@ -683,13 +683,13 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere //--> - + + //--> @@ -851,9 +851,9 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere The Hapke Henyey Greenstein coefficient for single particle phase function. The second parameter of the two-parameter Henyey-Greenstein - model for the scattering phase function of single particles in the - surface. This parameter controls the proportions in a linear - mixture of ordinary Heneyey Greenstein phase functions with asymmetry + model for the scattering phase function of single particles in the + surface. This parameter controls the proportions in a linear + mixture of ordinary Heneyey Greenstein phase functions with asymmetry parameters equal to +hg1 and -hg1. See HG1 for the full formula. 0.0 @@ -869,13 +869,13 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere None Specified The Hapke Legendre coefficient for single particle phase - function. A two-term Legendre polynomial is used for the scattering + function. A two-term Legendre polynomial is used for the scattering phase function of single particles in the surface:
P(phase) = 1 + bh * p1(cos(phase)) + ch * p2(cos(phase))
Bh is not to be confused with the Legendre coefficient bha - of the phase function for atmospheric particles, used when + of the phase function for atmospheric particles, used when atmname=anisotropic1 or anisotropic2. -1.0 @@ -891,7 +891,7 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere None Specified The Hapke Legendre coefficient for single particle phase - function. A two-term Legendre polynomial is used for the scattering + function. A two-term Legendre polynomial is used for the scattering phase function of single particles in the surface:
P(phase) = 1 + bh * p1(cos(phase)) + ch * p2(cos(phase)) @@ -909,7 +909,7 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere None Specified None Specified - The Hapke opposition surge component. The width parameter for the opposition + The Hapke opposition surge component. The width parameter for the opposition effect for the surface if Hapkehen or Hapkeleg is used. See Hapke (1984). 0.0 @@ -946,13 +946,13 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere B0 will not be set to zero for standard conditions phase - This option specifies that the opposition surge B0 will not be set to zero + This option specifies that the opposition surge B0 will not be set to zero during the standard conditions phase.