From ab25e3b686a9dc4442b701a080a9d58ea2781413 Mon Sep 17 00:00:00 2001
From: Amy Stamile <74275278+amystamile-usgs@users.noreply.github.com>
Date: Thu, 18 Feb 2021 21:18:33 -0700
Subject: [PATCH] Updated ISIS3 references to ISIS (#4292)
* Remove references to ISIS3 and replace with references to ISIS
* Remove references to ISIS3 and replace with ISIS
* Updated "isis" and "Isis" to "ISIS"
* Update TestPreferences
* Update IsisPreferences
* Reverted changes from 'Isis to ISIS' commit to see if it fixes failing tests.
Co-authored-by: Stuart Sides <ssides@usgs.gov>
---
.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 | 4 +-
isis/make/config.darwin-MacOSX10_11 | 4 +-
isis/make/config.darwin-MacOSX10_13 | 4 +-
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 +-
isis/src/system/apps/csspckgen/csspckgen.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 +-
228 files changed, 3672 insertions(+), 3724 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..432ee429cd 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..655aeefa68 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
-
+
# <sp:Spectral_Characteristics>
# <sp:bin_width_desc>
# 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
-
+
# <sp:Spectral_Characteristics>
# <sp:bin_width_desc>
# 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
-
+
# <sp:Spectral_Characteristics>
# <sp:bin_width_desc>
# 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.
# <sp:Spectral_Characteristics>
# <sp:bin_width_desc>
# 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..c22129baee 100644
--- a/isis/make/config.darwin-MacOSX10_10
+++ b/isis/make/config.darwin-MacOSX10_10
@@ -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.darwin-MacOSX10_11 b/isis/make/config.darwin-MacOSX10_11
index ecd72e9532..e915405dbf 100644
--- a/isis/make/config.darwin-MacOSX10_11
+++ b/isis/make/config.darwin-MacOSX10_11
@@ -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_13 b/isis/make/config.darwin-MacOSX10_13
index a2134dfcd3..9a24dd1686 100644
--- a/isis/make/config.darwin-MacOSX10_13
+++ b/isis/make/config.darwin-MacOSX10_13
@@ -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_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 @@
<description>
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.
</description>
<history>
@@ -105,7 +105,7 @@
<description>GMT is space deliniated Year Month Day Hour Minute Seconds</description>
</parameter>
</group>
-
+
<group name="Spacecraft Position">
<parameter name="LON_NADIR">
<type>double</type>
@@ -169,7 +169,7 @@
<description>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.</description>
<internalDefault>None</internalDefault>
</parameter>
- </group>
-
+ </group>
+
</groups>
</application>
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 @@
</applications>
<documents>
<document>
- <title>Pattern Matching in ISIS 3</title>
+ <title>Pattern Matching in ISIS</title>
<source>
<filename>PatternMatch.html</filename>
<path>../../../../documents/PatternMatch/</path>
@@ -133,8 +133,8 @@
The new pattern and search chips will be this many times smaller than the originals.
</brief>
<description>
- 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.
</description>
<internalDefault>None</internalDefault>
@@ -522,7 +522,7 @@
</description>
<terminalInterface>
<commandLine>
- 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 @@
</examples>
</application>
-
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 @@
<description>
<p>
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 <def>Level2</def>
<def link="Cube">cubes</def> 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.
</p>
@@ -80,7 +80,7 @@
<history>
<change name="Travis Addair" date="2011-09-08">
- Original translation of the Davinci "blend" script into Isis 3.
+ Original translation of the Davinci "blend" script into ISIS.
</change>
<change name="Travis Addair" date="2011-11-30">
Added new queue technique to create the ramp, resulting in significant
@@ -256,7 +256,7 @@
<brief>
Mosaic of the output images for blend
</brief>
- <description>
+ <description>
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 <i>cam2map</i>. The <def link="Map Projection">map projection</def> is defined using a
<def>PVL</def> file which is specified in <i>cam2map</i> 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
<a href="https://isis.astrogeology.usgs.gov/fixit/projects/isis/wiki/Learning_About_Map_Projections">
"Learning About Map Projections"</a>.
@@ -950,7 +950,7 @@
<description>
This example is the first of two different runs of <i>cam2map</i>
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.
</description>
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 @@
<application name="caminfo" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Outputs a PVL file that contains camera information.
+ Outputs a PVL file that contains camera information.
</brief>
<description>
<p>
- 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.
</p>
<p>
@@ -20,22 +20,22 @@
running the spiceinit program from within caminfo.
</p>
<p>
- 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).
</p>
- <p>
+ <p>
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.
</p>
- <p>
+ <p>
The following is an example of caminfo output generated when in PVL format:
</p>
-<pre>
+<pre>
Object = Caminfo
Object = Parameters
Program = caminfo
@@ -204,14 +204,14 @@ End
<p>
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.
</p>
<p>
Definitions for most of the values output in the PVL file can be found in
- the ISIS 3 documentation glossary including: <def><b>SubSpacecraftLatitude</b></def>,
+ the ISIS documentation glossary including: <def><b>SubSpacecraftLatitude</b></def>,
<def><b>SubSpacecraftLongitude</b></def>, <def><b>SubSolarLatitude</b></def>,
- <def><b>SubSolarLongitude</b></def>, <def><b>NorthAzimuth</b></def>,
- <def><b>SpacecraftAzimuth</b></def>, <def><b>SubSolarAzimuth</b></def>,
+ <def><b>SubSolarLongitude</b></def>, <def><b>NorthAzimuth</b></def>,
+ <def><b>SpacecraftAzimuth</b></def>, <def><b>SubSolarAzimuth</b></def>,
<def><b>ObliqueLineResolution</b></def>, <def><b>ObliqueSampleResolution</b></def>,
<def><b>ObliquePixelResolution</b></def>, and <def><b>ObliqueDetectorResolution</b></def>
</p>
@@ -228,85 +228,85 @@ End
Fixed WKT calls
</change>
<change name="Tracie Sucharski" date="2007-11-09">
- 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.
</change>
- <change name="Kris Becker" date="2007-12-07">
- 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;
+ <change name="Kris Becker" date="2007-12-07">
+ 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.
</change>
- <change name="Kris Becker" date="2007-12-19">
- Renamed the HasLongitudeDomain keyword to HasLongitudeBoundary.
+ <change name="Kris Becker" date="2007-12-19">
+ Renamed the HasLongitudeDomain keyword to HasLongitudeBoundary.
Makes more sense.
</change>
- <change name="Kris Becker" date="2008-02-27">
- 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
+ <change name="Kris Becker" date="2008-02-27">
+ 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.
</change>
<change name="Steven Lambright" date="2008-05-12">
- Removed references to CubeInfo
+ Removed references to CubeInfo
</change>
<change name="Bob Sucharski" date="2008-07-31">
- 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.
</change>
- <change name="Kris Becker" date="2008-09-22">
- Reworked the output PVL format; added more keywords to the Common object
+ <change name="Kris Becker" date="2008-09-22">
+ 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.
</change>
- <change name="Kris Becker" date="2008-10-22">
- Corrected generation of polygon for multi-band data. It created a
+ <change name="Kris Becker" date="2008-10-22">
+ Corrected generation of polygon for multi-band data. It created a
POLYGON union instead of the required MULTIPOLYGON.
</change>
- <change name="Kris Becker" date="2008-10-30">
- The target center distance and subspacecraft latitude were not properly
- propagated to the output PVL file and consequently were invalid. This
+ <change name="Kris Becker" date="2008-10-30">
+ The target center distance and subspacecraft latitude were not properly
+ propagated to the output PVL file and consequently were invalid. This
has been corrected.
</change>
- <change name="Kris Becker" date="2008-12-29">
+ <change name="Kris Becker" date="2008-12-29">
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).
</change>
- <change name="Kris Becker" date="2009-02-26">
- 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
+ <change name="Kris Becker" date="2009-02-26">
+ 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.
</change>
- <change name="Kris Becker" date="2009-05-29">
- Added PIXINC parameter to allow user to specify number of pixels to
+ <change name="Kris Becker" date="2009-05-29">
+ Added PIXINC parameter to allow user to specify number of pixels to
skip around the perimeter of the image to compute the polygon.
</change>
- <change name="Kris Becker" date="2009-05-29">
- 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
+ <change name="Kris Becker" date="2009-05-29">
+ 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.)
</change>
<change name="Kris Becker" date="2009-07-08">
@@ -314,21 +314,21 @@ End
control limb and terminator polygon generation.
</change>
<change name="Kris Becker" date="2009-08-24">
- Allow disabling of shape model use when constructing polygons that
+ Allow disabling of shape model use when constructing polygons that
contain limbs.
</change>
<change name="Mackenzie Boyd" date="2010-06-14">
- 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.
</change>
<change name="Jai Rideout" date="2011-02-17">
Replaced PIXINC with POLYSINC and POLYLINC. Renamed SINC and LINC to
STATSSINC and STATSLINC.
</change>
<change name="Sharmila Prasad" date="2011-02-24">
- 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.
</change>
<change name="Jai Rideout" date="2011-03-01">
@@ -360,7 +360,7 @@ End
</change>
<change name="Kris Becker" date="2012-11-23">
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.
</change>
<change name="Janet Barrett" date="2013-01-29">
@@ -414,7 +414,7 @@ End
</filter>
</parameter>
</group>
-
+
<group name="General Output Options">
<parameter name="FORMAT">
<type>string</type>
@@ -434,7 +434,7 @@ End
<brief> Create CSV output </brief>
<description>
Caminfo data to be generated in Comma Separated Value (CSV) format
- </description>
+ </description>
<exclusions>
<item>ISISLABEL</item>
<item>ORIGINALLABEL</item>
@@ -444,27 +444,27 @@ End
</option>
</list>
</parameter>
-
+
<parameter name="APPEND">
<type>boolean</type>
<default><item>false</item></default>
<brief>Append caminfo information to existing data file</brief>
- <description> 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.
+ <description> 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.
</description>
</parameter>
-
+
<parameter name="GEOMETRY">
<type>boolean</type>
<brief>
Include geometry information
</brief>
<description>
- 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:
-
+
<UL>
<LI>BandsUsed</LI>
<LI>ReferenceBand</LI>
@@ -528,7 +528,7 @@ End
<parameter name="ISISLABEL">
<type>boolean</type>
<brief>
- Include ISIS label
+ Include ISIS label
</brief>
<description>
This option will extract the ISIS label and write it to the output PVL
@@ -540,7 +540,7 @@ End
<parameter name="ORIGINALLABEL">
<type>boolean</type>
<brief>
- Include the original label
+ Include the original label
</brief>
<description>
Include the original labels of the cube in the PVL.
@@ -555,7 +555,7 @@ End
</brief>
<description>
Include DN statistics for all bands within the cube. These data are
- contained in the Statistics object. The keyword/values contained
+ contained in the Statistics object. The keyword/values contained
therein are:
<UL>
<LI>MeanValue</LI>
@@ -579,7 +579,7 @@ End
Get camera statistics information
</brief>
<description>
- Run camstats to get camera information that can be expressed as a range.
+ Run camstats to get camera information that can be expressed as a range.
Camstats will run on the entire cube (common object), and for each band (bandset object).
The default linc and sinc for camstats is "1". The user can select a different linc and sinc.
Output values are:
@@ -633,7 +633,7 @@ End
<minimum inclusive="true">1</minimum>
</parameter>
</group>
-
+
<group name="Polygon Output Options">
<parameter name="USELABEL">
<type>boolean</type>
@@ -660,12 +660,12 @@ End
<type>boolean</type>
<default><item>FALSE</item></default>
<brief>
- Create polygon information
+ Create polygon information
</brief>
<description>
- Use the imagePolygon class to gather polygon information. The output
- polygon will be in well-known text format (WKT). These data are
- contained within the Polygon object. The keyword/values contained
+ Use the imagePolygon class to gather polygon information. The output
+ polygon will be in well-known text format (WKT). These data are
+ contained within the Polygon object. The keyword/values contained
therein are:
<UL>
<LI>CentroidLine</LI>
@@ -748,7 +748,7 @@ End
as well as a change to user input values.
</description>
</parameter>
-
+
<parameter name="POLYLINC">
<type>integer</type>
<internalDefault>10% of the cube's total lines</internalDefault>
@@ -794,7 +794,7 @@ End
</description>
<minimum inclusive="true">4</minimum>
</parameter>
-
+
<parameter name="MAXEMISSION">
<type>double</type>
<brief>
@@ -802,17 +802,17 @@ End
</brief>
<description>
<p>
- Specifies the maximum emission angle that a polygon point is
- allowed to have. This limit is useful for eliminating limb data
- that cause numerous ragged spikes. Limb data will generally
- result in odd polygon footprints as the geometry becomes
- unstable at the limb due to obliqueness particularly when using
- a DEM for the shape model (see spiceinit). This parameter
- restricts the emission angle to create better behaved polygons
+ Specifies the maximum emission angle that a polygon point is
+ allowed to have. This limit is useful for eliminating limb data
+ that cause numerous ragged spikes. Limb data will generally
+ result in odd polygon footprints as the geometry becomes
+ unstable at the limb due to obliqueness particularly when using
+ a DEM for the shape model (see spiceinit). This parameter
+ restricts the emission angle to create better behaved polygons
at the limb while sacrificing some (very oblique) data.
</p>
<p>
- Note: For images that have been run through spiceinit with a DEM, the
+ Note: For images that have been run through spiceinit with a DEM, the
emission angle range may need to be decreased. This will avoid the
instability that occurs at the limb and will avoid spiking of the
data.
@@ -827,11 +827,11 @@ End
Maximum incidence angle to include in polygon
</brief>
<description>
- Specifies the maximum incidence angle that a polygon point is
- allowed to have. This limit is useful for eliminating
- terminator data that will typically be lost in photometric
- corrections. This parameter restricts the incidence angle to
- create more data relevant polygons at the terminator while
+ Specifies the maximum incidence angle that a polygon point is
+ allowed to have. This limit is useful for eliminating
+ terminator data that will typically be lost in photometric
+ corrections. This parameter restricts the incidence angle to
+ create more data relevant polygons at the terminator while
sacrificing some (non-photometric) data.
</description>
<default><item>120.0</item></default>
@@ -846,12 +846,12 @@ End
Run spiceinit on the input
</brief>
<description>
- If the user sets this to true then the spiceinit program will be
- run on the input file. Spiceinit will use the system SPICE kernels,
- so any updates to SPICE information will be lost. Spiceinit is in
+ If the user sets this to true then the spiceinit program will be
+ run on the input file. Spiceinit will use the system SPICE kernels,
+ so any updates to SPICE information will be lost. Spiceinit is in
this program to facilitate UPC processing.
</description>
- </parameter>
+ </parameter>
</group>
<group name="Camera Test">
@@ -859,11 +859,11 @@ End
<type>boolean</type>
<default><item>FALSE</item></default>
<brief>
- Test image center for valid camera
+ Test image center for valid camera
</brief>
<description>
- If the user sets this parameter to true, a test will determine if a
- valid camera can be created at the center of the image band. If a
+ If the user sets this parameter to true, a test will determine if a
+ valid camera can be created at the center of the image band. If a
valid camera cannot be created the program will end. The default is to
output any available information without testing the camera.
</description>
diff --git a/isis/src/base/apps/crop/crop.cpp b/isis/src/base/apps/crop/crop.cpp
index a2e58b8fd1..27ef0a9914 100644
--- a/isis/src/base/apps/crop/crop.cpp
+++ b/isis/src/base/apps/crop/crop.cpp
@@ -5,29 +5,29 @@
using namespace std;
namespace Isis {
-
-
-
+
+
+
/**
* Crop a cube along a line, sample range. This is the programmatic interface to
- * the ISIS3 stats application.
+ * the ISIS stats application.
*
* @param ui The User Interface to parse the parameters from
- */
+ */
PvlGroup crop(UserInterface &ui) {
Cube *icube = new Cube();
- icube->open(ui.GetFileName("FROM"));
+ icube->open(ui.GetFileName("FROM"));
return crop(icube, ui);
}
-
+
/**
* Compute the stats for an ISIS cube. This is the programmatic interface to
- * the ISIS3 stats application.
+ * the ISIS stats application.
*
- * @param cube input cube to be cropped
+ * @param cube input cube to be cropped
* @param ui The User Interface to parse the parameters from
- */
+ */
PvlGroup crop(Cube *cube, UserInterface &ui) {
// Globals and prototypes
int ss, sl, sb;
diff --git a/isis/src/base/apps/deriv/work/deriv.html b/isis/src/base/apps/deriv/work/deriv.html
index 96595ed869..05c61c56cd 100644
--- a/isis/src/base/apps/deriv/work/deriv.html
+++ b/isis/src/base/apps/deriv/work/deriv.html
@@ -409,7 +409,7 @@
USGS</a>
<br>
<p style="margin-top:10px; margin-bottom:0px;">
- Isis 3 Application Documentation</p>
+ ISIS Application Documentation</p>
<hr>
<h1>deriv</h1>
<p style="margin-top:0px; font-style:italic;">
@@ -660,9 +660,9 @@
<tr valign="top">
<td class="tableCellLevel1_th" width="200" align="center"><script type="text/javascript">
<!--
-
+
//<!- -
-document.write("<a title='Click to view larger image' href='javascript:popUpNewWindow (\"assets/image/derivHorzGui.jpg\"," +
+document.write("<a title='Click to view larger image' href='javascript:popUpNewWindow (\"assets/image/derivHorzGui.jpg\"," +
500+ ", " + 600+ ")'>") ;
document.write("<img src=\"assets/thumb/derivHorzGui.jpg\""
@@ -670,7 +670,7 @@ document.write("<img src=\"assets/thumb/derivHorzGui.jpg\""
+ " height=" + 252
+ " alt=\"Derivative Gui\" class='blackBorderedImage'><" + "/a><br>") ;
//- ->
-
+
--></script>
<noscript>
<a title="Click to view larger image" href="assets/image/derivHorzGui.jpg" target="_new"><img src="assets/thumb/derivHorzGui.jpg" width="200" height="252" alt="Derivative Gui" class="blackBorderedImage"></a>
@@ -692,9 +692,9 @@ document.write("<img src=\"assets/thumb/derivHorzGui.jpg\""
<tr valign="top">
<td class="tableCellLevel1_th" width="200" align="center"><script type="text/javascript">
<!--
-
+
//<!- -
-document.write("<a title='Click to view larger image' href='javascript:popUpNewWindow (\"assets/image/peaks.4.jpg\"," +
+document.write("<a title='Click to view larger image' href='javascript:popUpNewWindow (\"assets/image/peaks.4.jpg\"," +
500+ ", " + 500+ ")'>") ;
document.write("<img src=\"assets/thumb/peaks.4.jpg\""
@@ -702,7 +702,7 @@ document.write("<img src=\"assets/thumb/peaks.4.jpg\""
+ " height=" + 200
+ " alt=\"Input image\" class='blackBorderedImage'><" + "/a><br>") ;
//- ->
-
+
--></script>
<noscript>
<a title="Click to view larger image" href="assets/image/peaks.4.jpg" target="_new"><img src="assets/thumb/peaks.4.jpg" width="200" height="200" alt="Input image" class="blackBorderedImage"></a>
@@ -730,9 +730,9 @@ document.write("<img src=\"assets/thumb/peaks.4.jpg\""
<tr valign="top">
<td class="tableCellLevel1_th" width="200" align="center"><script type="text/javascript">
<!--
-
+
//<!- -
-document.write("<a title='Click to view larger image' href='javascript:popUpNewWindow (\"assets/image/deriv.horz.jpg\"," +
+document.write("<a title='Click to view larger image' href='javascript:popUpNewWindow (\"assets/image/deriv.horz.jpg\"," +
500+ ", " + 500+ ")'>") ;
document.write("<img src=\"assets/thumb/deriv.horz.jpg\""
@@ -740,7 +740,7 @@ document.write("<img src=\"assets/thumb/deriv.horz.jpg\""
+ " height=" + 200
+ " alt=\"Output image showing results of the deriv application with direction: horizontal.\" class='blackBorderedImage'><" + "/a><br>") ;
//- ->
-
+
--></script>
<noscript>
<a title="Click to view larger image" href="assets/image/deriv.horz.jpg" target="_new"><img src="assets/thumb/deriv.horz.jpg" width="200" height="200" alt="Output image showing results of the deriv application with direction: horizontal." class="blackBorderedImage"></a>
@@ -789,9 +789,9 @@ document.write("<img src=\"assets/thumb/deriv.horz.jpg\""
<tr valign="top">
<td class="tableCellLevel1_th" width="200" align="center"><script type="text/javascript">
<!--
-
+
//<!- -
-document.write("<a title='Click to view larger image' href='javascript:popUpNewWindow (\"assets/image/derivVertGui.jpg\"," +
+document.write("<a title='Click to view larger image' href='javascript:popUpNewWindow (\"assets/image/derivVertGui.jpg\"," +
500+ ", " + 600+ ")'>") ;
document.write("<img src=\"assets/thumb/derivVertGui.jpg\""
@@ -799,7 +799,7 @@ document.write("<img src=\"assets/thumb/derivVertGui.jpg\""
+ " height=" + 252
+ " alt=\"Derivative Gui\" class='blackBorderedImage'><" + "/a><br>") ;
//- ->
-
+
--></script>
<noscript>
<a title="Click to view larger image" href="assets/image/derivVertGui.jpg" target="_new"><img src="assets/thumb/derivVertGui.jpg" width="200" height="252" alt="Derivative Gui" class="blackBorderedImage"></a>
@@ -821,9 +821,9 @@ document.write("<img src=\"assets/thumb/derivVertGui.jpg\""
<tr valign="top">
<td class="tableCellLevel1_th" width="200" align="center"><script type="text/javascript">
<!--
-
+
//<!- -
-document.write("<a title='Click to view larger image' href='javascript:popUpNewWindow (\"assets/image/peaks.4.jpg\"," +
+document.write("<a title='Click to view larger image' href='javascript:popUpNewWindow (\"assets/image/peaks.4.jpg\"," +
500+ ", " + 500+ ")'>") ;
document.write("<img src=\"assets/thumb/peaks.4.jpg\""
@@ -831,7 +831,7 @@ document.write("<img src=\"assets/thumb/peaks.4.jpg\""
+ " height=" + 200
+ " alt=\"Input image\" class='blackBorderedImage'><" + "/a><br>") ;
//- ->
-
+
--></script>
<noscript>
<a title="Click to view larger image" href="assets/image/peaks.4.jpg" target="_new"><img src="assets/thumb/peaks.4.jpg" width="200" height="200" alt="Input image" class="blackBorderedImage"></a>
@@ -859,9 +859,9 @@ document.write("<img src=\"assets/thumb/peaks.4.jpg\""
<tr valign="top">
<td class="tableCellLevel1_th" width="200" align="center"><script type="text/javascript">
<!--
-
+
//<!- -
-document.write("<a title='Click to view larger image' href='javascript:popUpNewWindow (\"assets/image/deriv.vert.jpg\"," +
+document.write("<a title='Click to view larger image' href='javascript:popUpNewWindow (\"assets/image/deriv.vert.jpg\"," +
500+ ", " + 500+ ")'>") ;
document.write("<img src=\"assets/thumb/deriv.vert.jpg\""
@@ -869,7 +869,7 @@ document.write("<img src=\"assets/thumb/deriv.vert.jpg\""
+ " height=" + 200
+ " alt=\"Output image showing results of the deriv application with direction: vertical.\" class='blackBorderedImage'><" + "/a><br>") ;
//- ->
-
+
--></script>
<noscript>
<a title="Click to view larger image" href="assets/image/deriv.vert.jpg" target="_new"><img src="assets/thumb/deriv.vert.jpg" width="200" height="200" alt="Output image showing results of the deriv application with direction: vertical." class="blackBorderedImage"></a>
diff --git a/isis/src/base/apps/equalizer/equalizer.xml b/isis/src/base/apps/equalizer/equalizer.xml
index d91bb0076f..0a841e143f 100644
--- a/isis/src/base/apps/equalizer/equalizer.xml
+++ b/isis/src/base/apps/equalizer/equalizer.xml
@@ -49,7 +49,7 @@
The addition of these RETRYBOTH and RECALCULATE parameters has modified the content of
the output statistics. Additional information is included in the output statistics
so that previously calculated overlap statistics can be reloaded when using these parameters.
- Note that statistics files created with previous versions of ISIS 3 can still be used as
+ Note that statistics files created with previous versions of ISIS can still be used as
input statistics.
</p>
<p>
diff --git a/isis/src/base/apps/errors/errors.xml b/isis/src/base/apps/errors/errors.xml
index 26d1d210b0..3501f39dad 100644
--- a/isis/src/base/apps/errors/errors.xml
+++ b/isis/src/base/apps/errors/errors.xml
@@ -21,7 +21,7 @@
Converted from Isis 2 to Isis 3
</change>
<change name="Steven Koechle" date="2008-06-13">
- Added PvlKeyword to top of print file that says how many errors the
+ Added PvlKeyword to top of print file that says how many errors the
print file contains. This value is also printed to the screen.
</change>
</history>
@@ -40,7 +40,7 @@
</item>
</default>
<description>
- The file is a default session log file output by Isis 3. This file is in PVL format.
+ The file is a default session log file output by Isis. This file is in PVL format.
</description>
</parameter>
@@ -56,7 +56,7 @@
</item>
</default>
<description>
- This file will be in Pvl format and contain the Session Logs from Isis 3 program runs that had errors.
+ This file will be in Pvl format and contain the Session Logs from Isis program runs that had errors.
</description>
</parameter>
</group>
diff --git a/isis/src/base/apps/fx/fx.xml b/isis/src/base/apps/fx/fx.xml
index 5d93b800fe..2f940ff0a3 100644
--- a/isis/src/base/apps/fx/fx.xml
+++ b/isis/src/base/apps/fx/fx.xml
@@ -7,30 +7,30 @@
<description>
<p>
- Fx allows general arithmetic operations to be performed on an arbitrary
+ Fx allows general arithmetic operations to be performed on an arbitrary
number of input cubes. Fx loads whatever input files are specified, applies
- a user defined equation to those files and writes the results to an output
- file. The input file can be a single band or multiple band cube file. If the
- band number is not specified for the multiple band cube file, then the
+ a user defined equation to those files and writes the results to an output
+ file. The input file can be a single band or multiple band cube file. If the
+ band number is not specified for the multiple band cube file, then the
equation is applied to all the bands within the file.
</p>
- <p>
- Five files or fewer can be entered for parameters F1 to F5 under the "Input
+ <p>
+ Five files or fewer can be entered for parameters F1 to F5 under the "Input
Cube Files" section to specify the input data. A second method to specify
- data is to include an arbitrary number of
- files in a file list and enter the list name in the fromlist parameter that
- is only visible upon selecting the MODE list located under "File I/O Mode."
- If the user selects "OUPUTONLY" under "File I/O Mode" then an output file is
+ data is to include an arbitrary number of
+ files in a file list and enter the list name in the fromlist parameter that
+ is only visible upon selecting the MODE list located under "File I/O Mode."
+ If the user selects "OUPUTONLY" under "File I/O Mode" then an output file is
created based on an equation provided by the user. The user will also need
to specify the number of lines, samples, and bands of the output file.
</p>
<p>
- The command line parsing has been improved to handle escape sequences and
- support arrays better. The equation parser is case insensitive, ignores
- whitespace, and converts all braces to parentheses. Parameter values,
+ The command line parsing has been improved to handle escape sequences and
+ support arrays better. The equation parser is case insensitive, ignores
+ whitespace, and converts all braces to parentheses. Parameter values,
when quoted, no longer need the quotes escaped.
</p>
-
+
<blockquote>
<small>
<p>
@@ -40,28 +40,28 @@
<p>
TCSH/BASH <br />
Before: crop from=\"some file.cub\" to=\"output file.cub\"<br />
- Now: crop from="some file.cub" to="output file.cub"<br />
+ Now: crop from="some file.cub" to="output file.cub"<br />
</p>
<p>
- Please note that the dollar sign ($) still requires a backslash for batchlist
- variables. Array values, for programs such as <i>spiceinit</i>, will be the same.
+ Please note that the dollar sign ($) still requires a backslash for batchlist
+ variables. Array values, for programs such as <i>spiceinit</i>, will be the same.
</p>
<p>
- TCSH<br />
- Before: spiceinit from=input.cub ck='(file1.bc,file2.bc)'<br />
- Now: spiceinit from=input.cub ck='(file1.bc,file2.bc)'<br />
+ TCSH<br />
+ Before: spiceinit from=input.cub ck='(file1.bc,file2.bc)'<br />
+ Now: spiceinit from=input.cub ck='(file1.bc,file2.bc)'<br />
</p>
<p>
BASH<br />
- Before: spiceinit from=input.cub ck='(file1.bc,file2.bc)'<br />
- Now: spiceinit from=input.cub ck='(file1.bc,file2.bc)'<br />
+ Before: spiceinit from=input.cub ck='(file1.bc,file2.bc)'<br />
+ Now: spiceinit from=input.cub ck='(file1.bc,file2.bc)'<br />
</p>
- <p>
- An escape character "\" has been added to differentiate a first parenthesis
+ <p>
+ An escape character "\" has been added to differentiate a first parenthesis
from the beginning of an array sequence.
</p>
@@ -78,43 +78,43 @@
</p>
<p>
- The equation string entered within a GUI interface may not work if the
- entire string is copied, pasted, and executed at the command line. If the first
- character in the equation is a "(" then it must be prefixed by a "\"
+ The equation string entered within a GUI interface may not work if the
+ entire string is copied, pasted, and executed at the command line. If the first
+ character in the equation is a "(" then it must be prefixed by a "\"
when executing as a command line, but the remaining parentheses do not
need to be prefixed with a backslash.
</p>
<p>
- Example:
+ Example:
</p>
<p>
- This equation string works inside the fx GUI:<br />
- fx f1=BIFQF23N004_D218_T069S02_V02_I3.cub to=tt.cub
- equation=(f1*(f1>.004))
+ This equation string works inside the fx GUI:<br />
+ fx f1=BIFQF23N004_D218_T069S02_V02_I3.cub to=tt.cub
+ equation=(f1*(f1>.004))
</p>
<p>
These equation strings fail on the command line: <br />
- fx f1=BIFQF23N004_D218_T069S02_V02_I3.cub to=tt.cub
+ fx f1=BIFQF23N004_D218_T069S02_V02_I3.cub to=tt.cub
equation=(f1*(f1>.004)) <br />
<br/>
- fx f1=BIFQF23N004_D218_T069S02_V02_I3.cub to=tt.cub
- equation="(f1*(f1>.004))"
+ fx f1=BIFQF23N004_D218_T069S02_V02_I3.cub to=tt.cub
+ equation="(f1*(f1>.004))"
</p>
<p>
This equation string works on the command line: <br />
- fx f1=BIFQF23N004_D218_T069S02_V02_I3.cub to=tt.cub
- equation="\(f1*(f1>.004))"<br />
+ fx f1=BIFQF23N004_D218_T069S02_V02_I3.cub to=tt.cub
+ equation="\(f1*(f1>.004))"<br />
</p>
-
+
<p>
- <b>Note:</b> The use of negative numbers within an equation could cause
- problems in the latest version of ISIS 3. The "--" or "neg" operators are
- specifically designed to handle negative numbers within an equation. If an
- equation includes a negative number, prefix the value with a "--" instead
+ <b>Note:</b> The use of negative numbers within an equation could cause
+ problems in the latest version of ISIS. The "--" or "neg" operators are
+ specifically designed to handle negative numbers within an equation. If an
+ equation includes a negative number, prefix the value with a "--" instead
of "-" in the equation.
<br/><br/>
Example:<br/><br/>
@@ -124,8 +124,8 @@
</p>
<p>
- For additional information see <b>Command Line Usage</b> under the User
- Documentation web pages for ISIS 3.<br />
+ For additional information see <b>Command Line Usage</b> under the User
+ Documentation web pages for ISIS.<br />
Note: Some instructions may be outdated.
</p>
@@ -134,28 +134,28 @@
<p>
The equation parser is case insensitive and all braces, such as
- "[{[{ }]}]" are converted to parentheses "(((( ))))" first. Whitespace
- is ignored. Currently, you must explicitly state all multiplication
- operations (e.g. 2pi will not work, but 2*pi will). The modulus (%),
- AND, and OR operators are not implemented yet. Functions
+ "[{[{ }]}]" are converted to parentheses "(((( ))))" first. Whitespace
+ is ignored. Currently, you must explicitly state all multiplication
+ operations (e.g. 2pi will not work, but 2*pi will). The modulus (%),
+ AND, and OR operators are not implemented yet. Functions
such as pha, ina, ema, lat, lon, radius, and resolution require a
<def>Level1</def> input file with <def>SPICE</def> information in the
- image labels. That is, the program <i>spiceinit</i> should be executed on the
- input files before using these functions. For <def>Level2</def> images,
- the backplanes containing the photometric and spatial information must be
- present. This is normally performed with the program <i>phocube</i>
+ image labels. That is, the program <i>spiceinit</i> should be executed on the
+ input files before using these functions. For <def>Level2</def> images,
+ the backplanes containing the photometric and spatial information must be
+ present. This is normally performed with the program <i>phocube</i>
before the image is projected to a <def>map projection</def>.
</p>
<p>
<b>Requirements and result of operators</b>
<br /><br />
- The following operators return a "0" or "1" DN value when they are used
- in the equations:
+ The following operators return a "0" or "1" DN value when they are used
+ in the equations:
</p>
<p>
<blockquote>
- < , >, <=, >=, ==, !=
+ < , >, <=, >=, ==, !=
</blockquote>
</p>
<p>
@@ -167,31 +167,31 @@
<<, >> <br /><br />
Example: <br />
<blockquote>
- Some pixels are set to NULL depending on whether the left or right pixel
- shift operation is used. For example, the left image below is the input file,
- and the right image is the result of "equation = f1 << 10", which shows a
+ Some pixels are set to NULL depending on whether the left or right pixel
+ shift operation is used. For example, the left image below is the input file,
+ and the right image is the result of "equation = f1 << 10", which shows a
10 pixel shift to the left. <br />
- <br/>
+ <br/>
Sample 1 line 1 of the left image maps outside the image area of the right image; therefore,
- sample 11 line 1 of the left image maps to sample 1 line 1 of the right image, and
- sample 12 line 1 of the left image maps to sample 2 line 1 of the right image. The
+ sample 11 line 1 of the left image maps to sample 1 line 1 of the right image, and
+ sample 12 line 1 of the left image maps to sample 2 line 1 of the right image. The
remaining pixels that do not have an assigned pixel value are set to NULL.
<br />
<br />
-
+
<img src="assets/image/fx_left_10_pixel_shift_example.png" alt="Left shift" width="487" height="285" />
<br />
</blockquote>
</blockquote>
-
+
</p>
<p>
- The following operators use the input image statistics to apply the
- equations:
+ The following operators use the input image statistics to apply the
+ equations:
</p>
<p>
<blockquote>
- linemin, linemax, cubemin, cubemax, cubeavg, cubestd
+ linemin, linemax, cubemin, cubemax, cubeavg, cubestd
</blockquote>
</p>
<p>
@@ -201,40 +201,40 @@
</p>
<p>
<blockquote>
- min, max
+ min, max
</blockquote>
</p>
<p>
In order to use the camera operators, images must be processed through <i>
- spiceinit</i> so that the NAIF camera model information is stored in the image
+ spiceinit</i> so that the NAIF camera model information is stored in the image
labels. <b>These operators calculate values on a band-by-band basis so that band-dependent
images have correctly calculated camera-related values</b>.
</p>
<p>
<blockquote>
pha, phal, phac, ina, inal, inac, ema, emal, emac <br />
- lat, lon, radius, resolution
+ lat, lon, radius, resolution
</blockquote>
</p>
<p>
- The following operators are used to convert between degrees and radians:
+ The following operators are used to convert between degrees and radians:
</p>
<p>
<blockquote>
- rads, degs
+ rads, degs
</blockquote>
</p>
<br />
<p>
- <b>All trigonometric functions expect angles in radians, not degrees.
- However, all camera functions return angles in degrees and therefore should
+ <b>All trigonometric functions expect angles in radians, not degrees.
+ However, all camera functions return angles in degrees and therefore should
be converted to radians. </b>
</p>
<br />
<p>
The following table shows all currently supported scalars and special tokens:
</p>
-
+
<table border = "1">
<tr>
<td colspan="3" align="center" valign="middle"><b>SCALARS</b></td>
@@ -281,13 +281,13 @@
</tr>
</table>
<br />
-
+
<p>
- The following table shows all currently supported operators sorted
- by precedence (0 = highest precedence). All examples are valid
- equations that assume one or more files (F1, F2, etc.) are loaded:
- </p>
-
+ The following table shows all currently supported operators sorted
+ by precedence (0 = highest precedence). All examples are valid
+ equations that assume one or more files (F1, F2, etc.) are loaded:
+ </p>
+
<table border = "1">
<tr>
<td colspan="4" align="center" valign="middle"><b>OPERATORS</b></td>
@@ -303,176 +303,176 @@
<td>{ [ ( ) ] }</td>
<td>Parentheses, brackets, or braces</td>
<td>f2*(f1+[30-{line/pi}])</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>-- or neg</td>
<td>Negative sign</td>
<td>--f1 + f2 or neg(f1) + f2</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>abs</td>
<td>Absolute value</td>
<td>abs(f2 - f1)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>min</td>
<td>Minimum of two DNs</td>
<td>f1 + min(5, f2) + min(f2, f3)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>max</td>
<td>Maximum of two DNs</td>
<td>20 * max(f1,f2)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>linemin</td>
<td>Minimum of DNs on the current line</td>
<td>f1 + linemin(f2)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>linemax</td>
<td>Maximum of DNs on the current line</td>
<td>f1 + linemax(f2)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>cubemin</td>
<td>Minimum of a cube</td>
<td>f1 + cubemin(f2)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>cubemax</td>
<td>Maximum of a cube</td>
<td>f1 + cubemax(f2)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>cubeavg</td>
<td>Average of a cube</td>
<td>f1 / cubeavg(f1)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>cubestd</td>
<td>Standard deviation of a cube</td>
<td>f1 * (abs(f1-cubeavg(f1)) < 2*cubestd(f1))</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>sin</td>
<td>Sine</td>
<td>f1 * sin(123/321)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>cos</td>
<td>Cosine</td>
<td>cos(.02*50)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>tan</td>
<td>Tangent</td>
<td>tan(f1/f2)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>csc</td>
<td>Cosecant</td>
<td>12.3 + csc(f1)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>sec</td>
<td>Secant</td>
<td>sin(pi/60) + (sec(f2))^2</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>cot</td>
<td>Cotangent</td>
<td>line + cot(f1) - 42</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>asin</td>
<td>Arcsine</td>
<td>0.006 ^ asin(f1*5)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>acos</td>
<td>Arccosine</td>
<td>acos(1/[2*pi])</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>atan</td>
<td>Arctangent</td>
<td>atan(f1/e)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>atan2</td>
<td>Arctangent2</td>
<td>atan2(--10 5.5)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>sinh</td>
<td>Hyperbolic sine</td>
<td>55 + sinh(f2)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>cosh</td>
<td>Hyperbolic cosine</td>
<td>cosh(sample^pi)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>tanh</td>
<td>Hyperbolic tangent</td>
<td>tanh(f1)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>log or ln</td>
<td>Natural log</td>
<td>ln(abs(1/[f2-f1]))</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>log10</td>
<td>Log base 10</td>
<td>99 + log10(f1-160)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>sqrt</td>
<td>Square root</td>
<td>sqrt(abs[1000 - f2])</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>pha</td>
<td><def>Phase angle</def> on the ellipsoid</td>
<td>pha(f1)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>ina</td>
<td><def>Incidence angle</def> on the ellipsoid</td>
<td>ina(f1)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>ema</td>
@@ -485,32 +485,32 @@
<td>phal</td>
<td>Local phase angle on DTM</td>
<td>phal(f1)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>inal</td>
<td><def>Local incidence angle</def> on DTM</td>
<td>inal(f1)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>emal</td>
<td><def>Local emission angle</def> on DTM</td>
<td>emal(f1)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>phac</td>
<td><def>Phase angle</def> on the ellipsoid at image center</td>
<td>phac(f1)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>inac</td>
<td><def>Incidence angle</def> on the ellipsoid at image center</td>
<td>inac(f1)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>emac</td>
@@ -523,40 +523,40 @@
<td>rads</td>
<td>Convert degrees to radians</td>
<td>f1 / cos(rads(pha(f1)))</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>degs</td>
<td>Convert radians to degrees</td>
<td>degs(acos(f1))</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>lat</td>
<td><def>Latitude</def></td>
<td>lat(f1)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>lon</td>
<td><def>Longitude</def></td>
<td>lon(f1)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>radius</td>
<td><def>Radius</def> of DTM in meters</td>
<td>radius(f1)</td>
- </tr>
+ </tr>
<tr>
<td>1</td>
<td>res</td>
<td><def>Pixel resolution</def> in meters</td>
<td>res(f1)</td>
- </tr>
+ </tr>
<tr>
@@ -564,82 +564,82 @@
<td>^</td>
<td>Exponent</td>
<td>f1 ^ 3</td>
- </tr>
+ </tr>
<tr>
<td>3</td>
<td>*</td>
<td>Multiplication</td>
<td>10 * f1</td>
- </tr>
+ </tr>
<tr>
<td>3</td>
<td>/</td>
<td>Division</td>
<td>f2 / f1</td>
- </tr>
+ </tr>
<tr>
<td>4</td>
<td><<</td>
<td>Left shift <b><i>(Note: pixel shift, not bitwise)</i></b></td>
<td>f1 << 250</td>
- </tr>
+ </tr>
<tr>
<td>4</td>
<td>>></td>
<td>Right shift <b><i>(Note: pixel shift, not bitwise)</i></b></td>
<td>f2 + (f1 >> 500)</td>
- </tr>
+ </tr>
<tr>
<td>5</td>
<td>+</td>
<td>Addition</td>
<td>123 + 0.004 + f1</td>
- </tr>
+ </tr>
<tr>
<td>5</td>
<td>-</td>
<td>Subtraction</td>
<td>10 - (--f1)</td>
- </tr>
+ </tr>
<tr>
<td>6</td>
<td>></td>
<td>Greater than <b><i>(Note: result is 0 or 1)</i></b></td>
<td>f1 > f2</td>
- </tr>
+ </tr>
<tr>
<td>6</td>
<td><</td>
<td>Less than <b><i>(Note: result is 0 or 1)</i></b></td>
<td>f1 * (f1 < cubeavg(f1)) </td>
- </tr>
+ </tr>
<tr>
<td>6</td>
<td><=</td>
<td>Less than or equal <b><i>(Note: result is 0 or 1)</i></b></td>
<td>f1 <= 0.505</td>
- </tr>
+ </tr>
<tr>
<td>6</td>
<td>>=</td>
<td>Greater than or equal <b><i>(Note: result is 0 or 1)</i></b></td>
<td>f1 * (f1 >= 101)</td>
- </tr>
+ </tr>
<tr>
<td>6</td>
<td>==</td>
<td>Equal to <b><i>(Note: result is 0 or 1)</i></b></td>
<td>f1 == (f2/2)</td>
- </tr>
+ </tr>
<tr>
<td>6</td>
<td>!=</td>
<td>Not equal to <b><i>(Note: result is 0 or 1)</i></b></td>
<td>f1 != f2</td>
- </tr>
- </table>
-
+ </tr>
+ </table>
+
</description>
<category>
@@ -703,14 +703,14 @@
</change>
</history>
- <groups>
+ <groups>
<group name = "Files">
<parameter name = "F1">
<type>cube</type>
<fileMode>input</fileMode>
<brief>Input filename</brief>
<description>
- Input ISIS 3 cube filename.
+ Input ISIS cube filename.
</description>
<filter>
*.cub
@@ -723,7 +723,7 @@
<internalDefault>None</internalDefault>
<brief>Input filename</brief>
<description>
- Input ISIS 3 cube filename.
+ Input ISIS cube filename.
</description>
<filter>
*.cub
@@ -736,7 +736,7 @@
<internalDefault>None</internalDefault>
<brief>Input filename</brief>
<description>
- Input ISIS 3 cube filename.
+ Input ISIS cube filename.
</description>
<filter>
*.cub
@@ -749,7 +749,7 @@
<internalDefault>None</internalDefault>
<brief>Input filename</brief>
<description>
- Input ISIS 3 cube filename.
+ Input ISIS cube filename.
</description>
<filter>
*.cub
@@ -762,7 +762,7 @@
<internalDefault>None</internalDefault>
<brief>Input filename</brief>
<description>
- Input ISIS 3 cube filename.
+ Input ISIS cube filename.
</description>
<filter>
*.cub
@@ -784,14 +784,14 @@
</filter>
</parameter>
</group>
-
+
<group name = "File list">
<parameter name = "FROMLIST">
<type>filename</type>
<fileMode>input</fileMode>
<brief>Input list filename</brief>
<description>
- This file contains a list of all the cube files to be processed.
+ This file contains a list of all the cube files to be processed.
Each file will be assigned F1 to F##(number of images in the input list).
</description>
<filter>
@@ -805,7 +805,7 @@
<type>string</type>
<brief>Image processing equation</brief>
<description>
- This equation will be parsed and used to perform the specified
+ This equation will be parsed and used to perform the specified
calculations.
</description>
</parameter>
@@ -817,8 +817,8 @@
<default><item>CUBES</item></default>
<brief>File I/O options</brief>
<description>
- Select one of the following options: <i>CUBES</i> to input cubes directly,
- <i>LIST</i> to enter a text file containing a list of filenames,
+ Select one of the following options: <i>CUBES</i> to input cubes directly,
+ <i>LIST</i> to enter a text file containing a list of filenames,
or <i>OUTPUTONLY</i> to create output data only.
</description>
<list>
@@ -834,7 +834,7 @@
<item>BANDS</item>
</exclusions>
</option>
-
+
<option value = "LIST">
<brief>Specify a list of input files</brief>
<description>
@@ -851,7 +851,7 @@
<item>BANDS</item>
</exclusions>
</option>
-
+
<option value = "OUTPUTONLY">
<brief>Write output only</brief>
<description>
@@ -902,18 +902,18 @@
</parameter>
</group>
-
+
</groups>
<examples>
<example>
<brief>Add two images</brief>
<description>
- In this example, two images with the same filename but have two different bands
+ In this example, two images with the same filename but have two different bands
will be added to each other.
</description>
<terminalInterface>
- <commandLine>
+ <commandLine>
f1=../isisTruth.cub+1 f2=../isisTruth.cub+2 to=../result.cub equation=f1+ f2
</commandLine>
<description>
@@ -924,8 +924,8 @@
<guiInterface>
<image width="500" height="500" src="assets/image/fxgui.jpg">
<brief>Example GUI</brief>
- <description>Screenshot of GUI with parameters filled in to perform a
- calculation on the input image.
+ <description>Screenshot of GUI with parameters filled in to perform a
+ calculation on the input image.
</description>
<thumbnail width="200" height="246" caption="fx GUI" src="assets/thumb/fxgui.jpg" />
</image>
@@ -966,7 +966,7 @@
<example>
<brief>Create output only </brief>
<description>
- In this example, an output file that is 360 samples by 360 lines is created
+ In this example, an output file that is 360 samples by 360 lines is created
by converting the line number to radians, and then calculating the cosine of the
calculated value using the following equation:
<blockquote>
@@ -975,14 +975,14 @@
The line number is input as degrees and converted to radians first in order
to output the correct cosine values.
</description>
-
+
<terminalInterface>
- <commandLine>
+ <commandLine>
to=cosine_of_line.cub equation="cos(rads(line))" mode=outputonly lines=360
samples=360
</commandLine>
<description>
- Convert the line number to radians, calculate the cosine of the new value, and
+ Convert the line number to radians, calculate the cosine of the new value, and
output the results to the output filename provided by the user.
</description>
</terminalInterface>
@@ -1000,7 +1000,7 @@
<thumbnail caption="Output image" src="assets/thumb/thumb_cosine_of_line.jpg" width="180" height="180"/>
<parameterName>TO</parameterName>
</image>
- </outputImages>
+ </outputImages>
<guiInterfaces>
<guiInterface>
@@ -1016,19 +1016,19 @@
<example>
<brief>Create output only</brief>
<description>
- The example below demonstrates how easily one can get an incorrect product
- if angles are not converted to radians before calculating the cosine of a
- line number when the line number represents angles in degrees. In this example,
+ The example below demonstrates how easily one can get an incorrect product
+ if angles are not converted to radians before calculating the cosine of a
+ line number when the line number represents angles in degrees. In this example,
the output file has 360 samples by 360 lines.
</description>
-
+
<terminalInterface>
- <commandLine>
- to=cosine_of_line_deg.cub equation="cos(line)" mode=outputonly
+ <commandLine>
+ to=cosine_of_line_deg.cub equation="cos(line)" mode=outputonly
lines=360 samples=360
</commandLine>
<description>
- Calculate the cosine of the line number, and output the results to
+ Calculate the cosine of the line number, and output the results to
the output filename provided by the user.
</description>
</terminalInterface>
@@ -1037,7 +1037,7 @@
<image src="assets/image/cosine_of_line_deg.jpg" width="360" height="360">
<brief>Output file</brief>
<description>
- This is the output file created based on a user defined equation
+ This is the output file created based on a user defined equation
without specifying input filenames.
<br /><br />
<b>Parameter Name:</b> EQUATION <br /><br />
@@ -1046,15 +1046,15 @@
<thumbnail caption="Output image" src="assets/thumb/thumb_cosine_of_line_deg.jpg" width="180" height="180"/>
<parameterName>TO</parameterName>
</image>
- </outputImages>
+ </outputImages>
<guiInterfaces>
<guiInterface>
<image width="730" height="679" src="assets/image/fx_gui_cosine_line_deg_full.jpg">
<brief>Example GUI</brief>
<description>
- Screenshot of GUI with parameters filled in to perform a
- calculation to create an output image.
+ Screenshot of GUI with parameters filled in to perform a
+ calculation to create an output image.
</description>
<thumbnail width="300" height="272" caption="fx GUI" src="assets/thumb/fx_gui_cosine_line_deg_thumb.jpg" />
</image>
@@ -1066,19 +1066,19 @@
<example>
<brief>Apply a gamma stretch</brief>
<description>
- In this example, a gamma stretch is applied to a CTX image. The image
- statistics are determined and used as part of the equation to calculate
+ In this example, a gamma stretch is applied to a CTX image. The image
+ statistics are determined and used as part of the equation to calculate
new DN values.
</description>
-
+
<terminalInterface>
- <commandLine>
- f1=B10_013516_1520_XN_28S285W_eo_reduced.cub
- to=B10_013516_1520_XN_28S285W_gammast2.cub
+ <commandLine>
+ f1=B10_013516_1520_XN_28S285W_eo_reduced.cub
+ to=B10_013516_1520_XN_28S285W_gammast2.cub
equation="{[cubemax(f1)-abs(cubemin(f1))]*{[f1-abs(cubemin(f1))]/[cubemax(f1)-abs(cubemin(f1))]}^(1.0/1.8)}"
</commandLine>
<description>
- Apply an equation to perform a gamma stretch to the image utilizing
+ Apply an equation to perform a gamma stretch to the image utilizing
the input image statistics.
</description>
</terminalInterface>
@@ -1093,13 +1093,13 @@
<parameterName>F1</parameterName>
</image>
</inputImages>
-
+
<outputImages>
<image src="assets/image/B10_013516_1520_XN_28S285W_gammast.jpg" width="1667" height="1366">
<brief> Output file</brief>
- <description>
+ <description>
This is the output image where the bright and dark tones in the input
- image are adjusted based on the input image statistics that are incorporated
+ image are adjusted based on the input image statistics that are incorporated
into the equation that is applied to calculate new output values.
<br /><br />
<b>Parameter Name:</b> EQUATION <br /><br/>
@@ -1109,7 +1109,7 @@
<parameterName>TO</parameterName>
</image>
</outputImages>
-
+
<guiInterfaces>
<guiInterface>
<image width="728" height="1036" src="assets/image/fx_gui_gammast_reduced.jpg">
@@ -1120,17 +1120,17 @@
</guiInterface>
</guiInterfaces>
</example>
-
+
<example>
<brief>Create mask file</brief>
<description>
- In this example, all input DN values greater than 0.11 is set to "1.0"
- and all other pixels set to "0.0".
+ In this example, all input DN values greater than 0.11 is set to "1.0"
+ and all other pixels set to "0.0".
</description>
-
+
<terminalInterface>
- <commandLine>
- f1=B10_013516_1520_XN_28S285W_eo_reduced.cub
+ <commandLine>
+ f1=B10_013516_1520_XN_28S285W_eo_reduced.cub
to=B10_013516_1520_XN_28S285W_mask.cub equation="f1>0.11"
</commandLine>
<description>
@@ -1149,12 +1149,12 @@
<parameterName>F1</parameterName>
</image>
</inputImages>
-
+
<outputImages>
<image src="assets/image/B10_013516_1520_XN_28S285W_eo_mask.jpg" width="1667" height="1366">
<brief> Output file</brief>
- <description>
- This is an image consisting of "0" and "1" DN values based on
+ <description>
+ This is an image consisting of "0" and "1" DN values based on
the equation provided.
<br /><br />
<b>Parameter Name:</b> EQUATION <br /><br />
@@ -1175,20 +1175,20 @@
</guiInterface>
</guiInterfaces>
</example>
-
+
<example>
<brief>Extract desired data</brief>
<description>
- In this example, all DN values less than 0.11 will be set to "0.0" and
- all other DN values will retain the original input value.
+ In this example, all DN values less than 0.11 will be set to "0.0" and
+ all other DN values will retain the original input value.
</description>
<terminalInterface>
- <commandLine>
- f1=B10_013516_1520_XN_28S285W_eo_reduced.cub
+ <commandLine>
+ f1=B10_013516_1520_XN_28S285W_eo_reduced.cub
to=B10_013516_1520_XN_28S285W_extract.cub equation="f1*(f1>0.11)"
</commandLine>
<description>
- Apply the equation to retain all DN values greater than 0.11,
+ Apply the equation to retain all DN values greater than 0.11,
and set all other values to 0.0.
</description>
</terminalInterface>
@@ -1203,13 +1203,13 @@
<parameterName>F1</parameterName>
</image>
</inputImages>
-
+
<outputImages>
<image src="assets/image/B10_013516_1520_XN_28S285W_eo_extract_fullqview.jpg" width="2493" height="1390">
<brief> Output file</brief>
- <description> The pink areas in this image were set to "0.0" based
+ <description> The pink areas in this image were set to "0.0" based
on the equation entered. All other values retained the original values
- because the input value was multiplied by 1.0 when the calculations
+ because the input value was multiplied by 1.0 when the calculations
were performed.
<br /><br />
<b>Parameter Name:</b> EQUATION <br /><br />
@@ -1229,7 +1229,7 @@
</image>
</guiInterface>
</guiInterfaces>
- </example>
+ </example>
</examples>
</application>
diff --git a/isis/src/base/apps/interestcube/interestcube.xml b/isis/src/base/apps/interestcube/interestcube.xml
index 40e99313e1..de301f2108 100644
--- a/isis/src/base/apps/interestcube/interestcube.xml
+++ b/isis/src/base/apps/interestcube/interestcube.xml
@@ -10,18 +10,18 @@
<p>
This program, interestcube, uses an interest operator to quantify how interesting each point
of the input cube is. The size of the output cube matches the input cube. Each DN value of
- the output cube represents the quality of interest that corresponds to points in the input
- cube. The values of the output cube represent the quality of interest of each corresponding
+ the output cube represents the quality of interest that corresponds to points in the input
+ cube. The values of the output cube represent the quality of interest of each corresponding
point in the input cube.
</p>
<p>
- The user must select an interest operator (algorithm) from one of the following:
+ The user must select an interest operator (algorithm) from one of the following:
1) Förstner, 2) Gradient 3) Moravec and 4) Standard Deviation. The operator and its required
- values are specified in the input PVL parameter for interestcube. This input PVL is a text
+ values are specified in the input PVL parameter for interestcube. This input PVL is a text
file that may be copied from the Examples section of this page.
</p>
<p>
- Note: Forstner operator output will need to be manually stretched to see visual results,
+ Note: Forstner operator output will need to be manually stretched to see visual results,
due to the wide range of values it creates.
</p>
</description>
@@ -36,14 +36,14 @@
Renamed app from "interest" -> "interestcube"
</change>
<change name="Sharmila Prasad" date="2010-04-14">
- Create a universal ground map of the input cube to be passed onto the
+ Create a universal ground map of the input cube to be passed onto the
Interest Operator to calculate the Emission Angle
</change>
<change name="Ian Humphrey" date="2014-06-03">
Closed the open cube to prevent errors from running sequential data in GUI. Fixes #1002.
</change>
<change name="Makayla Shepherd" date="2015-02-06">
- Initialized the global variables and changed the catch in ISISMain in order to
+ Initialized the global variables and changed the catch in ISISMain in order to
close the cube before the exception is thrown. Fixes #2124, 2125.
</change>
<change name="Curtis Rose" date="2016-04-29">
@@ -105,7 +105,7 @@
Using interestcube with Förstner operator.
</brief>
<description>
- The use of Interest to ingest an ISIS 3 cube and output a cube with interest values.
+ The use of Interest to ingest an ISIS cube and output a cube with interest values.
</description>
<terminalInterface>
<commandLine>
@@ -114,12 +114,12 @@
to= out.cub
</commandLine>
<description>
- This example shows the use of interestcube to create an ISIS 3 cube of interest
- values from a standard ISIS 3 cube. This example will use a 3x3 boxcar using the
+ This example shows the use of interestcube to create an ISIS cube of interest
+ values from a standard ISIS cube. This example will use a 3x3 boxcar using the
Förstner Operator.
</description>
</terminalInterface>
-
+
<guiInterfaces>
<guiInterface>
<image width="450" height="550" src="assets/images/InterestGUI.jpg">
@@ -143,7 +143,7 @@
<description>
The input cube that the Interest Operator is to run on.
</description>
- <thumbnail caption= "This is the input ISIS 3 cube."
+ <thumbnail caption= "This is the input ISIS cube."
src="assets/thumbs/ab102401.jpg" width="167" height="200"/>
<parameterName>FROM</parameterName>
</image>
@@ -160,16 +160,16 @@
<parameterName>PVL</parameterName>
</dataFile>
</dataFiles>
-
+
<outputImages>
<image width="550" height="550" src="assets/images/forstner.jpg">
<brief>
Output image after processing.
</brief>
<description>
- The interest cube image after processing. To view a Förstner image you MUST manually
+ The interest cube image after processing. To view a Förstner image you MUST manually
stretch the image. This image has been stretched from 0 to 1.67854e-27. Keep in mind
- if you dont do this, the data in the cube will be valid, but will display all white in
+ if you dont do this, the data in the cube will be valid, but will display all white in
qview.
</description>
<thumbnail caption= "Cube full of interest values after processing."
@@ -184,7 +184,7 @@
Using interestcube with gradient operator.
</brief>
<description>
- The use of Interst to ingest an ISIS 3 cube and output a cube with interest values.
+ The use of Interst to ingest an ISIS cube and output a cube with interest values.
</description>
<terminalInterface>
<commandLine>
@@ -193,12 +193,12 @@
to= out.cub
</commandLine>
<description>
- This example shows the use of interestcube to create an ISIS 3 cube of interest
- values from a standard ISIS 3 cube. This example will use a 3x3 boxcar using the
+ This example shows the use of interestcube to create an ISIS cube of interest
+ values from a standard ISIS cube. This example will use a 3x3 boxcar using the
Gradient Operator.
</description>
</terminalInterface>
-
+
<guiInterfaces>
<guiInterface>
<image width="450" height="550" src="assets/images/InterestGUI.jpg">
@@ -222,7 +222,7 @@
<description>
The input cube that the Interest Operator is to run on.
</description>
- <thumbnail caption= "This is the input Isis 3 cube."
+ <thumbnail caption= "This is the input ISIS cube."
src="assets/thumbs/ab102401.jpg" width="167" height="200"/>
<parameterName>FROM</parameterName>
</image>
@@ -239,7 +239,7 @@
<parameterName>PVL</parameterName>
</dataFile>
</dataFiles>
-
+
<outputImages>
<image width="458" height="550" src="assets/images/gradient.jpg">
<brief>
@@ -260,7 +260,7 @@
Using interestcube with Moravec operator.
</brief>
<description>
- The use of Interst to ingest an ISIS 3 cube and output a cube with interest values.
+ The use of Interst to ingest an ISIS cube and output a cube with interest values.
</description>
<terminalInterface>
<commandLine>
@@ -269,12 +269,12 @@
to= out.cub
</commandLine>
<description>
- This example shows the use of interestcube to create an ISIS 3 cube of interest
- values from a standard ISIS 3 cube. This example will use a 3x3 boxcar using the
+ This example shows the use of interestcube to create an ISIS cube of interest
+ values from a standard ISIS cube. This example will use a 3x3 boxcar using the
Moravec Operator.
</description>
</terminalInterface>
-
+
<guiInterfaces>
<guiInterface>
<image width="450" height="550" src="assets/images/InterestGUI.jpg">
@@ -298,7 +298,7 @@
<description>
The input cube that the Interest Operator is to run on.
</description>
- <thumbnail caption= "This is the input Isis 3 cube."
+ <thumbnail caption= "This is the input ISIS cube."
src="assets/thumbs/ab102401.jpg" width="167" height="200"/>
<parameterName>FROM</parameterName>
</image>
@@ -315,7 +315,7 @@
<parameterName>PVL</parameterName>
</dataFile>
</dataFiles>
-
+
<outputImages>
<image width="458" height="550" src="assets/images/moravec.jpg">
<brief>
@@ -336,7 +336,7 @@
Using interestcube with Standard Deviation operator using a Small Boxcar (3x3).
</brief>
<description>
- The use of Interest to ingest an ISIS 3 cube and output a cube with interest values.
+ The use of Interest to ingest an ISIS cube and output a cube with interest values.
</description>
<terminalInterface>
<commandLine>
@@ -345,12 +345,12 @@
to= out.cub
</commandLine>
<description>
- This example shows the use of interestcube to create an ISIS 3 cube of interest
- values from a standard ISIS 3 cube. This example will use a 3x3 boxcar using the
+ This example shows the use of interestcube to create an ISIS cube of interest
+ values from a standard ISIS cube. This example will use a 3x3 boxcar using the
Standard Deviation Operator.
</description>
</terminalInterface>
-
+
<guiInterfaces>
<guiInterface>
<image width="450" height="550" src="assets/images/InterestGUI.jpg">
@@ -374,7 +374,7 @@
<description>
The input cube that the Interest Operator is to run on.
</description>
- <thumbnail caption= "This is the input Isis 3 cube."
+ <thumbnail caption= "This is the input ISIS cube."
src="assets/thumbs/ab102401.jpg" width="167" height="200"/>
<parameterName>FROM</parameterName>
</image>
@@ -391,7 +391,7 @@
<parameterName>PVL</parameterName>
</dataFile>
</dataFiles>
-
+
<outputImages>
<image width="458" height="550" src="assets/images/stddev.jpg">
<brief>
@@ -412,7 +412,7 @@
Using interestcube with Standard Deviation operator and a Large Boxcar (15x15).
</brief>
<description>
- The use of Interst to ingest an ISIS 3 cube and output a cube with interest values. This
+ The use of Interst to ingest an ISIS cube and output a cube with interest values. This
uses StandardDeviationOperator and a large boxcar to show the blurring effect of using
a larger boxcar.
</description>
@@ -423,8 +423,8 @@
to= out.cub
</commandLine>
<description>
- This example shows the use of interestcube to create an ISIS 3 cube of
- interest values from a standard ISIS 3 cube. This example will use a 15x15
+ This example shows the use of interestcube to create an ISIS cube of
+ interest values from a standard ISIS cube. This example will use a 15x15
boxcar using the StandardDeviationOperator.
</description>
</terminalInterface>
@@ -452,7 +452,7 @@
<description>
The input cube that the Interest Operator is to run on.
</description>
- <thumbnail caption= "This is the input ISIS 3 cube."
+ <thumbnail caption= "This is the input ISIS cube."
src="assets/thumbs/ab102401.jpg" width="167" height="200"/>
<parameterName>FROM</parameterName>
</image>
diff --git a/isis/src/base/apps/isis2pds/isis2pds.cpp b/isis/src/base/apps/isis2pds/isis2pds.cpp
index 39986a8be2..10f7174e6b 100644
--- a/isis/src/base/apps/isis2pds/isis2pds.cpp
+++ b/isis/src/base/apps/isis2pds/isis2pds.cpp
@@ -132,7 +132,7 @@ namespace Isis{
PvlObject *label= icube->label();
if (!label->hasObject("IsisCube")) {
QString msg = "Input file [" + ui.GetFileName("FROM") +
- "] does not appear to be an ISIS3 cube.";
+ "] does not appear to be an ISIS cube.";
throw IException(IException::User, msg, _FILEINFO_);
}
diff --git a/isis/src/base/apps/isis2pds/isis2pds.xml b/isis/src/base/apps/isis2pds/isis2pds.xml
index a3de4fd8be..79c6e5975b 100644
--- a/isis/src/base/apps/isis2pds/isis2pds.xml
+++ b/isis/src/base/apps/isis2pds/isis2pds.xml
@@ -3,19 +3,19 @@
<application name="isis2pds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Convert from ISIS3 cube to PDS 3 or PDS 4 format
+ Convert from ISIS cube to PDS 3 or PDS 4 format
</brief>
<description>
Program to convert cubes to PDS3 or PDS4 image files.
- For PDS4, If available, Instrument and Mapping information will be written to the detached output PDS4 formatted xml label file.
+ For PDS4, If available, Instrument and Mapping information will be written to the detached output PDS4 formatted xml label file.
<p>
- Not all values in the generated PDS4 labels can be determined automatically by ISIS3, and some must be updated by the user (by opening up the xml label output by this application and editing it with a text editor) for the generated label to be PDS4 compliant. The values UNK (unknown) and TBD (to be determined) are used as placeholders in the generated label. TBD values must be replaced by the user for the output label to be PDS4 compliant. Some of these TBDs can only be replaced with one of several specific enumerated values to meet compliancy. These possible values can be found in the <a href="https://pds.jpl.nasa.gov/pds4/doc/im/current/index_1900.html">PDS 4 Information Model Specification</a> in the Value/Class column of the table for the associated tag or in the index at the end of the document. Searching this page for the name of the field you need to determine a value for is recommended.
+ Not all values in the generated PDS4 labels can be determined automatically by ISIS3, and some must be updated by the user (by opening up the xml label output by this application and editing it with a text editor) for the generated label to be PDS4 compliant. The values UNK (unknown) and TBD (to be determined) are used as placeholders in the generated label. TBD values must be replaced by the user for the output label to be PDS4 compliant. Some of these TBDs can only be replaced with one of several specific enumerated values to meet compliancy. These possible values can be found in the <a href="https://pds.jpl.nasa.gov/pds4/doc/im/current/index_1900.html">PDS 4 Information Model Specification</a> in the Value/Class column of the table for the associated tag or in the index at the end of the document. Searching this page for the name of the field you need to determine a value for is recommended.
</p>
<p>
-For example: For a cube with map-projected data, ISIS3 will populate planar_coordinate encoding_method with a value on its own, but if it did not and instead had "TBD", we would find at <a href="https://pds.jpl.nasa.gov/pds4/doc/im/current/index_1900.html#attribute_cart_planar_coordinate_information_cart_planar_coordinate_encoding_method">planar_coordinate_coding_method</a> that there are 3 possible values: 'Coordinate Pair', 'Distance and Bearing', 'Row and Column'.
+For example: For a cube with map-projected data, ISIS will populate planar_coordinate encoding_method with a value on its own, but if it did not and instead had "TBD", we would find at <a href="https://pds.jpl.nasa.gov/pds4/doc/im/current/index_1900.html#attribute_cart_planar_coordinate_information_cart_planar_coordinate_encoding_method">planar_coordinate_coding_method</a> that there are 3 possible values: 'Coordinate Pair', 'Distance and Bearing', 'Row and Column'.
</p>
<p>
@@ -24,7 +24,7 @@ Not everything is in the <a href="https://pds.jpl.nasa.gov/pds4/doc/im/current/
<p>
UNK is used as a placeholder if any value can be used and still be a valid PDS4-formatted xml header. UNKs can, but are not required to be, replaced by the user with
-better information.
+better information.
</p>
</description>
@@ -50,13 +50,13 @@ better information.
image label. This checksum is generated from the image data. Fixes #1013.
</change>
<change name="Jeannie Backer, Mayayla Shepard, and Kristin Berry" date="2017-10-27">
- Added PDS4 output option. Previously, this application converted ISIS3 cubes to PDS3 format only.
+ Added PDS4 output option. Previously, this application converted ISIS cubes to PDS3 format only.
</change>
<change name="Jeannie Backer" date="2017-11-13">
- Updated to attach *.img extension to pds4 output data file.
+ Updated to attach *.img extension to pds4 output data file.
</change>
<change name="Kristin Berry" date="2017-11-26">
- Updated with very basic documentation about the PDS4 output labels.
+ Updated with very basic documentation about the PDS4 output labels.
</change>
</history>
@@ -83,7 +83,7 @@ better information.
Output pds image
</brief>
<description>
- The resulting pds file. For PDS4, a detached label of the same name with the file extension .xml
+ The resulting pds file. For PDS4, a detached label of the same name with the file extension .xml
will be created in the same directory.
</description>
<filter>
@@ -103,15 +103,15 @@ better information.
</description>
<list>
<option value="PDS3">
- <brief>Convert ISIS3 cube to PDS3 format</brief>
+ <brief>Convert ISIS cube to PDS3 format</brief>
<description>
- Convert ISIS3 cube to PDS3 format.
+ Convert ISIS cube to PDS3 format.
</description>
</option>
<option value="PDS4">
- <brief>Convert ISIS3 cube to PDS4 format</brief>
+ <brief>Convert ISIS cube to PDS4 format</brief>
<description>
- Convert ISIS3 cube to PDS4 format.
+ Convert ISIS cube to PDS4 format.
</description>
<exclusions>
<item>LABTYPE</item>
@@ -261,7 +261,7 @@ better information.
If set to true, then an MD5 checksum will be generated from the image data and
attached to the output image labels.
</description>
- </parameter>
+ </parameter>
</group>
<group name="Stretch Options">
diff --git a/isis/src/base/apps/mapgrid/mapgrid.xml b/isis/src/base/apps/mapgrid/mapgrid.xml
index 3642d9c99b..d0c0c3c919 100644
--- a/isis/src/base/apps/mapgrid/mapgrid.xml
+++ b/isis/src/base/apps/mapgrid/mapgrid.xml
@@ -42,7 +42,7 @@
</change>
<change name="Steven Lambright" date="2007-06-21">
Changed output to be in GML format, fixed bug with bounded option
- </change>
+ </change>
<change name="Steven Lambright" date="2007-07-17">
Fixed bug with include files.
</change>
@@ -68,8 +68,8 @@
</brief>
<description>
This file contains map projection information necessary to produce the
- grid. This can be a conventional or user defined ISIS3 mapping
- template or an existing projected ISIS3 cube.
+ grid. This can be a conventional or user defined ISIS mapping
+ template or an existing projected ISIS cube.
</description>
<filter>
*.map *.cub *.txt
@@ -211,7 +211,7 @@
<example>
<brief> Sinusoidal Map Grid </brief>
<description>
- This example shows the qgis display of a sinusoidal projection created by this application.
+ This example shows the qgis display of a sinusoidal projection created by this application.
The following mapfile was used in the mapgrid application to create the grid.
<pre>
Group = Mapping
@@ -238,7 +238,7 @@ End
<outputImages>
<image src="assets/image/sinusoidalGrid.JPG" width="800" height="600">
<brief> Output image as it appears in qgis for mapgrid</brief>
- <description>
+ <description>
This is the output image that results.
</description>
<thumbnail caption="Output image showing the results of the mapgrid application." src="assets/thumb/sinusoidalGrid.JPG" width="200" height="200"/>
@@ -250,7 +250,7 @@ End
<example>
<brief> Lambert Confromal Map Grid </brief>
<description>
- This example shows the qgis display of a lambert conformal projection created by this application.
+ This example shows the qgis display of a lambert conformal projection created by this application.
The following mapfile was used in the this application to create the grid.
<pre>
Group = Mapping
@@ -280,7 +280,7 @@ End
<outputImages>
<image src="assets/image/lambertGrid.JPG" width="700" height="700">
<brief>Output image as it appears in qgis</brief>
- <description>
+ <description>
This is the output image that results
</description>
<thumbnail caption="Output image showing the results of the mapgrid application." src="assets/thumb/lambertGrid.JPG" width="200" height="200"/>
diff --git a/isis/src/base/apps/noproj/main.cpp b/isis/src/base/apps/noproj/main.cpp
index 671ab73fd7..4616b0bef1 100644
--- a/isis/src/base/apps/noproj/main.cpp
+++ b/isis/src/base/apps/noproj/main.cpp
@@ -122,7 +122,7 @@ void IsisMain() {
if(incam->DetectorMap()->LineRate() != 0.0) {
instType = "LINESCAN";
- // Isis3 line rate is always in seconds so convert to milliseconds for the
+ // ISIS line rate is always in seconds so convert to milliseconds for the
// Ideal instrument
detectorLines = 1;
expandFlag = 1;
@@ -219,7 +219,7 @@ void IsisMain() {
// Clean up the naif keywords object... delete everything that isn't a radii
for (int keyIndex = naifKeywordsObject->keywords() - 1; keyIndex >= 0; keyIndex--) {
QString keyName = (*naifKeywordsObject)[keyIndex].name();
-
+
if (!keyName.contains("RADII")) {
naifKeywordsObject->deleteKeyword(keyIndex);
}
diff --git a/isis/src/base/apps/pds2isis/pds2isis.xml b/isis/src/base/apps/pds2isis/pds2isis.xml
index b203439a73..4bf3917f5b 100644
--- a/isis/src/base/apps/pds2isis/pds2isis.xml
+++ b/isis/src/base/apps/pds2isis/pds2isis.xml
@@ -4,7 +4,7 @@
xsi:noNamespaceSchemaLocation=
"http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
- <brief>Import PDS or ISIS2 image into ISIS3 cube format</brief>
+ <brief>Import PDS or ISIS2 image into ISIS cube format</brief>
<description>
<p>
@@ -23,7 +23,7 @@ xsi:noNamespaceSchemaLocation=
</p>
<p>
The incoming <def link="Special Pixels">special pixel</def> values in the
- PDS file are assigned equivalent values for special pixels in ISIS3. The
+ PDS file are assigned equivalent values for special pixels in ISIS. The
order of precedence for special pixels in ISIS from highest to lowest
priority is the following:
<blockquote>
@@ -61,13 +61,13 @@ xsi:noNamespaceSchemaLocation=
is propagated to the output file.
</p>
<p>
- The best option to convert files from ISIS2 to ISIS3 is to maintain all the
+ The best option to convert files from ISIS2 to ISIS is to maintain all the
input file settings, and do not change the <def link="Bit Type">bit type</def>
or change any incoming pixel values to <def link="Special Pixels">special pixels</def>.
When an ISIS2 <def>Level1</def> image is imported into ISIS3, it is
important to note the label information is not propagated from the ISIS2 to
- the ISIS3 cube file. For an ISIS2 <def>Level2</def> image or mosaic file,
- a limited set of label information is transferred to the ISIS3 labels that
+ the ISIS cube file. For an ISIS2 <def>Level2</def> image or mosaic file,
+ a limited set of label information is transferred to the ISIS labels that
include the "Instrument," "<def link="Band">BandBin</def>," and
"<def link="Map Projection">Mapping</def>" groups.
</p>
@@ -430,10 +430,10 @@ xsi:noNamespaceSchemaLocation=
<examples>
<example>
<brief>
- Convert PDS file to ISIS3 format with pds2isis
+ Convert PDS file to ISIS format with pds2isis
</brief>
<description>
- The example ingests a PDS formatted file, and outputs an ISIS3 cube file
+ The example ingests a PDS formatted file, and outputs an ISIS cube file
using the default settings for the program.
</description>
<terminalInterface>
@@ -441,7 +441,7 @@ xsi:noNamespaceSchemaLocation=
from=input.img to=out.cub
</commandLine>
<description>
- This example shows the use of pds2isis to create an ISIS3 cube file.
+ This example shows the use of pds2isis to create an ISIS cube file.
</description>
</terminalInterface>
@@ -475,12 +475,12 @@ xsi:noNamespaceSchemaLocation=
<outputImages>
<image width="458" height="550" src="assets/images/out.jpg">
<brief>
- The ISIS3 output cube file
+ The ISIS output cube file
</brief>
<description>
This screenshot displays the ouput of the pds2isis application.
</description>
- <thumbnail caption= "The ISIS3 image cube after conversion"
+ <thumbnail caption= "The ISIS image cube after conversion"
src="assets/thumbs/out.jpg" width="167" height="200"/>
<parameterName>TO</parameterName>
</image>
diff --git a/isis/src/base/apps/phocube/phocube.xml b/isis/src/base/apps/phocube/phocube.xml
index d0ddc110fc..a5f27d5118 100644
--- a/isis/src/base/apps/phocube/phocube.xml
+++ b/isis/src/base/apps/phocube/phocube.xml
@@ -22,14 +22,14 @@ xsi:noNamespaceSchemaLocation=
<ul>
<li>Evaluate the individual bands in order to establish subsequent
image processing steps</li>
- <li>Specify as input to other ISIS3 programs such as fx and photomet</li>
+ <li>Specify as input to other ISIS programs such as fx and photomet</li>
<li>Demonstrate the result of each selected option</li>
<li>Determine how the images are mosaicked together after the
Level2 images are created from the Level1 images with backplanes </li>
</ul>
</p>
<p>
- All ISIS3 applications default to the following geometric reference if a camera model exists:
+ All ISIS applications default to the following geometric reference if a camera model exists:
<ul>
<li>Longitude Domain = 360, longitude range reported from 0 to 360</li>
<li>Latitude System = Ocentric</li>
@@ -56,13 +56,13 @@ xsi:noNamespaceSchemaLocation=
</p>
<p>
The parameters "morphologyRank" and "albedoRank" are specifically designed to be used
- by the ISIS3 mosaic programs. A mosaic program will automatically compare
+ by the ISIS mosaic programs. A mosaic program will automatically compare
two pixel values to determine how each pixel is mosaicked into an output
file, which depends on whether a morphology-based or an albedo-based
product is desired. The program computes a
<def link="Digital Number">DN</def> value for every input pixel based on
the formulas listed below and outputs the value to a backplane band.
- These backplane bands are used by the ISIS3 mosaic programs. The following are
+ These backplane bands are used by the ISIS mosaic programs. The following are
equations for "morphologyRank" and "albedoRank" options:
<blockquote>
<dl>
@@ -308,8 +308,8 @@ xsi:noNamespaceSchemaLocation=
</change>
<change name="Kaitlyn Lee" date="2020-06-04">
Added SPECIALPIXELS parameter to allow users to skip calculations on special pixels, excluding
- RA and DEC. This changed merged the two process functions, which were created to speed up
- the application when copying over DN values. After a few time tests, it doesn't look like the
+ RA and DEC. This changed merged the two process functions, which were created to speed up
+ the application when copying over DN values. After a few time tests, it doesn't look like the
merge causes the application to run longer. Changed the process function to be a lambda function
to get rid of global variables.
</change>
diff --git a/isis/src/base/apps/phoempglobal/phoempglobal.xml b/isis/src/base/apps/phoempglobal/phoempglobal.xml
index ae35f7fb6d..750cac6833 100644
--- a/isis/src/base/apps/phoempglobal/phoempglobal.xml
+++ b/isis/src/base/apps/phoempglobal/phoempglobal.xml
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
-<application name="phoempglobal" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
+<application name="phoempglobal" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
Fit empirical photometric functions to a Hapke model at several phase angles
</brief>
-
+
<description>
<p>
- This program fits the Lunar-Lambert or Minnaert photometric function to the
- complex Hapke (1981; 1984; 1986) model at several <def link="Phase Angle">phase
- angles</def>. <i>phoempglobal</i> adjusts the limb-darkening and the overall brightness
- so that the sum-squared-residual between the two is minimized and results in
- a tight fit to the new empirical model. The resulting best fit limb-darkening
+ This program fits the Lunar-Lambert or Minnaert photometric function to the
+ complex Hapke (1981; 1984; 1986) model at several <def link="Phase Angle">phase
+ angles</def>. <i>phoempglobal</i> adjusts the limb-darkening and the overall brightness
+ so that the sum-squared-residual between the two is minimized and results in
+ a tight fit to the new empirical model. The resulting best fit limb-darkening
Minnaert K or Lunar-Lambert L and brightness values that is normalized as
- an empirical phase curve versus <def link="Phase
- Angle">phase angle</def> is output in a formatted table. The table, saved as a
- <def>PVL</def> file, consists of the PhaseList, KList or LList, PhaseCurveList,
- empirical function name, and the personal note. The output PVL file is useful
- for related programs discussed later in this document.
+ an empirical phase curve versus <def link="Phase
+ Angle">phase angle</def> is output in a formatted table. The table, saved as a
+ <def>PVL</def> file, consists of the PhaseList, KList or LList, PhaseCurveList,
+ empirical function name, and the personal note. The output PVL file is useful
+ for related programs discussed later in this document.
</p>
<p>
- Note: The fit is calculated for a portion of the visible hemisphere of an
- idealized spherical and uniform planet such as Mars and the Earth. <i>phoempglobal</i>
+ Note: The fit is calculated for a portion of the visible hemisphere of an
+ idealized spherical and uniform planet such as Mars and the Earth. <i>phoempglobal</i>
is considered an advanced program and may not be suitable for the ISIS-user novice.
</p>
<p>
@@ -32,8 +32,8 @@
The programs listed below can utilize the output file of <i>phoempglobal</i> as input:
<blockquote>
<ul>
- <li>
- <i>photemplate</i> - used to create a template file consisting of parameter
+ <li>
+ <i>photemplate</i> - used to create a template file consisting of parameter
values for a selected photometric function to normalize images
</li>
<li>
@@ -55,43 +55,43 @@
<li>Minimum and maximum <def link="Incidence Angle">incidence angle</def></li>
<li>Minimum and maximum <def link="Emission Angle">emission angle</def></li>
<li>Minimum and maximum <def link="Phase Angle">phase angle</def></li>
- <li>Fraction of phase angle to add to maximum
+ <li>Fraction of phase angle to add to maximum
<def link="Emission Angle">emission angle</def></li>
<li>Number of <def link="Phase Angle">phase angles</def> to report to output file</li>
</ul>
</blockquote>
</p>
<p>
- The empirical photometric function is fitted to the Hapke model over a portion
+ The empirical photometric function is fitted to the Hapke model over a portion
of the visible hemisphere of an idealized planet using the following:
</p>
<p>
<blockquote>
<ul>
- <li>INCMIN <= <def link="Incidence Angle">incidence angle</def> <=
+ <li>INCMIN <= <def link="Incidence Angle">incidence angle</def> <=
INCMAX </li>
- <li>EMAMIN <= <def link="Emission Angle">emission angle</def> <=
+ <li>EMAMIN <= <def link="Emission Angle">emission angle</def> <=
EMAMAX + EMAMAX_PCOEFF * <def link="Phase Angle">phase angle</def></li>
<li>INCMIN and EMAMIN are normally set to 0 </li>
- <li>INCMAX and EMAMAX are set to values approaching 90 to exclude only
+ <li>INCMAX and EMAMAX are set to values approaching 90 to exclude only
limited regions near the limb and terminator from the fit</li>
</ul>
- </blockquote>
+ </blockquote>
</p>
<p>
- The atmospheric model is optional. It is important to define the
- atmospheric model based on the requirements of subsequent processing steps,
- which depends on whether the results will be applied to perform photometric
- normalization or for photoclinometry application. If an option other than
- "NONE" is selected, the atmospheric scattering and surface photometric
- properties are included as part of the physical model to which the empirical
+ The atmospheric model is optional. It is important to define the
+ atmospheric model based on the requirements of subsequent processing steps,
+ which depends on whether the results will be applied to perform photometric
+ normalization or for photoclinometry application. If an option other than
+ "NONE" is selected, the atmospheric scattering and surface photometric
+ properties are included as part of the physical model to which the empirical
model is fitted.
</p>
<p>
- The parameter settings for the Hapke model have been derived, and the results
- published by various individuals. For the original description of the
- fitting process and a useful compilation of Hapke parameters from the
- scientific literature, see McEwen (1991). The atmospheric model used in the
+ The parameter settings for the Hapke model have been derived, and the results
+ published by various individuals. For the original description of the
+ fitting process and a useful compilation of Hapke parameters from the
+ scientific literature, see McEwen (1991). The atmospheric model used in the
fits is discussed by Kirk et al. (2000, 2001).
</p>
<p>
@@ -99,94 +99,94 @@
</p>
<p>
The following Hapke parameters for Mars are from Johnson
- et al. (1999) for IMP data of Photometry Flats (soil) and may be
+ 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 equivalent to (-HG1, HG2=0.0)
+ (HG1, HG2=1.0) is equivalent to (-HG1, HG2=0.0)
</p>
<p>
<blockquote>
<table border="1">
<tr>
- <th>Band</th>
- <th>WH</th>
- <th>B0</th>
- <th>HH</th>
- <th>HG1</th>
+ <th>Band</th>
+ <th>WH</th>
+ <th>B0</th>
+ <th>HH</th>
+ <th>HG1</th>
<th>HG2</th>
</tr>
<tr>
- <td>Red</td>
- <td>0.52</td>
- <td>0.025</td>
- <td>0.170</td>
- <td>0.213</td>
+ <td>Red</td>
+ <td>0.52</td>
+ <td>0.025</td>
+ <td>0.170</td>
+ <td>0.213</td>
<td>1.000</td>
</tr>
<tr>
- <td>Green</td>
- <td>0.29</td>
- <td>0.290</td>
- <td>0.170</td>
- <td>0.190</td>
- <td>1.000</td>
+ <td>Green</td>
+ <td>0.29</td>
+ <td>0.290</td>
+ <td>0.170</td>
+ <td>0.190</td>
+ <td>1.000</td>
</tr>
<tr>
- <td>Blue</td>
- <td>0.16</td>
- <td>0.995</td>
- <td>0.170</td>
- <td>0.145</td>
- <td>1.000</td>
+ <td>Blue</td>
+ <td>0.16</td>
+ <td>0.995</td>
+ <td>0.170</td>
+ <td>0.145</td>
+ <td>1.000</td>
</tr>
</table>
</blockquote>
</p>
<p>
- Kirk et al. (2000) found that Mars whole-disk limb-darkening data of
- Thorpe (1973) are consistent with THETA=30, but results of Tanaka and
- Davis (1988) based on matching photoclinometry of local areas to shadow
- data are more consistent with THETA=20 when the domain of the fit is
+ Kirk et al. (2000) found that Mars whole-disk limb-darkening data of
+ Thorpe (1973) are consistent with THETA=30, but results of Tanaka and
+ Davis (1988) based on matching photoclinometry of local areas to shadow
+ data are more consistent with THETA=20 when the domain of the fit is
restricted to small <def link="Emission Angle">emission angles</def>
(<= 20 degrees).
</p>
<p>
- Values of the photometric parameters for the Martian atmosphere, adopted
+ Values of the photometric parameters for the Martian atmosphere, adopted
from Tomasko et al. (1999) are as follows:
</p>
<p>
<blockquote>
<table border="1">
<tr>
- <th>Band</th>
- <th>WHA</th>
- <th>HGA</th>
- </tr>
+ <th>Band</th>
+ <th>WHA</th>
+ <th>HGA</th>
+ </tr>
<tr>
- <td>Red</td>
- <td>0.95</td>
- <td>0.68</td>
- </tr>
+ <td>Red</td>
+ <td>0.95</td>
+ <td>0.68</td>
+ </tr>
<tr>
- <td>Blue</td>
- <td>0.76</td>
- <td>0.78</td>
+ <td>Blue</td>
+ <td>0.76</td>
+ <td>0.78</td>
</tr>
</table>
</blockquote>
</p>
<p>
- <b>If result of <i>phoempglobal</i> will be used in <i>photomet</i>:</b>
+ <b>If result of <i>phoempglobal</i> will be used in <i>photomet</i>:</b>
</p>
<p>
- All the options available in <i>phoempglobal</i> are also available in the
- <i>photomet</i> program. So, the best option is to forgo the atmospheric
- correction in <i>phoempglobal</i>, and instead apply the atmospheric correction in
+ All the options available in <i>phoempglobal</i> are also available in the
+ <i>photomet</i> program. So, the best option is to forgo the atmospheric
+ correction in <i>phoempglobal</i>, and instead apply the atmospheric correction in
<i>photomet</i>. Set the parameters ATMNAME=NONE and ADDOFFSET=NO to obtain the
- empirical model for the surface alone. The brightness and limb-darkening
- values output by <i>phoempglobal</i> and the LunarLambertEmpirical or
- MinnaertEmpirical photometric function are applied with <i>photomet</i> to correct
- the image. If a correction for atmospheric scattering is desired, one of the
- atmospheric models can also be selected when the parameters are defined. The
+ empirical model for the surface alone. The brightness and limb-darkening
+ values output by <i>phoempglobal</i> and the LunarLambertEmpirical or
+ MinnaertEmpirical photometric function are applied with <i>photomet</i> to correct
+ the image. If a correction for atmospheric scattering is desired, one of the
+ atmospheric models can also be selected when the parameters are defined. The
photometrically normalized images can then be equalized and mosaicked together.
</p>
@@ -195,13 +195,13 @@
</p>
<p>
- Fitting with an atmospheric model and setting the parameter ADDOFFSET=YES in
- <i>phoempglobal</i> is more useful for the photoclinometry application, where images are
- normally corrected by subtracting a uniform haze estimate rather than by applying
- a full atmospheric scattering model. The parameter EMAMAX should be set to a
- relatively small value that represents the typical range of surface slopes, and
- the fit will apply to images with vertical viewing. The table of fits at multiple
- <def link="Phase Angle">phase angles</def> output by <i>phoempglobal</i> can be
+ Fitting with an atmospheric model and setting the parameter ADDOFFSET=YES in
+ <i>phoempglobal</i> is more useful for the photoclinometry application, where images are
+ normally corrected by subtracting a uniform haze estimate rather than by applying
+ a full atmospheric scattering model. The parameter EMAMAX should be set to a
+ relatively small value that represents the typical range of surface slopes, and
+ the fit will apply to images with vertical viewing. The table of fits at multiple
+ <def link="Phase Angle">phase angles</def> output by <i>phoempglobal</i> can be
interpolated, and used as input to a photoclinometry application for any given image.
</p>
<p>
@@ -209,29 +209,29 @@
References:
</p>
<p>
-Hapke, B.W., 1981, Bidirectional reflectance spectroscopy 1: Theory,
+Hapke, B.W., 1981, Bidirectional reflectance spectroscopy 1: Theory,
J. Geophys. Res., v. 86, p. 3039-3054.<br/><br/>
-Hapke, B., 1984, Bidirectional reflectance spectroscopy 3: Corrections for
+Hapke, B., 1984, Bidirectional reflectance spectroscopy 3: Corrections for
macroscopic roughness, Icarus, v. 59, p. 41-59.<br/><br/>
-Hapke, B., 1986, Bidirectional reflectance spectroscopy 4: The extinction
+Hapke, B., 1986, Bidirectional reflectance spectroscopy 4: The extinction
coefficient and the opposition effect, Icarus, v. 67, p. 264-280.<br/><br/>
-Johnson, J.R., et al., 1999, Preliminary Results on Photometric Properties of
- Materials at the Sagan Memorial Station, Mars. J. Geophys. Res., v. 104,
+Johnson, J.R., et al., 1999, Preliminary Results on Photometric Properties of
+ Materials at the Sagan Memorial Station, Mars. J. Geophys. Res., v. 104,
p. 8809-8830. <br/><br/>
-Kirk, R.L., Thompson, K.T., Becker, T.L., and Lee, E.M., 2000,
- Photometric modeling for planetary cartography, Lunar Planet. Sci., XXXI,
+Kirk, R.L., Thompson, K.T., Becker, T.L., and Lee, E.M., 2000,
+ Photometric modeling for planetary cartography, Lunar Planet. Sci., XXXI,
Abstract #2025, Lunar and Planetary Institute, Houston (CD-ROM).<br/><br/>
-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,
+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). <br/><br/>
-McEwen, A.S., 1991, Photometric functions for photo-clinometry and other
+McEwen, A.S., 1991, Photometric functions for photo-clinometry and other
applications, Icarus, v. 92, p. 298-311.<br/><br/>
-Tanaka, K.L., and and Davis, P.A., 1988, Tectonic History of the Syria Planum
- Provice of Mars, J. Geophys. Res., v. 93, p. 14893-14917.<br/><br/>
-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., v. 93, p. 14893-14917.<br/><br/>
+Thorpe, T.E., 1973, Mariner 9 Photometric Observations of Mars from
November 1971 through March 1972, Icarus, v. 20, p. 482-489.<br/><br/>
-Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
+Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
the Imager on Mars Pathfinder, J. Geophys. Res., v. 104, p. 8987-9007.<br/><br/>
</p>
</description>
@@ -256,12 +256,12 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
USGS Flagstaff Original Version
</change>
<change name="Janet Barrett" date="2003-01-13">
- Ported pho_fit_global from the VAX and renamed it
+ Ported pho_fit_global from the VAX and renamed it
pho_emp_global in isis2
</change>
<change name="Sharmila Prasad" date="2011-08-24">
Isis3 Original version, pho_emp_global ported from isis2 to isis3
- phoempglobal
+ phoempglobal
</change>
<change name="Randy Kirk" date="2011-09-25">
Updated documentation for the phoempglobal program.
@@ -289,14 +289,14 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<description>
This output is a <def>PVL</def> file that contains the following:
<ul>
- <li>User note - description entered by the user</li>
+ <li>User note - description entered by the user</li>
<li>Function name - LunarLambertEmpirical or MinnaertEmpirical</li>
<li>PhaseList - list of <def link="Phase Angle">phase angles</def></li>
<li>KList or LList - list of best fit limb-darkening values</li>
<li>PhaseCurveList - list of brightness values</li>
</ul>
- The output file is formatted so it can be used by the program <i>photemplate</i>
- (used to edit the parameters) or <i>photomet</i> (used to apply photometric
+ The output file is formatted so it can be used by the program <i>photemplate</i>
+ (used to edit the parameters) or <i>photomet</i> (used to apply photometric
normalization to an image).
</description>
<filter>
@@ -315,10 +315,10 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<description>
This is a note entered by the user. The user note parameter provides
a space for digital note-taking. We recommend that the note space
- contain a description of how the output file will be used and the
- input parameter settings that were used to derive the values for the
- empirical photometric function. See
- "$ISISROOT/appdata/templates/photometry/marsred.pvl" for an example.
+ contain a description of how the output file will be used and the
+ input parameter settings that were used to derive the values for the
+ empirical photometric function. See
+ "$ISISROOT/appdata/templates/photometry/marsred.pvl" for an example.
</description>
</parameter>
</group>
@@ -332,14 +332,14 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<brief>Surface photometric model to be used</brief>
<description>
A Hapke (1981; 1984; 1986) photometric model is always used as the model
- to which the empirical functions are fitted. The options correspond to
+ to which the empirical functions are fitted. The options correspond to
variants of the Hapke model with different types of model for the single
particle phase (scattering) function.
</description>
<list>
<option value="HAPKEHEN">
- <brief>
+ <brief>
Hapke Henyey-Greenstein photometric model
</brief>
<description>
@@ -352,7 +352,7 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
</exclusions>
</option>
<option value="HAPKELEG">
- <brief>
+ <brief>
Hapke Legendre photometric model
</brief>
<description>
@@ -373,10 +373,10 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
Single scattering albedo
</brief>
<description>
- The Hapke single-scattering <def link="Albedo">albedo</def> of
- surface particles, see Hapke (1981). Not to be confused with
+ The Hapke single-scattering <def link="Albedo">albedo</def> of
+ surface particles, see Hapke (1981). Not to be confused with
albedo WHA of the atmospheric particles.
- </description>
+ </description>
<minimum inclusive="no">0.0</minimum>
<maximum inclusive="yes">1.0</maximum>
</parameter>
@@ -387,10 +387,10 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
Hapke opposition surge width
</brief>
<description>
- The Hapke opposition surge width. The width parameter for the
- opposition effect for the surface if hapkehen or hapkeleg is used,
- see Hapke (1984).
- </description>
+ The Hapke opposition surge width. The width parameter for the
+ opposition effect for the surface if hapkehen or hapkeleg is used,
+ see Hapke (1984).
+ </description>
<minimum inclusive="yes">0.0</minimum>
</parameter>
@@ -414,12 +414,12 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<description>
The small scale surface roughness value in degrees. The "macroscopic roughness"
of the surface as it affects the photometric behavior, see Hapke (1986).
- The roughness correction is evaluated if theta is given any
- value other than 0.0, but the computation speed is extremely slow.
- </description>
+ The roughness correction is evaluated if theta is given any
+ value other than 0.0, but the computation speed is extremely slow.
+ </description>
<minimum inclusive="yes">0.0</minimum>
<maximum inclusive="yes">90.0</maximum>
- </parameter>
+ </parameter>
<parameter name="HG1">
<type>double</type>
@@ -444,7 +444,7 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<type>double</type>
<brief>
Hapke Henyey-Greenstein Coefficient
- </brief>
+ </brief>
<description>
The Hapke Henyey-Greenstein coefficient for a single particle phase
function. The second parameter, of the two-parameter Henyey-Greenstein
@@ -469,8 +469,8 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<blockquote>
P(phase) = 1 + bh * p1(cos(phase)) + ch * p2(cos(phase)) <br/>
</blockquote>
- Where p1 and p2 are the first and second order Legendre polynomials.
- Bh is not to be confused with the Legendre coefficient bha of the
+ Where p1 and p2 are the first and second order Legendre polynomials.
+ Bh is not to be confused with the Legendre coefficient bha of the
phase function for atmospheric particles, used when
atmname=anisotropic1 or anisotropic2.
</description>
@@ -490,7 +490,7 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<blockquote>
P(phase) = 1 + bh * p1(cos(phase)) + ch * p2(cos(phase))
</blockquote>
- Where p1 and p2 are the first and second order Legendre
+ Where p1 and p2 are the first and second order Legendre
polynomials.
</description>
<minimum inclusive="no">-1.0</minimum>
@@ -506,9 +506,9 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
Photometric function to fit to the Hapke model
</brief>
<description>
- Specify a photometric function to fit to the Hapke model. The
- lists of brightness and limb-darkening values can be used with the
- LunarLambertEmpirical or MinnaertEmpirical photometric functions in
+ Specify a photometric function to fit to the Hapke model. The
+ lists of brightness and limb-darkening values can be used with the
+ LunarLambertEmpirical or MinnaertEmpirical photometric functions in
the photometric normalization program <i>photomet</i>.
</description>
<list>
@@ -524,10 +524,10 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<blockquote>
func=b(phase) * ((1-l(phase))*u0 + 2*l(phase)*u0/(u0+u))
</blockquote>
- where phase is the <def link="Phase Angle">phase angle</def>, and
- u0 and u are the
- cosines of the <def link="Incidence Angle">incidence</def> and
- <def link="Emission Angle">emission angles</def>, respectively.
+ where phase is the <def link="Phase Angle">phase angle</def>, and
+ u0 and u are the
+ cosines of the <def link="Incidence Angle">incidence</def> and
+ <def link="Emission Angle">emission angles</def>, respectively.
</description>
</option>
<option value="MINNAERT">
@@ -542,10 +542,10 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<blockquote>
func=b(phase) * u0**k(phase) * u**(k(phase)-1)
</blockquote>
- where phase is the <def link="Phase Angle">phase angle</def>,
- and u0 and u are the cosines of the
- <def link="Incidence Angle">incidence</def> and
- <def link="Emission Angle">emission angles</def>, respectively.
+ where phase is the <def link="Phase Angle">phase angle</def>,
+ and u0 and u are the cosines of the
+ <def link="Incidence Angle">incidence</def> and
+ <def link="Emission Angle">emission angles</def>, respectively.
</description>
</option>
</list>
@@ -564,37 +564,37 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
</brief>
<description>
<p>
- Phoempglobal incorporates all the same atmospheric scattering models in
- the program <i>photomet</i> that is used to make photometric corrections
- to images. The empirical model for the surface alone is obtained by setting
- ATMNAME=NONE and ADDOFFSET=NO in <i>phoempglobal</i>, and then the atmospheric
+ Phoempglobal incorporates all the same atmospheric scattering models in
+ the program <i>photomet</i> that is used to make photometric corrections
+ to images. The empirical model for the surface alone is obtained by setting
+ ATMNAME=NONE and ADDOFFSET=NO in <i>phoempglobal</i>, and then the atmospheric
scattering parameters are applied in <i>photomet</i>.
</p>
<p>
- If an option other than NONE is selected, an atmospheric scattering
- model will be included as part of the physical model to which the
- empirical model is fitted. Six available atmospheric models are
- categorized into three classes that differ in their treatment of the
- single particle scattering function for atmospheric particles. Each
- of these classes can be evaluated to a first order (faster) or second
+ If an option other than NONE is selected, an atmospheric scattering
+ model will be included as part of the physical model to which the
+ empirical model is fitted. Six available atmospheric models are
+ categorized into three classes that differ in their treatment of the
+ single particle scattering function for atmospheric particles. Each
+ of these classes can be evaluated to a first order (faster) or second
order (more accurate) approximation. Atmospheric scattering in all the
models both attenuates the surface signal and adds its own (uniform)
- contribution to the image <def link="Radiance">radiance</def>.
- Therefore, unless NONE is selected, set ADDOFFSET=YES so that the
- additive contribution of the atmosphere will be modeled by an additive
+ contribution to the image <def link="Radiance">radiance</def>.
+ Therefore, unless NONE is selected, set ADDOFFSET=YES so that the
+ additive contribution of the atmosphere will be modeled by an additive
constant in the fit. This option is more useful for
application to photoclinometry, where images are normally corrected
by subtracting a uniform haze estimate rather than by applying a
full atmospheric scattering model.
</p>
</description>
- <list>
+ <list>
<option value="NONE">
<brief>
No atmospheric scattering model
</brief>
<description>
- The <def link="Radiance">radiance</def> from the Hapke surface
+ The <def link="Radiance">radiance</def> from the Hapke surface
is not modified by atmospheric scattering.
</description>
<exclusions>
@@ -610,12 +610,12 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<brief>
First order isotropic
</brief>
- <description>
+ <description>
Atmospheric particles are assumed to scatter light isotropically.
The effects of this scattering are calculated exactly to first
order.
- </description>
- <inclusions>
+ </description>
+ <inclusions>
<item>TAU</item>
<item>WHA</item>
<item>HNORM</item>
@@ -635,7 +635,7 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
The effects of this scattering are calculated exactly to second
order.
</description>
- <inclusions>
+ <inclusions>
<item>TAU</item>
<item>WHA</item>
<item>HNORM</item>
@@ -655,7 +655,7 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
to a Legendre polynomial model with a single term. The effects
of this scattering are calculated exactly to first order.
</description>
- <inclusions>
+ <inclusions>
<item>TAU</item>
<item>WHA</item>
<item>BHA</item>
@@ -675,7 +675,7 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
a Legendre polynomial model with a single term. The effects of
this scattering are calculated exactly to second order.
</description>
- <inclusions>
+ <inclusions>
<item>TAU</item>
<item>WHA</item>
<item>BHA</item>
@@ -702,7 +702,7 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
particle phase function is similar to the one developed by Hapke
(1981) for surface scattering.
</description>
- <inclusions>
+ <inclusions>
<item>TAU</item>
<item>WHA</item>
<item>HGA</item>
@@ -729,7 +729,7 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
particle phase function is similar to the one developed by Hapke
(1981) for surface scattering.
</description>
- <inclusions>
+ <inclusions>
<item>TAU</item>
<item>WHA</item>
<item>HGA</item>
@@ -760,7 +760,7 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
Single-scattering albedo
</brief>
<description>
- This is the single-scattering <def link="Albedo">albedo</def> of atmospheric
+ This is the single-scattering <def link="Albedo">albedo</def> of atmospheric
particles, not to be confused with the albedo WH of surface particles.
</description>
<minimum inclusive="no">0.0</minimum>
@@ -773,9 +773,9 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
Henyey-Greenstein coefficient for atmospheric particles
</brief>
<description>
- Parameter used in the Henyey-Greenstein single particle phase
+ Parameter used in the Henyey-Greenstein single particle phase
function for atmospheric particles when ATMNAME=HAPKEATM1 or
- ATMNAME=HAPKEATM2. This is the asymmetry parameter for a single
+ ATMNAME=HAPKEATM2. This is the asymmetry parameter for a single
term Henyey-Greenstein model:
<blockquote>
p(phase) = (1-hga**2)/(1+hga**2+2*hga*cos(phase))**1.5
@@ -796,12 +796,12 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
Coefficient of the first order Legendre polynomial in the
single particle phase function for atmospheric scattering.
When ATMNAME=ANISOTROPIC1 or ATMNAME=ANISOTROPIC2, a two-term
- Legendre polynomial expansion is used to represent the
+ Legendre polynomial expansion is used to represent the
scattering phase function of single particles in the atmosphere:
<blockquote>
- p(phase) = 1 + bha * p1(cos(phase))
+ p(phase) = 1 + bha * p1(cos(phase))
</blockquote>
- Where, P1 is the first order Legendre polynomial, and not to be
+ Where, P1 is the first order Legendre polynomial, and not to be
confused with the corresponding parameter BH for the surface.
</description>
<minimum inclusive="yes">-1.0</minimum>
@@ -836,13 +836,13 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
phase angle.
</p>
<p>
- Because the program <i>photomet</i> incorporates all the same
- atmospheric scattering models as Phoempglobal, one would normally
- set ATMNAME=NONE and ADDOFFSET=NO to obtain an empirical model for
- the surface alone, and then apply the atmospheric scattering parameters
- in <i>photomet</i>. Fitting with an atmospheric model and ADDOFFSET=YES
- in <i>phoempglobal</i> is more useful for application to photoclinometry,
- where images are normally corrected by subtracting a uniform haze
+ Because the program <i>photomet</i> incorporates all the same
+ atmospheric scattering models as Phoempglobal, one would normally
+ set ATMNAME=NONE and ADDOFFSET=NO to obtain an empirical model for
+ the surface alone, and then apply the atmospheric scattering parameters
+ in <i>photomet</i>. Fitting with an atmospheric model and ADDOFFSET=YES
+ in <i>phoempglobal</i> is more useful for application to photoclinometry,
+ where images are normally corrected by subtracting a uniform haze
estimate rather than by applying a full atmospheric scattering model.
</p>
</description>
@@ -857,15 +857,15 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
</brief>
<default><item> 0.0</item></default>
<description>
- This is the minimum <def link="Emission Angle">emission angle</def> to
- be included. The empirical photometric function will be fitted to the
- Hapke model over a portion of the visible hemisphere of an idealized
+ This is the minimum <def link="Emission Angle">emission angle</def> to
+ be included. The empirical photometric function will be fitted to the
+ Hapke model over a portion of the visible hemisphere of an idealized
planet, with the following:
<ul>
<li>INCMIN <= incidence angle <= INCMAX </li>
<li>EMAMIN <= emission angle <= EMAMAX + EMAMAX_PCOEFF * phase angle</li>
<li>INCMIN and EMAMIN are normally set to 0 </li>
- <li>INCMAX and EMAMAX are set to values approaching 90 to exclude only
+ <li>INCMAX and EMAMAX are set to values approaching 90 to exclude only
limited regions near the limb and terminator from the fit</li>
</ul>
</description>
@@ -888,7 +888,7 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<li>INCMIN <= incidence angle <= INCMAX </li>
<li>EMAMIN <= emission angle <= EMAMAX + EMAMAX_PCOEFF * phase angle</li>
<li>INCMIN and EMAMIN are normally set to 0 </li>
- <li>INCMAX and EMAMAX are set to values approaching 90 to exclude only
+ <li>INCMAX and EMAMAX are set to values approaching 90 to exclude only
limited regions near the limb and terminator from the fit</li>
</ul>
</description>
@@ -901,27 +901,27 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<type>double</type>
<brief>
Fraction of phase angle to add to maximum emission angle
- </brief>
+ </brief>
<description>
- This parameter allows the range of <def
+ This parameter allows the range of <def
link="Emission Angle">emission angles</def> included in
- the fit to increase slightly at high <def
- link="Phase Angle">phase angles</def>, because
+ the fit to increase slightly at high <def
+ link="Phase Angle">phase angles</def>, because
otherwise the region of fit becomes very small. The
empirical photometric function will be fitted to the Hapke
- model over a portion of the visible hemisphere of an
+ model over a portion of the visible hemisphere of an
idealized planet, with the following:
<ul>
<li>INCMIN <= incidence angle <= INCMAX </li>
<li>EMAMIN <= emission angle <= EMAMAX + EMAMAX_PCOEFF * phase angle</li>
<li>INCMIN and EMAMIN are normally set to 0 </li>
- <li>INCMAX and EMAMAX are set to values approaching 90 to exclude only
+ <li>INCMAX and EMAMAX are set to values approaching 90 to exclude only
limited regions near the limb and terminator from the fit</li>
</ul>
Use EMAMAC_PCOEFF=0.1111 to output phase angles at 10 degree increments.
</description>
</parameter>
-
+
<parameter name="INCMIN">
<brief>
Minimum incidence angle
@@ -931,16 +931,16 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<description>
This is the minimum <def link="Incidence Angle">incidence angle</def>
to be included. The empirical
- photometric function will be fitted to the Hapke model over
- a portion of the visible hemisphere of an idealized planet, with
+ photometric function will be fitted to the Hapke model over
+ a portion of the visible hemisphere of an idealized planet, with
the following:
<ul>
<li>INCMIN <= incidence angle <= INCMAX </li>
<li>EMAMIN <= emission angle <= EMAMAX + EMAMAX_PCOEFF * phase angle</li>
<li>INCMIN and EMAMIN are normally set to 0 </li>
- <li>INCMAX and EMAMAX are set to values approaching 90 to exclude only
+ <li>INCMAX and EMAMAX are set to values approaching 90 to exclude only
limited regions near the limb and terminator from the fit</li>
- </ul>
+ </ul>
</description>
<minimum inclusive="yes">0.0</minimum>
<maximum inclusive="no">90.0</maximum>
@@ -954,14 +954,14 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<default><item> 90.0</item></default>
<description>
This is the maximum <def link="Incidence Angle">incidence angle</def>
- to be included. The empirical photometric function will be fitted to
- the Hapke model over a portion of the visible hemisphere of an
+ to be included. The empirical photometric function will be fitted to
+ the Hapke model over a portion of the visible hemisphere of an
idealized planet, with the following:
<ul>
<li>INCMIN <= incidence angle <= INCMAX </li>
<li>EMAMIN <= emission angle <= EMAMAX + EMAMAX_PCOEFF * phase angle</li>
<li>INCMIN and EMAMIN are normally set to 0 </li>
- <li>INCMAX and EMAMAX are set to values approaching 90 to exclude only
+ <li>INCMAX and EMAMAX are set to values approaching 90 to exclude only
limited regions near the limb and terminator from the fit</li>
</ul>
</description>
@@ -992,7 +992,7 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<default><item> 180.0</item></default>
<description>
This is the maximum <def link="Phase Angle">phase angle</def> at which
- a fit will be performed, corresponding to the last value (PHASELIST)
+ a fit will be performed, corresponding to the last value (PHASELIST)
in the output table.
</description>
<minimum inclusive="no">0.0</minimum>
@@ -1006,9 +1006,9 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<type>integer</type>
<default><item> 20</item></default>
<description>
- Number of <def link="Phase Angle">phase angles</def> at which a fit
- will be performed, equal to the number of values in the output table,
- which is normally set to 20 to output results at every 10 degree
+ Number of <def link="Phase Angle">phase angles</def> at which a fit
+ will be performed, equal to the number of values in the output table,
+ which is normally set to 20 to output results at every 10 degree
increment of phase angles.
</description>
<minimum inclusive="yes">1</minimum>
@@ -1020,16 +1020,16 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
<brief>Create a PVL file with <i>phoempglobal</i></brief>
<description>
This example shows the GUI and the input setting for each parameter name
- in the <i>phoempglobal</i> program.
+ in the <i>phoempglobal</i> program.
</description>
<terminalInterface>
<commandLine>
- to=new_test.pvl note="phoempglobal test using photometric settings for
- Mercury provided by Brett D. Parameters: to=new_test.pvl wh=0.249831313
- hh=0.075 b0=2.3 theta=7.717173828 hg1=0.247542306 hg2=0.57542686
- model=lunarlambert emamin=0 emamax=90 emamax_pcoeff=1 incmin=0 incmax=90
- phmin=0 phmax=180 nph=20" wh=0.249831313 hh=0.075 b0=2.3 theta=7.717173828
- hg1=0.247542306 hg2=0.57542686 model=lunarlambert emamin=0 emamax=90
+ to=new_test.pvl note="phoempglobal test using photometric settings for
+ Mercury provided by Brett D. Parameters: to=new_test.pvl wh=0.249831313
+ hh=0.075 b0=2.3 theta=7.717173828 hg1=0.247542306 hg2=0.57542686
+ model=lunarlambert emamin=0 emamax=90 emamax_pcoeff=1 incmin=0 incmax=90
+ phmin=0 phmax=180 nph=20" wh=0.249831313 hh=0.075 b0=2.3 theta=7.717173828
+ hg1=0.247542306 hg2=0.57542686 model=lunarlambert emamin=0 emamax=90
emamax_pcoeff=1 incmin=0 incmax=90 phmin=0 phmax=180 nph=20
</commandLine>
<description>
@@ -1056,8 +1056,8 @@ Tomasko, M.G., et al., 1999, Properties of Dust in the Martian Atmosphere from
The output <def>PVL</def> file contains the photometric parameter settings
for the LunarLambertEmpirical photometric function. This file can be used
as input to the <i>photomet</i> program with the FROMPVL parameter name. <br/> <br/>
- Note: The phase angles listed in the PVL file is not in 10 degree increments.
- The setting for EMAMAX_PCOEFF influences the phase angle values that are
+ Note: The phase angles listed in the PVL file is not in 10 degree increments.
+ The setting for EMAMAX_PCOEFF influences the phase angle values that are
output. Use EMAMAC_PCOEFF=0.1111 to output phase angles at 10 degree increments.
</description>
<parameterName>
diff --git a/isis/src/base/apps/photomet/photomet.xml b/isis/src/base/apps/photomet/photomet.xml
index c324975533..112d45f122 100644
--- a/isis/src/base/apps/photomet/photomet.xml
+++ b/isis/src/base/apps/photomet/photomet.xml
@@ -14,7 +14,7 @@
conditions. The photometric correction is applied to each pixel by computing
a photometric model based on local photometric angles and a set of parameters
that defines the model. Currently, no default values are assigned for any
- parameter names in the ISIS3 version of <i>photomet</i>.
+ parameter names in the ISIS version of <i>photomet</i>.
</p>
<p>
Photometric angles can be computed from the following:
@@ -197,7 +197,7 @@
The tables below show the models and their related parameter requirements
along with the ISIS2 default values. The ISIS2 default values are only meant
to serve as possible initial values to test backward compatibility since there
- are no default values defined in ISIS3.
+ are no default values defined in ISIS.
</p>
<small>
@@ -3308,7 +3308,7 @@ incidence</def> and <def link="Emission Angle">emission angles</def>, respective
emission angle to 75.0 degrees and the maximum incidence angle to 85.0 degrees. The
photometric model and normalization model along with the parameter values are
defined in the input PVL file. This example uses a PVL file that follows the
- format for a previous ISIS3 release. The photomet program will recognize some older
+ format for a previous ISIS release. The photomet program will recognize some older
formats and parameter names, but if an error is returned, then update the settings
using the latest parameter names and/or options listed in the tables under "DESCRIPTION."
</description>
diff --git a/isis/src/base/apps/raw2isis/raw2isis.xml b/isis/src/base/apps/raw2isis/raw2isis.xml
index bc831a3d40..ecd3c367ab 100644
--- a/isis/src/base/apps/raw2isis/raw2isis.xml
+++ b/isis/src/base/apps/raw2isis/raw2isis.xml
@@ -146,7 +146,7 @@
<brief>Bit type of input data</brief>
<description>
Bit type of data:
- 8 bit,
+ 8 bit,
16 bit signed, or
32 bit
</description>
@@ -345,7 +345,7 @@
Using raw2isis with default parameters
</brief>
<description>
- The use of raw2isis to ingest raw data and output Isis3 cubes.
+ The use of raw2isis to ingest raw data and output Isis cubes.
</description>
<terminalInterface>
<commandLine>
@@ -357,10 +357,10 @@
bittype=real
</commandLine>
<description>
- This example shows the use of raw2isis create an Isis3 cube.
+ This example shows the use of raw2isis create an Isis cube.
</description>
</terminalInterface>
-
+
<guiInterfaces>
<guiInterface>
<image width="450" height="550" src="assets/images/raw2isisGUI.jpg">
@@ -387,14 +387,14 @@
<parameterName>FROM</parameterName>
</dataFile>
</dataFiles>
-
+
<outputImages>
<image width="550" height="550" src="assets/images/out.jpg">
<brief>
Final output image after the conversion
</brief>
<description>
- Converts from PDS format to a Isis3 cube.
+ Converts from PDS format to a Isis cube.
</description>
<thumbnail caption= "The cube image after conversion"
src="assets/thumbs/out.jpg" width="126" height="126"/>
diff --git a/isis/src/base/apps/ringscam2map/ringscam2map.xml b/isis/src/base/apps/ringscam2map/ringscam2map.xml
index 0df2b90e18..b100b63840 100644
--- a/isis/src/base/apps/ringscam2map/ringscam2map.xml
+++ b/isis/src/base/apps/ringscam2map/ringscam2map.xml
@@ -7,20 +7,20 @@
</brief>
<description>
- This program projects an ISIS <def link="Level0">level0</def> or <def link="Level1">level1</def>
- <def link="Cube">cube</def> to a <def link="MAP">map</def> (ISIS <def link="Level2">level2</def> cube).
+ This program projects an ISIS <def link="Level0">level0</def> or <def link="Level1">level1</def>
+ <def link="Cube">cube</def> to a <def link="MAP">map</def> (ISIS <def link="Level2">level2</def> cube).
The input cube requires <def>SPICE</def> data and therefore the program <i>spiceinit</i> should
- be run on it with shape set to RingPlane prior to <i>ringscam2map</i>. The
- <def link="Map Projection">map projection</def> is defined using a <def>PVL</def> file
- specified with the MAP parameter. The system default is to use the Planar projection
- ($ISISROOT/appdata/templates/maps/planar.map). To learn more about using map projections in
- ISIS, refer to the ISIS Workshop
+ be run on it with shape set to RingPlane prior to <i>ringscam2map</i>. The
+ <def link="Map Projection">map projection</def> is defined using a <def>PVL</def> file
+ specified with the MAP parameter. The system default is to use the Planar projection
+ ($ISISROOT/appdata/templates/maps/planar.map). To learn more about using map projections in
+ ISIS, refer to the ISIS Workshop
<a href="https://isis.astrogeology.usgs.gov/fixit/projects/isis/wiki/Learning_About_Map_Projections">
"Learning About Map Projections"</a>.
- <p>If you need to generate your own map file you can use the <i>maptemplate</i> program or
- alternatively, hand create a file using your favorite editor. The file need only specify the
- ProjectionName as defaults will be computed for the remaining map file parameters. The
+ <p>If you need to generate your own map file you can use the <i>maptemplate</i> program or
+ alternatively, hand create a file using your favorite editor. The file need only specify the
+ ProjectionName as defaults will be computed for the remaining map file parameters. The
following table indicates how the defaults are established:
</p>
@@ -47,8 +47,8 @@
<tr>
<td>MinimumRingRadius<br />MaximumRingRadius<br />MinimumRingLongitude<br />MaximumRingLongitude</td>
- <td>Computed from the input cube or read from the map file. However, any combination of the
- four values can then be overridden by the user. The values the user specifies are expected
+ <td>Computed from the input cube or read from the map file. However, any combination of the
+ four values can then be overridden by the user. The values the user specifies are expected
to be in the coodinate system of the projection.</td>
</tr>
@@ -60,7 +60,7 @@
</table>
<p>
- If you only entered the input cube (FROM) and output cube (TO) and changed no other
+ If you only entered the input cube (FROM) and output cube (TO) and changed no other
parameters the following is the default Mapping group:
</p>
<pre>
@@ -81,25 +81,25 @@
EndGroup
</pre>
- The map file can be an existing map projected (level2) cube. A level2 cube has PVL labels
- and contains the Mapping group. Depending on the values of the input parameters, the output
- cube can use some or all of the keyword values of the map file. For instance, setting
- MATCHMAP = true causes all of the mapping parameters to come from the map file, resulting
- in an output cube having the same number of <def link="Line">lines</def> and
- <def link="Sample">samples</def> as the map file. If MATCHMAP = true and the map file is
- missing a keyword like PixelResolution, the application will fail with a PVL error. Setting
- MATCHMAP=false allows for some of the mapping components to be overridden by the user or
+ The map file can be an existing map projected (level2) cube. A level2 cube has PVL labels
+ and contains the Mapping group. Depending on the values of the input parameters, the output
+ cube can use some or all of the keyword values of the map file. For instance, setting
+ MATCHMAP = true causes all of the mapping parameters to come from the map file, resulting
+ in an output cube having the same number of <def link="Line">lines</def> and
+ <def link="Sample">samples</def> as the map file. If MATCHMAP = true and the map file is
+ missing a keyword like PixelResolution, the application will fail with a PVL error. Setting
+ MATCHMAP=false allows for some of the mapping components to be overridden by the user or
computed from the FROM cube.
-
- <p>If you are attempting to construct a mosaic, it is important that the PixelResolution,
+
+ <p>If you are attempting to construct a mosaic, it is important that the PixelResolution,
RingLongitudeDirection, RingLongitudeDomain, ProjectionName, and projection specific parameters
- (e.g., CenterRingLongitude, CenterRingRadius) are the same for all cubes. That is, you should
- create one map file and use it as input for all the cubes in your mosaic. By letting the
- minimum and maximum ring radius and ring longitude values default, the application will
- determine the coverage of each image. However, if the mosaic Ring Radius and Ring Longitude
- range is entered, each output image will be projected to the full size of the mosaic resulting
- in large file sizes and images with many <def>NULL</def> pixels.
+ (e.g., CenterRingLongitude, CenterRingRadius) are the same for all cubes. That is, you should
+ create one map file and use it as input for all the cubes in your mosaic. By letting the
+ minimum and maximum ring radius and ring longitude values default, the application will
+ determine the coverage of each image. However, if the mosaic Ring Radius and Ring Longitude
+ range is entered, each output image will be projected to the full size of the mosaic resulting
+ in large file sizes and images with many <def>NULL</def> pixels.
The following Mapping group could be used for mosaicking:
</p>
@@ -112,17 +112,17 @@
</pre>
<p>
- 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.
<a href="https://isis.astrogeology.usgs.gov/fixit/projects/isis/wiki/Learning_About_Map_Projections#Problems-at-the-Longitude-Seams">
- Section 14 </a>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 </a>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".
</p>
</description>
@@ -199,27 +199,27 @@
<change name="Steven Lambright" date="2007-08-22">
Fixed lonseam option to work with minimize option correctly
</change>
- <change name="Stuart Sides" date="2008-02-11">
- Fixed bug where the ground range was not pulled from the map file when
+ <change name="Stuart Sides" date="2008-02-11">
+ Fixed bug where the ground range was not pulled from the map file when
it was supposed to be (using DEFAULTRANGE = MAP).
</change>
<change name="Christopher Austin" date="2008-04-18">
Added the MATCHMAP option.
</change>
<change name="Steven Lambright" date="2008-05-12">
- Removed references to CubeInfo
+ Removed references to CubeInfo
</change>
<change name="Christopher Austin" date="2008-07-15">
Changed MATCHMAP to default off
</change>
<change name="Steven Lambright" date="2008-08-04">
- 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.
</change>
<change name="Steven Lambright" date="2008-09-10">
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.
</change>
<change name="Christopher Austin" date="2008-10-31">
@@ -242,7 +242,7 @@
Updated documentation text, added glossary links, and improved compatability with Isis documentation.
</change>
<change name="Jeff Anderson" date="2012-04-30">
- Add forward and reverse patch rubbersheeting parameters.
+ Add forward and reverse patch rubbersheeting parameters.
</change>
<change name="Debbie A. Cook" date="2012-07-06">
Updated Spice members to be more compliant with Isis coding standards. References #972.
@@ -252,11 +252,11 @@
</change>
<change name="Jeannie Backer" date="2013-03-12">
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.
</change>
<change name="Jeannie Backer" date="2013-03-12">
- 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.
</change>
</history>
@@ -435,11 +435,11 @@
<brief>Defines how the default ground range is determined</brief>
<default><item>MINIMIZE</item></default>
<description>
- 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.
</description>
@@ -461,8 +461,8 @@
<option value="MINIMIZE">
<brief>Minimize output image size</brief>
<description>
- This option will use the camera and projection in combination to ensure the output
- image size (samples, lines) is minimized. Using a ground range can cause NULL
+ This option will use the camera and projection in combination to ensure the output
+ image size (samples, lines) is minimized. Using a ground range can cause NULL
padding for projections with curved merdians and/or parallels and hence large output
images. The amount of padding can be quite large for extremely high resolution maps.
</description>
@@ -479,9 +479,9 @@
<option value="CAMERA">
<brief> Compute default range from input cube</brief>
<description>
- This option will automatically determine the ring radius range
- (mininum ring radius, maximum ring radius) and the ring longitude
- range (minimum ring longitude, maximum ring longitude) from the input
+ This option will automatically determine the ring radius range
+ (mininum ring radius, maximum ring radius) and the ring longitude
+ range (minimum ring longitude, maximum ring longitude) from the input
camera model cube specified using the FROM parameter.
</description>
<inclusions><item>RINGLONSEAM</item></inclusions>
@@ -490,8 +490,8 @@
<option value="MAP">
<brief> Read default range from map file</brief>
<description>
- This option will read the ring ranges (RingRadiusMininum, RingRadiusMaximum,
- RingLongitudeMinimum and RingLongitudeMaximum keywords) from the input map file.
+ This option will read the ring ranges (RingRadiusMininum, RingRadiusMaximum,
+ RingLongitudeMinimum and RingLongitudeMaximum keywords) from the input map file.
All four values are expected to be defined.
</description>
<exclusions><item>RINGLONSEAM</item></exclusions>
@@ -504,7 +504,7 @@
<brief>Minimum Ring Radius</brief>
<internalDefault>Use default range</internalDefault>
<description>
- The minimum ring radius of the output map. If this is entered by the user it will override
+ The minimum ring radius of the output map. If this is entered by the user it will override
the default camera or map value. Units are meters.
</description>
@@ -517,8 +517,8 @@
<brief>Maximum Ring Radius</brief>
<internalDefault>Use default range</internalDefault>
<description>
- The maximum ring radius of the output map. If this is entered by the user it will override
- the default camera or map value. Units are meters.
+ The maximum ring radius of the output map. If this is entered by the user it will override
+ the default camera or map value. Units are meters.
</description>
<minimum inclusive="yes">0.0</minimum>
<maximum inclusive="yes">999999999999.0</maximum>
@@ -530,8 +530,8 @@
<brief>Minimum Ring Longitude</brief>
<internalDefault>Use default range</internalDefault>
<description>
- The minimum ring longitude of the output map. If this is entered by the user it will override
- the default camera or map value. By default, clockwise ring longitudes in the range of 0 to
+ The minimum ring longitude of the output map. If this is entered by the user it will override
+ the default camera or map value. By default, clockwise ring longitudes in the range of 0 to
360 are assumed unless the map file specifies otherwise.
</description>
</parameter>
@@ -541,8 +541,8 @@
<brief>Maximum Ring Longitude</brief>
<internalDefault>Use default range</internalDefault>
<description>
- The maximum ring longitude of the output map. If this is entered by the user it will override the
- default camera or map value. By default, positive east ring longitudes in the range of 0 to 360
+ The maximum ring longitude of the output map. If this is entered by the user it will override the
+ default camera or map value. By default, positive east ring longitudes in the range of 0 to 360
are assumed unless the map file specifies otherwise.
</description>
<greaterThan><item>MINRINGLON</item></greaterThan>
@@ -572,8 +572,8 @@
</brief>
<description>
With this option you can turn on/off the automatic ring longitude domain switching that occurs
- when a file crosses the boundary of the ring longitude domain (0 to 360 or -180 to 180). If
- the automatic switching is turned off, then you have the choice of making the program continue or
+ when a file crosses the boundary of the ring longitude domain (0 to 360 or -180 to 180). If
+ the automatic switching is turned off, then you have the choice of making the program continue or
exit when the cube does cross the boundary.
</description>
@@ -581,9 +581,9 @@
<option value="AUTO">
<brief>If the cube crosses the seam, automatically switch the RingLongitudeDomain.</brief>
<description>
- If the cube crosses the ring longitude seam, then the program will automatically
- compute the RingLongitudeDomain. When the cube is near 0 or 360 degrees, the
- program will assume 180 RingLongitudeDomain. When the cube is near 180 or -180
+ If the cube crosses the ring longitude seam, then the program will automatically
+ compute the RingLongitudeDomain. When the cube is near 0 or 360 degrees, the
+ program will assume 180 RingLongitudeDomain. When the cube is near 180 or -180
degrees, the program will assume 360 RingLongitudeDomain.
</description>
</option>
@@ -592,7 +592,7 @@
<brief>If the cube crosses the seam, abort the program.</brief>
<description>
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.
</description>
</option>
@@ -600,8 +600,8 @@
<option value="CONTINUE">
<brief>If the cube crosses the seam, continue program and keep the RingLongitudeDomain.</brief>
<description>
- If the cube crosses the ring longitude seam, the program will continue. The RingLongitudeDomain
- will not be changed from the domain in the map file. If the map file does not have a RingLongitudeDomain,
+ If the cube crosses the ring longitude seam, the program will continue. The RingLongitudeDomain
+ will not be changed from the domain in the map file. If the map file does not have a RingLongitudeDomain,
the default of 360 LongitudeDomain will be used. Note that this could create an extremely large image.
</description>
</option>
@@ -652,25 +652,25 @@
</default>
<brief>Warp algorithm</brief>
<description>
- 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).
</description>
<list>
<option value="FORWARDPATCH">
<brief>Forward patch warp algorithm</brief>
<description>
- Patches are uniformly distributed over the input cube (FROM). For each input patch, the radius/longitude of
- the four corner coordinates are computed using the camera model.
- Those four radius/longitude coordinates are used by the
- map projection to determine four output pixel coordinates. Then, the
- four output to input image coordinates are fit with two affine transforms.
+ Patches are uniformly distributed over the input cube (FROM). For each input patch, the radius/longitude of
+ the four corner coordinates are computed using the camera model.
+ Those four radius/longitude coordinates are used by the
+ map projection to determine four output pixel coordinates. Then, the
+ four output to input image coordinates are fit with two affine transforms.
That is, inputsamp=f(outputsamp,outputline) and inputline=g(outputsamp,outputline)
where f = A+B*outputsamp+C*outputline and similarly for g.
- If the estimated input/sample
- line (as computed by the affine transform) at the center of the patch is within a tenth
- of a pixel of the actual computation using the projection and camera model,
- the affine transforms are used to place the calculated input pixels in the output patch
+ If the estimated input/sample
+ line (as computed by the affine transform) at the center of the patch is within a tenth
+ of a pixel of the actual computation using the projection and camera model,
+ the affine transforms are used to place the calculated input pixels in the output patch
(using the specificed INTERPOLATOR).
</description>
<inclusions><item>PATCHSIZE</item></inclusions>
@@ -678,16 +678,16 @@
<option value="REVERSEPATCH">
<brief>Reverse patch warp algorithm</brief>
<description>
- Patches are uniformly distributed over the output cube (map projected product). For each
- output patch, the radius/longitude of the four corners coordinates
- are computed using the map projection. Those four radius/longitude coordinates are used
- by the camera model to determine four input pixel coordinates. Then the
- four output to input image coordinates are fit with two affine transforms. That is,
+ Patches are uniformly distributed over the output cube (map projected product). For each
+ output patch, the radius/longitude of the four corners coordinates
+ are computed using the map projection. Those four radius/longitude coordinates are used
+ by the camera model to determine four input pixel coordinates. Then the
+ four output to input image coordinates are fit with two affine transforms. That is,
inputsamp=f(outputsamp,outputline) and inputline=g(outputsamp,outputline) where f = A+B*outputsamp+C*outputline and similarly for g.
- If the estimated input/sample
- line (as computed by the affine transform) at the center of the patch is within a
- tenth of a pixel of the actual computation using the projection and camera model,
- the affine transforms are used to place the calculated input pixels in the output patch
+ If the estimated input/sample
+ line (as computed by the affine transform) at the center of the patch is within a
+ tenth of a pixel of the actual computation using the projection and camera model,
+ the affine transforms are used to place the calculated input pixels in the output patch
(using the specificed INTERPOLATOR).
</description>
<inclusions><item>PATCHSIZE</item></inclusions>
@@ -695,12 +695,12 @@
<option value="AUTOMATIC">
<brief>Automatically select warp algorithm</brief>
<description>
- The automatic option will choose the appropriate algorithm depending on the camera type
- of the input cube (TO). If the cube is a framing camera image,
- the reverse algorithm will be used with a PATCHSIZE of 4. If the cube is a line scan image,
- the forward algorithm will be used with a PATCHSIZE of 5. If
- the cube is a push frame camera (e.g., LRO WAC, MRO MARCI, or THEMIS VIS)
- the forward transform with a PATCHSIZE of the pushframe framelet height will be used.
+ The automatic option will choose the appropriate algorithm depending on the camera type
+ of the input cube (TO). If the cube is a framing camera image,
+ the reverse algorithm will be used with a PATCHSIZE of 4. If the cube is a line scan image,
+ the forward algorithm will be used with a PATCHSIZE of 5. If
+ the cube is a push frame camera (e.g., LRO WAC, MRO MARCI, or THEMIS VIS)
+ the forward transform with a PATCHSIZE of the pushframe framelet height will be used.
It is recommended
that you always use automatic for push frame cameras to ensure the patch size does not cross
multiple framelets.
@@ -714,15 +714,15 @@
<type>integer</type>
<brief>Patch size for forward or reverse warping</brief>
<description>
- The forward and reverse patch algorithms try to fit an affine tranform between the
+ The forward and reverse patch algorithms try to fit an affine tranform between the
camera model coordinate and projection coordinate using the four
- corners of the patches. Patchs that are too large may run faster at the risk of
+ corners of the patches. Patchs that are too large may run faster at the risk of
missing higher resolution information about the DTM. For example a patch
- of 256x256 may have the same elevation at the four corners and center of the grid but a
+ of 256x256 may have the same elevation at the four corners and center of the grid but a
crater may exist in one of the four quadrants of the patch. The crater,
up to 128 pixels in diamter may not be properly orthorectified. In general, small patch
- sizes are recommended (e.g., 4, 8). <strong>NOTE:</strong> For FORWARDPATCH, if the
- entered PATCHSIZE is less than or equal to 1, it is automatically reset to 3.
+ sizes are recommended (e.g., 4, 8). <strong>NOTE:</strong> For FORWARDPATCH, if the
+ entered PATCHSIZE is less than or equal to 1, it is automatically reset to 3.
</description>
<minimum inclusive="yes">1</minimum>
</parameter>
@@ -731,36 +731,36 @@
</groups>
-<!--
+<!--
<examples>
<example>
<brief> Demonstrates the AUTO RINGLONSEAM option </brief>
<description>
This example is the first of two different runs of <i>ringscam2map</i>
- demonstrating the RINGLONSEAM option. In this case it is set to AUTO.
+ demonstrating the RINGLONSEAM option. In this case it is set to AUTO.
All the user input parameters in this example are identical to the
following example except for RINGLONSEAM and TO. The default for RINGLONSEAM
is AUTO.
</description>
<terminalInterface>
- <commandLine> from=EN0108830655M.cub
- map=../IN/sinu.map
- to=EN0108830655M_sinu_auto.cub
+ <commandLine> from=EN0108830655M.cub
+ map=../IN/sinu.map
+ to=EN0108830655M_sinu_auto.cub
</commandLine>
<description>
This is the command line used to create the output for the AUTO
version of the RINGLONSEAM example.
</description>
- </terminalInterface>
+ </terminalInterface>
<guiInterfaces>
<guiInterface>
<image src="assets/images/cam2map_azseam_auto_gui_p1.jpg" width="737" height="432">
<brief>
Example GUI top of page
</brief>
- <description>
- Screen shot of top of GUI with parameters filled in for input
- files, output file, and output map resolution.
+ <description>
+ Screen shot of top of GUI with parameters filled in for input
+ files, output file, and output map resolution.
</description>
<thumbnail src="assets/thumbs/cam2map_azseam_auto_gui_p1_thumb.jpg" width="200" height="117" caption="cam2map GUI part 1" />
</image>
@@ -770,11 +770,11 @@
<brief>
Example GUI middle of page
</brief>
- <description>
- Screen shot of middle of GUI with parameters filled in for the
+ <description>
+ Screen shot of middle of GUI with parameters filled in for the
output map ground range and the ring longitude seam options. Under
the output map ground range section, notice the grayed out
- parameters. These values are computed and not allowed to be
+ parameters. These values are computed and not allowed to be
modified when DEFAULTRANGE = MINIMIZE. This is the default.
The RINGLONSEAM option has been set to AUTO in this example.
</description>
@@ -786,8 +786,8 @@
<brief>
Example GUI bottom of page
</brief>
- <description>
- Screen shot of the bottom of the GUI showing the Options menu.
+ <description>
+ Screen shot of the bottom of the GUI showing the Options menu.
The default value for INTERP is selected (CUBICCONVOLUTION).
</description>
<thumbnail src="assets/thumbs/cam2map_azseam_auto_gui_p1_thumb.jpg" width="200" height="48" caption="cam2map GUI part 3" />
@@ -798,7 +798,7 @@
<dataFile path="assets/IN/sinu.map">
<brief> Map file </brief>
<description>
- Input map file defining the desired output map projection. This
+ Input map file defining the desired output map projection. This
file is in PVL format.
</description>
<parameterName> MAP </parameterName>
@@ -817,7 +817,7 @@
<outputImages>
<image src="assets/images/ToFile_EN0108830655M_azseam_auto.jpg" width="496" height="496">
<brief> Output image for cam2map RINGLONSEAM=AUTO</brief>
- <description> This is the output of cam2map demonstating RINGLONSEAM set
+ <description> This is the output of cam2map demonstating RINGLONSEAM set
to AUTO. Contrast this output with the next example
which was created with the RINGLONSEAM set to CONT.
</description>
@@ -835,24 +835,24 @@
previous example except for RINGLONSEAM and TO.
</description>
<terminalInterface>
- <commandLine> from=EN0108830655M.cub
- map=../IN/sinu.map
+ <commandLine> from=EN0108830655M.cub
+ map=../IN/sinu.map
to=EN0108830655M_sinu_cont.cub azseam=cont
</commandLine>
<description>
This is the command line used to create the output for the CONT
version of the RINGLONSEAM example.
</description>
- </terminalInterface>
+ </terminalInterface>
<guiInterfaces>
<guiInterface>
<image src="assets/images/cam2map_azseam_cont_gui_p1.jpg" width="737" height="430">
<brief>
Example GUI top of page
</brief>
- <description>
- Screen shot of top of GUI with parameters filled in for input
- files, output file, and output map resolution.
+ <description>
+ Screen shot of top of GUI with parameters filled in for input
+ files, output file, and output map resolution.
</description>
<thumbnail src="assets/thumbs/cam2map_azseam_cont_gui_p1_thumb.jpg" width="200" height="116" caption="cam2map GUI part 1" />
</image>
@@ -862,11 +862,11 @@
<brief>
Example GUI middle of page
</brief>
- <description>
- Screen shot of middle of GUI with parameters filled in for the
+ <description>
+ Screen shot of middle of GUI with parameters filled in for the
output map ground range and the ring longitude seam options. Under
the output map ground range section, notice the grayed out
- parameters. These values are computed and not allowed to be
+ parameters. These values are computed and not allowed to be
modified when DEFAULTRANGE = MINIMIZE. This is the default.
The RINGLONSEAM option has been set to CONT in this example.
</description>
@@ -878,8 +878,8 @@
<brief>
Example GUI bottom of page
</brief>
- <description>
- Screen shot of the bottom of the GUI showing the Options menu.
+ <description>
+ Screen shot of the bottom of the GUI showing the Options menu.
The default value for INTERP is selected (CUBICCONVOLUTION).
</description>
<thumbnail src="assets/thumbs/cam2map_azseam_cont_gui_p3_thumb.jpg" width="200" height="51" caption="cam2map GUI part 3" />
@@ -890,7 +890,7 @@
<dataFile path="assets/IN/sinu.map">
<brief> Map file </brief>
<description>
- Input map file defining the desired output map projection. This
+ Input map file defining the desired output map projection. This
file is in PVL format.
</description>
<parameterName> MAP </parameterName>
@@ -909,7 +909,7 @@
<outputImages>
<image src="assets/images/ToFile_EN0108830655M_azseam_cont.jpg" width="496" height="496">
<brief> Output image for cam2map RINGLONSEAM=CONT</brief>
- <description> This is the output of cam2map demonstating RINGLONSEAM set
+ <description> This is the output of cam2map demonstating RINGLONSEAM set
to CONT. Contrast this output with the previous example
which was created with the RINGLONSEAM set to AUTO.
</description>
@@ -923,9 +923,9 @@
<description>
This example is the first of two different runs of <i>cam2map</i>
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.
- The mapping parameters of the output file will be read from the
- mapping group of the MAP 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.
</description>
<terminalInterface>
<commandLine> from=EN0108827082M.lev1.cub map=EN0108828436M.lev2.cub
@@ -935,18 +935,18 @@
This is the command line used to create the output for the level 2
image version of the MATCHMAP example.
</description>
- </terminalInterface>
+ </terminalInterface>
<guiInterfaces>
<guiInterface>
<image src="assets/images/cam2map_matchmap_image_gui_p1.jpg" width="728" height="433">
<brief>
Example GUI top of page
</brief>
- <description>
- Screen shot of top of GUI with parameters filled in for input
+ <description>
+ Screen shot of top of GUI with parameters filled in for input
files, output file, and output map resolution. Notice that with
MATCHMAP checked the remaining output map resolution parameters
- are grayed out to show that they are no longer available for
+ are grayed out to show that they are no longer available for
input. All the mapping parameters will be read from the level 2
image entered for MAP.
</description>
@@ -958,14 +958,14 @@
<brief>
Example GUI middle of page
</brief>
- <description>
- Screen shot of middle of GUI showing parameters for the
+ <description>
+ Screen shot of middle of GUI showing parameters for the
output map ground range and the ring longitude seam options. Under
the output map ground range section, notice all the parameters
- are grayed out. These values are all read or computed from the
+ are grayed out. These values are all read or computed from the
parameters in the mapping group of the level 2 image entered as
the MAP and not allowed to be modified because MATCHMAP=YES.
- The RINGLONSEAM option has been set to AUTO in this example (the
+ The RINGLONSEAM option has been set to AUTO in this example (the
default).
</description>
<thumbnail src="assets/thumbs/cam2map_matchmap_image_gui_p2_thumb.jpg" width="200" height="104" caption="cam2map GUI part 2" />
@@ -976,8 +976,8 @@
<brief>
Example GUI bottom of page
</brief>
- <description>
- Screen shot of the bottom of the GUI showing the Options menu.
+ <description>
+ Screen shot of the bottom of the GUI showing the Options menu.
The default value for INTERP is selected (CUBICCONVOLUTION).
</description>
<thumbnail src="assets/thumbs/cam2map_matchmap_image_gui_p3_thumb.jpg" width="200" height="52" caption="cam2map GUI part 3" />
@@ -1005,9 +1005,9 @@
<outputImages>
<image src="assets/images/ToFile_EN0108827082M.lev2.jpg" width="496" height="496">
<brief> Output image for cam2map RINGLONSEAM=AUTO</brief>
- <description> This is the output of cam2map demonstating the use of
- MATCHMAP=YES with an Isis level 2 image as MAP.
- Contrast this output with the level 2 image used as MAP
+ <description> This is the output of cam2map demonstating the use of
+ MATCHMAP=YES with an Isis level 2 image as MAP.
+ Contrast this output with the level 2 image used as MAP
and with the next example which was also created with
MATCHMAP=YES, but uses an Isis map file as MAP.
</description>
@@ -1021,9 +1021,9 @@
<description>
This example is the second of two different runs of <i>cam2map</i>
demonstrating usage of MATCHMAP. In both this example and the
- previous, MATCHMAP is set to YES. In this case MAP is an
- Isis map file. The mapping parameters of the output file will
- be read from this map file.
+ previous, MATCHMAP is set to YES. In this case MAP is an
+ Isis map file. The mapping parameters of the output file will
+ be read from this map file.
</description>
<terminalInterface>
<commandLine> from=EN0108827082M.lev1.cub map=EN0108828436M.map
@@ -1040,11 +1040,11 @@
<brief>
Example GUI top of page
</brief>
- <description>
- Screen shot of top of GUI with parameters filled in for input
+ <description>
+ Screen shot of top of GUI with parameters filled in for input
files, output file, and output map resolution. Notice that with
MATCHMAP checked the remaining output map resolution parameters
- are grayed out to show that they are no longer available for
+ are grayed out to show that they are no longer available for
input. All the mapping parameters will be read from the map file.
The application will throw an error if any required information
is missing.
@@ -1057,13 +1057,13 @@
<brief>
Example GUI middle of page
</brief>
- <description>
- Screen shot of middle of GUI showing parameters for the
+ <description>
+ Screen shot of middle of GUI showing parameters for the
output map ground range and the ring longitude seam options. Under
the output map ground range section, notice all the parameters
- are grayed out. These values are all read or computed from the map
+ are grayed out. These values are all read or computed from the map
file values and not allowed to be modified because MATCHMAP=YES.
- The RINGLONSEAM option has been set to AUTO in this example (the
+ The RINGLONSEAM option has been set to AUTO in this example (the
default).
</description>
<thumbnail src="assets/thumbs/cam2map_matchmap_mapfile_gui_p2_thumb.jpg" width="200" height="104" caption="cam2map GUI part 2" />
@@ -1074,8 +1074,8 @@
<brief>
Example GUI bottom of page
</brief>
- <description>
- Screen shot of the bottom of the GUI showing the Options menu.
+ <description>
+ Screen shot of the bottom of the GUI showing the Options menu.
The default value for INTERP is selected (CUBICCONVOLUTION).
</description>
<thumbnail src="assets/thumbs/cam2map_matchmap_mapfile_gui_p3_thumb.jpg" width="200" height="52" caption="cam2map GUI part 3" />
@@ -1086,7 +1086,7 @@
<dataFile path="assets/IN/EN0108828436M.map">
<brief> Map file </brief>
<description>
- Input map file defining the desired output map projection. This
+ Input map file defining the desired output map projection. This
file is in PVL format.
</description>
<parameterName> MAP </parameterName>
@@ -1105,17 +1105,17 @@
<outputImages>
<image src="assets/images/ToFile_EN0108827082M.lev2.jpg" width="496" height="496">
<brief> Output image for ringscam2map RINGLONSEAM=AUTO</brief>
- <description> This is the output of ringscam2map demonstating the use of
+ <description> This is the output of ringscam2map demonstating the use of
MATCHMAP=YES with an Isis map file as MAP. Contrast
this output with the previous example, which was also
- created with MATCHMAP=YES, but uses an Isis level 2 image
+ created with MATCHMAP=YES, but uses an Isis level 2 image
for MAP.
</description>
<thumbnail caption="Output of ringscam2map run with MATCHMAP=YES and map file" src="assets/thumbs/ToFile_EN0108827082M.lev2_thumb.jpg " width="200" height="200"/>
<parameterName>TO</parameterName>
</image>
</outputImages>
- </example>
+ </example>
</examples>
-->
</application>
diff --git a/isis/src/base/apps/shadow/shadow.xml b/isis/src/base/apps/shadow/shadow.xml
index f6f14fc0da..dfcf06a882 100644
--- a/isis/src/base/apps/shadow/shadow.xml
+++ b/isis/src/base/apps/shadow/shadow.xml
@@ -11,7 +11,7 @@
We use the sun's position at the center of the input cube or a user-defined
observation time. By default, we factor in shadows cast by features.
- This program operates much like the ISIS3 'shade' program which instead requires azimuth/elevation as input.<br/><br/>
+ This program operates much like the ISIS 'shade' program which instead requires azimuth/elevation as input.<br/><br/>
However, with the shadow application, using the sun's position allows much
higher precision shading and enables the possibility of computing shadowed areas.
diff --git a/isis/src/base/apps/shadowtau/shadowtau.xml b/isis/src/base/apps/shadowtau/shadowtau.xml
index 1ea670cf74..1cd646f083 100644
--- a/isis/src/base/apps/shadowtau/shadowtau.xml
+++ b/isis/src/base/apps/shadowtau/shadowtau.xml
@@ -1,43 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<application name="shadowtau" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
-
+
<brief>
- Estimate optical depth (tau) using information from shadow measurements
+ Estimate optical depth (tau) using information from shadow measurements
</brief>
-
+
<description>
<p>
- This program estimates the optical depth (tau) values using a table file
- that consists of measurements collected at different locations on
- <def>Level1</def> images with ISIS <i>qview</i> or another image
- display program. Information for different images can be entered into
- a single table file. The input values gathered are the average
- <def link="Digital Number">density</def> measurements
- of a dark shadow and its photometric properties, and the average
- density of an unshadowed level-surface near the measured dark shadow on a
- <def>Level1</def> image that are output to a table file. The table file
- contains one line per image point of the measured values separated by a
- comma or space in the following order:
+ This program estimates the optical depth (tau) values using a table file
+ that consists of measurements collected at different locations on
+ <def>Level1</def> images with ISIS <i>qview</i> or another image
+ display program. Information for different images can be entered into
+ a single table file. The input values gathered are the average
+ <def link="Digital Number">density</def> measurements
+ of a dark shadow and its photometric properties, and the average
+ density of an unshadowed level-surface near the measured dark shadow on a
+ <def>Level1</def> image that are output to a table file. The table file
+ contains one line per image point of the measured values separated by a
+ comma or space in the following order:
<ol>
<li>Image ID</li>
- <li><def link="Incidence Angle">Incidence angle</def> of the measured
+ <li><def link="Incidence Angle">Incidence angle</def> of the measured
dark shadow</li>
- <li><def link="Emission Angle">Emission angle</def> of the measured
+ <li><def link="Emission Angle">Emission angle</def> of the measured
dark shadow</li>
<li><def link="Phase Angle">Phase angle</def> of the measured dark shadow</li>
- <li>The average DN (<def link="Radiance">radiance</def>) of a level
+ <li>The average DN (<def link="Radiance">radiance</def>) of a level
unshadowed area</li>
<li>The average DN (radiance) of a dark shadowed area</li>
</ol>
</p>
<p>
- The image below shows an example of areas that could be measured on a
- <def>Level1</def> image using the qview tools. The tracking tool is used
- to obtain the phase, incidence, and emission angles of the dark shadow.
- The statistics tool in <i>qview</i> is used to obtain the
- average density of the selected area on a dark shadow and an unshadowed
- area near the dark shadow. The average pixel values can be added to the
+ The image below shows an example of areas that could be measured on a
+ <def>Level1</def> image using the qview tools. The tracking tool is used
+ to obtain the phase, incidence, and emission angles of the dark shadow.
+ The statistics tool in <i>qview</i> is used to obtain the
+ average density of the selected area on a dark shadow and an unshadowed
+ area near the dark shadow. The average pixel values can be added to the
tracking window, under notes, for each point, and saved to an output file.
Another option is to record the information using a text editor.
<br /> <br />
@@ -48,9 +48,9 @@
</p>
<p>
Whatever method is used to record the information into a table file,
- the input file to shadowtau must have required column information in a
- specific order. Note: the program qview does not output the photometric
- information in the correct order, so the user must modify the output
+ the input file to shadowtau must have required column information in a
+ specific order. Note: the program qview does not output the photometric
+ information in the correct order, so the user must modify the output
before using the table file in shadowtau.
</p>
<p>
@@ -65,7 +65,7 @@
</pre>
</p>
<p>
- 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:<br />
<pre>
PSP_001414_1780_RED5.cub, 54.3287, 17.7148, 70.0486, 0.0943, 0.0667265, <b>0.43133</b>, <b>0.120277</b>
@@ -76,23 +76,23 @@
</pre>
</p>
<p>
- For each line in the table file above, the model results for the tau
- and <def link="Albedo">albedo</def> 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 <def link="Albedo">albedo</def> 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.
</p>
<p>
- The surface and atmosphere models use the same assumptions as the
- <i>photomet</i> 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 <i>photomet</i>.
+ The surface and atmosphere models use the same assumptions as the
+ <i>photomet</i> 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 <i>photomet</i>.
</p>
<small>
<br/>
@@ -107,42 +107,42 @@
<tr>
<th>Name</th>
<th>Required parameter names</th>
-</tr>
+</tr>
<tr>
<td> Hapkehen </td>
<td>B0, hg1, hg2, hh, theta, wh</td>
-</tr>
+</tr>
<tr>
<td> Hapkeleg </td>
<td>Theta, wh, bh, ch, hh, b0, zerob0st</td>
</tr> <tr>
<td> Lambert </td>
<td>None</td>
-</tr>
+</tr>
<tr>
<td> LommelSeeliger </td>
<td>None</td>
-</tr>
+</tr>
<tr>
<td> LunarLambert </td>
<td>L</td>
-</tr>
+</tr>
<tr>
<td> LunarLambertEmpirical <b>(Disabled until next release)</b> </td>
<td>Datafile</td>
-</tr>
+</tr>
<tr>
<td> LunarLambertMcEwen </td>
<td>None</td>
-</tr>
+</tr>
<tr>
<td> Minnaert </td>
<td>K</td>
-</tr>
+</tr>
<tr>
<td> MinnaertEmpirical <b>(Disabled until next release)</b> </td>
<td>Datafile</td>
-</tr>
+</tr>
</table>
<br/>
<br/>
@@ -152,7 +152,7 @@
<tr>
<th>Name</th>
<th>Description</th>
-<th>ISIS3 default</th>
+<th>ISIS default</th>
<th>Valid range</th>
</tr>
<tr>
@@ -266,7 +266,7 @@ incidence</def> and <def link="Emission Angle">emission angles</def>, respective
<tr>
<th>Function model name</th>
<th>Required parameters</th>
-</tr>
+</tr>
<tr>
<td> Anisotropic1 </td>
<td>Bha, hnorm, wha</td>
@@ -302,7 +302,7 @@ incidence</def> and <def link="Emission Angle">emission angles</def>, respective
<tr>
<th>Name</th>
<th>Description</th>
-<th>ISIS3 Default</th>
+<th>ISIS Default</th>
<th>Valid Range</th>
</tr>
<tr>
@@ -338,31 +338,31 @@ incidence</def> and <def link="Emission Angle">emission angles</def>, respective
<pre>
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
</pre>
</description>
@@ -422,9 +422,9 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
Input text file name
</brief>
<description>
- 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
</description>
<filter>
*.txt
@@ -437,9 +437,9 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
Output text file name
</brief>
<description>
- 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.
</description>
@@ -448,7 +448,7 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
</filter>
</parameter>
</group>
-
+
<group name="Photometric Model">
<parameter name="PHTNAME">
<type>combo</type>
@@ -461,15 +461,15 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
<dl>
<dt><b>HAPKEHEN</b></dt>
<dd>
- 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. <br/>
<br/>
- 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). <br/>
<br/>
<table border="1">
@@ -507,21 +507,21 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
<td>1.0</td>
</tr>
</table>
- </dd>
+ </dd>
<dt><b>HAPKELEG</b></dt>
<dd>
- 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.
- </dd>
+ </dd>
<dt><b>LAMBERT </b></dt>
<dd>
- 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.
- </dd>
+ </dd>
<dt><b>LOMMELSEELIGER</b></dt>
<dd>
This model takes into account the <def>radiance</def> 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.
- </dd>
+ </dd>
<dt><b>LUNARLAMBERTMCEWEN</b></dt>
<dd>
This model was developed specifically for use with the Moon, and
designed to be used in conjunction with the Moon(MoonAlbedo)
normalization model.
- </dd>
- <dt><b>LUNARLAMBERTEMPIRICAL</b>, <b>LUNARLAMBERT</b>,
+ </dd>
+ <dt><b>LUNARLAMBERTEMPIRICAL</b>, <b>LUNARLAMBERT</b>,
<b>MINNAERTEMPIRICAL</b>, and <b>MINNAERT</b>
</dt>
<dd>
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
<def link="Reflectance">reflectance</def> behavior
of many planetary surfaces equally well as the Hapke model. These
models also depend on the incidence and emission angles.
- </dd>
- </dl>
+ </dd>
+ </dl>
<p>
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.
</p>
</description>
@@ -566,7 +566,7 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
Hapke-Henyey-Greenstein Photometric Model
</brief>
<description>
- Derive model albedo using complete Hapke model with Henyey-Greenstein
+ Derive model albedo using complete Hapke model with Henyey-Greenstein
single-particle phase function.
</description>
<inclusions>
@@ -591,7 +591,7 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
Hapke Legendre Polynomial Photometric Model
</brief>
<description>
- 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.
</description>
<inclusions>
@@ -640,7 +640,7 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
</brief>
<description>
This model takes into account the <def link="Radiance">radiance</def>
- that results from single scattering (scattering of collimated
+ that results from single scattering (scattering of collimated
incident light).
</description>
<exclusions>
@@ -683,13 +683,13 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
</exclusions>
</option>
//-->
-
+
<option value="LUNARLAMBERTMCEWEN">
<brief>
Lunar Lambert-McEwen Photometric Model
</brief>
<description>
- This model was designed for the Moon to be used in conjunction with the
+ This model was designed for the Moon to be used in conjunction with the
MoonAlbedo normalization model.
</description>
<exclusions>
@@ -755,7 +755,7 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
<item>L</item>
<item>DATAFILE</item>
</exclusions>
- </option>
+ </option>
//-->
<option value="MINNAERT">
<brief>
@@ -813,7 +813,7 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
<default><item>None Specified</item></default>
<internalDefault>None Specified</internalDefault>
<description>
- The Hapke single scattering albedo of surface particles,
+ The Hapke single scattering albedo of surface particles,
see Hapke (1981).
</description>
<minimum inclusive="no">0.0</minimum>
@@ -833,7 +833,7 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
surface. See Hapke (1981). The two-parameter Henyey Greenstein
function is as follows:
<blockquote>
- P(phase)=(1-hg2) * (1-hg1**2)/(1+hg1**2+2*hg1*cos(phase))**1.5
+ P(phase)=(1-hg2) * (1-hg1**2)/(1+hg1**2+2*hg1*cos(phase))**1.5
+ hg2 * (1-hg1**2)/(1+hg1**2-2*hg1*cos(phase))**1.5
</blockquote>
</description>
@@ -851,9 +851,9 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
<description>
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.
</description>
<minimum inclusive="yes">0.0</minimum>
@@ -869,13 +869,13 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
<internalDefault>None Specified</internalDefault>
<description>
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:
<blockquote>
P(phase) = 1 + bh * p1(cos(phase)) + ch * p2(cos(phase)) <br/>
</blockquote>
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.
</description>
<minimum inclusive="no">-1.0</minimum>
@@ -891,7 +891,7 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
<internalDefault>None Specified</internalDefault>
<description>
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: <br/>
<blockquote>
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
<default><item>None Specified</item></default>
<internalDefault>None Specified</internalDefault>
<description>
- 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).
</description>
<minimum inclusive="yes">0.0</minimum>
@@ -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
</brief>
<description>
- 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.
</description>
</option>
<option value="TRUE">
<brief>
- B0 will be set to zero for standard conditions phase
+ B0 will be set to zero for standard conditions phase
</brief>
<description>
This option specifies that the opposition surge B0 will be set to zero
@@ -970,12 +970,12 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
<default><item>None Specified</item></default>
<internalDefault>None Specified</internalDefault>
<description>
- The Lunar Lambert function weight that governs limb-darkening
- in the lunar lambert photometric function:
+ The Lunar Lambert function weight that governs limb-darkening
+ in the lunar lambert photometric function:
<blockquote>
Func=(1-L)*u0 + 2*L*u0/(u0+u)
</blockquote>
- The values generally fall in the range from 0 (Lambert function) to 1
+ The values generally fall in the range from 0 (Lambert function) to 1
(Lommel-Seeliger or "lunar" function).
</description>
</parameter>
@@ -988,12 +988,12 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
<default><item>None Specified</item></default>
<internalDefault>None Specified</internalDefault>
<description>
- The Minnaert function exponent that governs limb-darkening in the
- Minnaert photometric function:
+ The Minnaert function exponent that governs limb-darkening in the
+ Minnaert photometric function:
<blockquote>
Func=u0**K * u**(K-1)
</blockquote>
- The values generally fall in the range from 0.5 ("lunar-like",
+ The values generally fall in the range from 0.5 ("lunar-like",
almost no limb darkening) to 1.0 (Lambert function).
</description>
<minimum inclusive="yes">0.0</minimum>
@@ -1004,31 +1004,31 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
<type>filename</type>
<fileMode>input</fileMode>
<brief>
- PVL file with parameter values for empirical functions
+ PVL file with parameter values for empirical functions
</brief>
<filter>*.txt</filter>
<description>
<p>
- This file contains a table of parameter values for Lunar Lambert
- Empirical (PHASELIST, LLIST, PHASECURVELIST) and Minnaert Empirical
- (PHASELIST, KLIST, PHASECURVELIST) functions. The file may contain
- sets of values for both empirical functions, generally intended to
+ This file contains a table of parameter values for Lunar Lambert
+ Empirical (PHASELIST, LLIST, PHASECURVELIST) and Minnaert Empirical
+ (PHASELIST, KLIST, PHASECURVELIST) functions. The file may contain
+ sets of values for both empirical functions, generally intended to
represent the same Hapke model (same planetary surface). The
- <i>phoempglobal</i> program can be used to calculate the parameter
- values that best approximate a Hapke model. The output file from
- <i>phoempglobal</I> can be used as input for the datafile parameter.
+ <i>phoempglobal</i> program can be used to calculate the parameter
+ values that best approximate a Hapke model. The output file from
+ <i>phoempglobal</I> can be used as input for the datafile parameter.
</p>
<p>
- The example below is for Mars red filter images. The phase angles
- (PhaseList) at
- which the coefficient values for the Lunar Lambert Empirical (LList)
- and the Minnaert Empirical (KLIST) approximation are calculated,
- along with the brightness (PhaseCurveList) values at those points.
+ The example below is for Mars red filter images. The phase angles
+ (PhaseList) at
+ which the coefficient values for the Lunar Lambert Empirical (LList)
+ and the Minnaert Empirical (KLIST) approximation are calculated,
+ along with the brightness (PhaseCurveList) values at those points.
The values for each parameter must be entered on a single line.
The example belows shows the values on two or three lines for
- presentation only. Remember, the values must be on a single line
+ presentation only. Remember, the values must be on a single line
in the input file.
- </p>
+ </p>
<pre>
Object = PhotometricModel
@@ -1057,12 +1057,12 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
0.09797,0.08750,0.07594,0.06466,0.05471,0.04665,0.03935,
0.03339,0.02642,0.01482,0."
EndGroup
- EndObject
+ EndObject
</pre>
- </description>
+ </description>
</parameter>
//-->
-
+
</group>
<group name="Atmospheric Model">
<parameter name="ATMNAME">
@@ -1082,7 +1082,7 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
<br/>
<br/>
<b>
- The table below are photometric parameter values for Mars,
+ The table below are photometric parameter values for Mars,
adopted from Tomasko et al. (1999):
</b><br/>
<table border="1">
@@ -1219,9 +1219,9 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
<internalDefault>None Specified</internalDefault>
<description>
The coefficient of single particle Henyey Greenstein phase
- function. Henyey-Greenestein asymmetry parameter for atmospheric
- particle phase function, used in hapkeatm1 and hapkeatm2 atmospheric models.
- Not to be confused with corresponding parameter hg1 for the
+ function. Henyey-Greenestein asymmetry parameter for atmospheric
+ particle phase function, used in hapkeatm1 and hapkeatm2 atmospheric models.
+ Not to be confused with corresponding parameter hg1 for the
surface particles.
</description>
<minimum inclusive="no">-1.0</minimum>
@@ -1252,7 +1252,7 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
<description>
The coefficient of the single particle Legendre phase function.
Coefficient of p1 (cosine) term of atmospheric particle phase
- function, used in anisotropic1 and anisotropic2 atmospheric models. Not to be confused
+ function, used in anisotropic1 and anisotropic2 atmospheric models. Not to be confused
with corresponding coefficient bh for the surface particles.
</description>
<minimum inclusive="yes">-1.0</minimum>
@@ -1268,15 +1268,15 @@ Tomasko, M. G., et al., 1999, Properties of Dust in the Martian Atmosphere
<internalDefault>None Specified</internalDefault>
<description>
The atmospheric shell thickness normalized to the planet
- radius, used to modify angles to get more accurate path lengths
+ radius, used to modify angles to get more accurate path lengths
near the terminator (Ratio of scale height to the planetary
- radius). The hnorm parameter is defined as "0.003" for Mars,
- which is the only planet for which the atmospheric modes are currently
+ radius). The hnorm parameter is defined as "0.003" for Mars,
+ which is the only planet for which the atmospheric modes are currently
used.
</description>
<minimum inclusive="yes">0.0</minimum>
</parameter>
</group>
-
+
</groups>
</application>
diff --git a/isis/src/base/apps/smtk/smtk.xml b/isis/src/base/apps/smtk/smtk.xml
index bfa7627609..e5f4e0edd3 100644
--- a/isis/src/base/apps/smtk/smtk.xml
+++ b/isis/src/base/apps/smtk/smtk.xml
@@ -2,31 +2,31 @@
<application name="smtk" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Generate a digital elevation map (DEM) from two images using the Stereo
+ Generate a digital elevation map (DEM) from two images using the Stereo
Matcher ToolKit (SMTK)
</brief>
<description>
<p>
- This application creates a digital elevation model (DEM) from two images.
- It uses coregistration of selected corresponding points to determine match
- points. Each coregistered match point is then used to add additional
- match points in the nearby (SUBCBOX) neighborhood. Additionally,
- potential match point candidate are grown from the seed match points that
+ This application creates a digital elevation model (DEM) from two images.
+ It uses coregistration of selected corresponding points to determine match
+ points. Each coregistered match point is then used to add additional
+ match points in the nearby (SUBCBOX) neighborhood. Additionally,
+ potential match point candidate are grown from the seed match points that
provide full DEM coverage.
- </p>
+ </p>
<p>
- Initially, seed points are required to provide a starting point to DEM
+ Initially, seed points are required to provide a starting point to DEM
generation. Seed points can come either from a control net file (see the
- ISIS qnet application) or is created automatically by the application.
+ ISIS qnet application) or is created automatically by the application.
</p>
<p>
- Automatic seed point generatation is accomplished using the Gruen
- co-registration algorithm. A grid of control points is created using the
- SPACE parameter to determine line and sample increments of the center of
- each point. The sizes of the "chips" are defined by the contents of the
- REGDEF parameter. This REGDEF file follows the ISIS3 AutoRegistration
- design for generic specifications of matching algorithm definitions.
+ Automatic seed point generatation is accomplished using the Gruen
+ co-registration algorithm. A grid of control points is created using the
+ SPACE parameter to determine line and sample increments of the center of
+ each point. The sizes of the "chips" are defined by the contents of the
+ REGDEF parameter. This REGDEF file follows the ISIS AutoRegistration
+ design for generic specifications of matching algorithm definitions.
</p>
<p>
Here is an example of a REGDEF file:
@@ -48,31 +48,31 @@
# DefaultRadioShift = 0.0
# DefaultRadioGain = 0.0
EndGroup
-
+
Group = PatternChip
- Samples = 21
+ Samples = 21
Lines = 21
ValidPercent = 75.0
MinimumZScore = 1.7
EndGroup
-
+
Group = SearchChip
- Samples = 31
- Lines = 31
+ Samples = 31
+ Lines = 31
ValidPercent = 75.0
EndGroup
EndObject
</PRE>
<br/>
- Here is a description of all the parameters that are utilized by the
- <b>smtk</b> application. Defaults that are set within the program are
- indicated where applicable. If a default is provided, the presence of the
- keyword is not required in the REGDEF file. The ISIS2 equivalent is
+ Here is a description of all the parameters that are utilized by the
+ <b>smtk</b> application. Defaults that are set within the program are
+ indicated where applicable. If a default is provided, the presence of the
+ keyword is not required in the REGDEF file. The ISIS2 equivalent is
provided where applicable:
<br><h1 align="center">Gruen AutoReg Parameters</h1></br>
<TABLE BORDER="1">
<CAPTION>
- </CAPTION>
+ </CAPTION>
<TR>
<TH>Parameter</TH>
<TH>Description</TH>
@@ -80,24 +80,24 @@
<TR>
<TD>Name</TD>
<TD>
- Name of the algorithm that the set of parameters description apply
+ Name of the algorithm that the set of parameters description apply
to. This should be <em>AdaptiveGruen</em>.
</TD>
</TR>
<TR>
<TD>Tolerance</TD>
<TD>
- This constrains the eigenvalues of the registration result.
- Registrations with <b>GoodnessOfFit</b> larger than this value are
- rejected. It is highly recommended this value be utilized as it
- will result in better fits. (Default: Unbounded) (ISIS2
+ This constrains the eigenvalues of the registration result.
+ Registrations with <b>GoodnessOfFit</b> larger than this value are
+ rejected. It is highly recommended this value be utilized as it
+ will result in better fits. (Default: Unbounded) (ISIS2
Equivalent: MAXEV)
</TD>
</TR>
<TR>
<TD>MaximumIterations</TD>
<TD>
- Maximum number of iterations allowed for the registration processing
+ Maximum number of iterations allowed for the registration processing
to converge. (Default: 30) (ISIS2 Equivalent: GITER)
</TD>
</TR>
@@ -105,103 +105,103 @@
<TD>AffineTolerance</TD>
<TD>
The amount of offset in pixels an Affine derived points is allowed to
- deviate from the orginal match point. (Default: Unbounded)(ISIS2
+ deviate from the orginal match point. (Default: Unbounded)(ISIS2
Equivalent: DAFFINE)
</TD>
</TR>
<TR>
<TD>SpiceTolerance</TD>
<TD>
- The amount of offset in pixels a registration is allowed to deviate
- from a registered point. (Default: Unbounded)(ISIS2 Equivalent:
+ The amount of offset in pixels a registration is allowed to deviate
+ from a registered point. (Default: Unbounded)(ISIS2 Equivalent:
DSPICE)
</TD>
</TR>
<TR>
<TD>AffineTranslationTolerance</TD>
<TD>
- Specifies the threshold convergence value of the Affine translation
- shift in line/sample between each Gruen match iteration. If the
- amout of this value computed in the Gruen algorithm is less than this
- value, it is deemed a match point concerning the translation portion
+ Specifies the threshold convergence value of the Affine translation
+ shift in line/sample between each Gruen match iteration. If the
+ amout of this value computed in the Gruen algorithm is less than this
+ value, it is deemed a match point concerning the translation portion
of the registered point. (Default: 0.1) (ISIS2 Eqivalent: THRESH1)
</TD>
</TR>
<TR>
<TD>AffineScaleTolerance</TD>
<TD>
- Specifies the threshold convergence value of the Affine scale in
- line/sample between each Gruen match iteration. If the amout of this
- value computed in the Gruen algorithm is less than this value, it is
- deemed a match point concerning the scaling portion of the registered
+ Specifies the threshold convergence value of the Affine scale in
+ line/sample between each Gruen match iteration. If the amout of this
+ value computed in the Gruen algorithm is less than this value, it is
+ deemed a match point concerning the scaling portion of the registered
point. (Default: 0.3) (ISIS2 Eqivalent: THRESH2)
</TD>
</TR>
<TR>
<TD>AffineShearTolerance</TD>
<TD>
- Specifies the threshold convergence value of the Affine shear in
- line/sample between each Gruen match iteration. If the amout of this
- value computed in the Gruen algorithm is less than this value, it is
- deemed a match point concerning the shearing portion of the registered
+ Specifies the threshold convergence value of the Affine shear in
+ line/sample between each Gruen match iteration. If the amout of this
+ value computed in the Gruen algorithm is less than this value, it is
+ deemed a match point concerning the shearing portion of the registered
point. (Default: AffineScaleTolerance) (ISIS2 Eqivalent: THRESH2)
</TD>
</TR>
<TR>
<TD>RadioShiftTolerance</TD>
<TD>
- Specifies the threshold convergence value for the radiometric shift of
- the pixel value between each Gruen match iteration. If the amout of this
- value computed in the Gruen algorithm is less than this value, it is
- deemed a match point concerning the radiometric shift portion of the
+ Specifies the threshold convergence value for the radiometric shift of
+ the pixel value between each Gruen match iteration. If the amout of this
+ value computed in the Gruen algorithm is less than this value, it is
+ deemed a match point concerning the radiometric shift portion of the
registered point. (Default: Unbounded) (ISIS2 Equivalent: 256)
</TD>
</TR>
<TR>
<TD>RadioGainMinTolerance</TD>
<TD>
- Specifes the threshold convergence minimum value for the radiometric
- gain of the pixel value between each Gruen match iteration. If the amout of this
+ Specifes the threshold convergence minimum value for the radiometric
+ gain of the pixel value between each Gruen match iteration. If the amout of this
value computed in the Gruen algorithm is greater than this value and
less than RadioGainMaxTolerance, it is deemed a match point concerning
- the radiometric gain portion of the registered point. (Default:
+ the radiometric gain portion of the registered point. (Default:
Unbounded) (ISIS2 Equivalent: 0.25)
</TD>
</TR>
<TR>
<TD>RadioGainMaxTolerance</TD>
<TD>
- Specifes the threshold convergence maximum value for the radiometric
- gain of the pixel value between each Gruen match iteration. If the amout of this
- value computed in the Gruen algorithm is less than this value and
- greater than RadioGainMinTolerance, it is deemed a match point
- concerning the radiometric gain portion of the registered point.
+ Specifes the threshold convergence maximum value for the radiometric
+ gain of the pixel value between each Gruen match iteration. If the amout of this
+ value computed in the Gruen algorithm is less than this value and
+ greater than RadioGainMinTolerance, it is deemed a match point
+ concerning the radiometric gain portion of the registered point.
(Default: Unbounded) (ISIS2 Equivalent: 4.0)
</TD>
</TR>
<TR>
<TD>DefaultRadioShift</TD>
<TD>
- Sets the default value for the radiometric shift value used as a
+ Sets the default value for the radiometric shift value used as a
starting point in the Gruen algorithm. (Default: 0)
</TD>
</TR>
<TR>
<TD>DefaultRadioGain</TD>
<TD>
- Sets the default value for the radiometric gain value used as a
+ Sets the default value for the radiometric gain value used as a
starting point in the Gruen algorithm. (Default: 0)
</TD>
</TR>
</TABLE>
- <br/> Other ISIS2 parameters CBOX (Samples, Lines), LOW (ValidMinimum),
- HIGH (ValidMaximum), GMPTS (ValidPercent) are specified in the PatternChip
- and SearchChip groups. See the
- <b>coreg</b> application documentation for the details on these and other
- additional parameters that may be used to refine or constrain match
+ <br/> Other ISIS2 parameters CBOX (Samples, Lines), LOW (ValidMinimum),
+ HIGH (ValidMaximum), GMPTS (ValidPercent) are specified in the PatternChip
+ and SearchChip groups. See the
+ <b>coreg</b> application documentation for the details on these and other
+ additional parameters that may be used to refine or constrain match
conditions.
</p>
- <p>
+ <p>
Once the full grid of control points is generated, a subset of points are
selected using various algorithms. The NSEED parameter determines the
total number of seed points that will be selected from the result of the
@@ -211,62 +211,62 @@
selected. Otherwise, 5% of the control points will be selected.
</p>
<p>
- The seed point selection process is governed by SEEDSAMPLE. If SEEDSAMPLE
- <= 0.0, then the points are selected from the best matching points as
- registered by the Gruen algorithm. Otherwise, a specially crafted
- randomized selection algorithm is used. This algorithm uses the range of
- control point goodness of fit (or eigenvalues in the case of the Gruen
- algorithm measure of registration) to compute a randomized value that is
- added to each eigenvalue and tested against the best (smallest) one.
+ The seed point selection process is governed by SEEDSAMPLE. If SEEDSAMPLE
+ <= 0.0, then the points are selected from the best matching points as
+ registered by the Gruen algorithm. Otherwise, a specially crafted
+ randomized selection algorithm is used. This algorithm uses the range of
+ control point goodness of fit (or eigenvalues in the case of the Gruen
+ algorithm measure of registration) to compute a randomized value that is
+ added to each eigenvalue and tested against the best (smallest) one.
This algorithm is repeated until all seed points are selected.
</p>
<p>
- A random number generator is required to make this algorithm work.
- <b>smtk</b> uses the
+ A random number generator is required to make this algorithm work.
+ <b>smtk</b> uses the
<a href="http://www.gnu.org/software/gsl/manual/html_node/Random-Number-Generation.html">GSL Random Number Generator</a>. The default GSL random number generator used is the <em>Mersenne Twister</em>.
<a href="http://www.gnu.org/software/gsl/manual/html_node/Random-number-generator-algorithms.htmll">Other GSL</a> algorithms can be selected with the use of
<a href="http://www.gnu.org/software/gsl/manual/html_node/Random-number-environment-variables.html">environment variables</a>
</p>
<p>
- Once the seed points are selected, generation of the DEM begins. The best
- registering points are selected first off the list of seed points. Each
- seed point is added to the final DEM point if a point does not already
- exist for the given line/sample coordinate. The list of final DEM match
+ Once the seed points are selected, generation of the DEM begins. The best
+ registering points are selected first off the list of seed points. Each
+ seed point is added to the final DEM point if a point does not already
+ exist for the given line/sample coordinate. The list of final DEM match
points are continually added to with points cloned from registered points
- at intervals SUBCBOX lines and samples if and only if the current
- registration point is better than the existing one at those surrounding
+ at intervals SUBCBOX lines and samples if and only if the current
+ registration point is better than the existing one at those surrounding
points.
</p>
<p>
- The candidate list of points are grown at adjacent line/sample coordinates
- by cloning the points using the Affine parameters computed for the
- original match point. These points are tested for validity in terms of
- points within the image boundary and geometric mapping. The progress of
+ The candidate list of points are grown at adjacent line/sample coordinates
+ by cloning the points using the Affine parameters computed for the
+ original match point. These points are tested for validity in terms of
+ points within the image boundary and geometric mapping. The progress of
the growth stack is reported as it grows.
</p>
<p>
- The DEM generation is complete when the (growth) match point stack is
+ The DEM generation is complete when the (growth) match point stack is
depleted.
</p>
<p>
- The DEM is created by computing stereo elevations from the left (FROM) and
- right (MATCH) points. Vectors from the target (planet center) to the
- spacecraft and target to the surface registration points are computed for
+ The DEM is created by computing stereo elevations from the left (FROM) and
+ right (MATCH) points. Vectors from the target (planet center) to the
+ spacecraft and target to the surface registration points are computed for
each point. From these points, the elevation is computed.
</p>
<p>
- From these points, a three band cube is generated from the FROM file. The
- first band is elevation, second is the error in the elevation and the
+ From these points, a three band cube is generated from the FROM file. The
+ first band is elevation, second is the error in the elevation and the
third is the goodness of fit (eigenvalue).
</p>
<p>
- This application works best on level2 projected images that have not been
+ This application works best on level2 projected images that have not been
mosaiced.
</p>
<p>
<br><h2 align="left">Acknowledgements</h2></br>
- This application is derived from the ISIS2 application SMTK suite
- (matcher, stereo, and xyzplot). ISIS2 SMTK was developed by Sarah Andre
+ This application is derived from the ISIS2 application SMTK suite
+ (matcher, stereo, and xyzplot). ISIS2 SMTK was developed by Sarah Andre
and Troy Andre.
</p>
</description>
@@ -290,7 +290,7 @@
Implemented growing algorithm
</change>
<change name="Kris Becker" date="2011-06-03">
- Made significant changes to Gruen and smtk to better implement the ISIS2
+ Made significant changes to Gruen and smtk to better implement the ISIS2
version of the application.
</change>
<change name="Debbie A. Cook" date="2012-07-06">
@@ -300,7 +300,7 @@
Updated to use new Target class. References Mantis numbers #775 and #1114.
</change>
<change name="Jeannie Backer" date="2016-04-22">
- Modified to use the FROM cube labels to set output control net target instead of the
+ Modified to use the FROM cube labels to set output control net target instead of the
TargetName. References #3892
</change>
</history>
@@ -314,7 +314,7 @@
Input Image to be matched
</brief>
<description>
- This cube will be used as the pattern or fixed image. It will
+ This cube will be used as the pattern or fixed image. It will
correspond to the output image DEM generated by smtk.
</description>
<filter>
@@ -329,7 +329,7 @@
The file that will be geometrically (affined) matched
</brief>
<description>
- This cube will be geometrically matched to the FROM image using an
+ This cube will be geometrically matched to the FROM image using an
interative (AdaptiveGruen) algorithm.
</description>
<filter>
@@ -344,8 +344,8 @@
The Gruen Auto Registration paramter file
</brief>
<description>
- File containing parameters that are provided to the Gruen algorithm
- that provide definitions, defaults and constraints for registration
+ File containing parameters that are provided to the Gruen algorithm
+ that provide definitions, defaults and constraints for registration
processing.
</description>
<helpers>
@@ -382,18 +382,18 @@
<parameter name="SPACE">
<type>integer</type>
- <brief>
+ <brief>
Growth spacing value
</brief>
<description>
- This parameter specifies the spacing of lines and samples around a
- seed point to grow a seed point. This value added to the surrounding
- sample and line of a 3x3 box around a match point. The FROM image
- latitude and longitude values is used at that line/sample location to
- determine the MATCH line/sample point. The affine of the match point
- is then applied to the MATCH line/sample point and its parameters are
- added to the grow stack for futher population considerations. As
- such, it should not to large a value as the affine translation
+ This parameter specifies the spacing of lines and samples around a
+ seed point to grow a seed point. This value added to the surrounding
+ sample and line of a 3x3 box around a match point. The FROM image
+ latitude and longitude values is used at that line/sample location to
+ determine the MATCH line/sample point. The affine of the match point
+ is then applied to the MATCH line/sample point and its parameters are
+ added to the grow stack for futher population considerations. As
+ such, it should not to large a value as the affine translation
validity is not too strong very far away from the match point.
</description>
<default><item>3</item></default>
@@ -401,31 +401,31 @@
<parameter name="NSEED">
<type>double</type>
- <brief>
+ <brief>
Specify how to select seed points
</brief>
<description>
- When computing seed values not coming from a control net, this
- parameter specifies how many to keep from the succesful list
- generated from the first pass. If 0, then save 5 percent of the
- total number computed seed points. If > 0 and < 1, this is
- the percentage to use. If > 1, specifies the number of points to
- select.
+ When computing seed values not coming from a control net, this
+ parameter specifies how many to keep from the succesful list
+ generated from the first pass. If 0, then save 5 percent of the
+ total number computed seed points. If > 0 and < 1, this is
+ the percentage to use. If > 1, specifies the number of points to
+ select.
</description>
<default><item>0.0</item></default>
</parameter>
<parameter name="SEEDSAMPLE">
<type>double</type>
- <brief>
+ <brief>
Specify method for choosing best seed point
</brief>
<description>
- This parameter specifies what process to use to select the best
- seed points from the first pass (automatic seed point generation) of
- the matcher. If 0, use the smallest eigen value to the largest
- (essentially preferring the best points). If > 0, sample from
- minimum to maximum eigen with exponetial distribution where
+ This parameter specifies what process to use to select the best
+ seed points from the first pass (automatic seed point generation) of
+ the matcher. If 0, use the smallest eigen value to the largest
+ (essentially preferring the best points). If > 0, sample from
+ minimum to maximum eigen with exponetial distribution where
SEEDSAMPLE is the curvature.
</description>
<default><item>0.0</item></default>
@@ -433,19 +433,19 @@
<parameter name="SUBCBOX">
<type>integer</type>
- <brief>
+ <brief>
Growth replication box size
</brief>
<description>
- This parameter specifies the number of lines and samples around a seed
- point to replicate in the growth algorithm. These points are added to
- the final point set when comparison against existing points results in
+ This parameter specifies the number of lines and samples around a seed
+ point to replicate in the growth algorithm. These points are added to
+ the final point set when comparison against existing points results in
the new point having a better registration value.
</description>
<default><item>5</item></default>
</parameter>
</group>
-
+
<group name="Output Options">
<parameter name="TO">
<type>cube</type>
@@ -464,15 +464,15 @@
<parameter name="PLOTDIST">
<type>double</type>
<brief>
- Plot tolerance from match pixel for DEM determination
+ Plot tolerance from match pixel for DEM determination
</brief>
<description>
- This parameter provides a tolerance when determining
- searching for points that fall within the output plot
- buffer. smtk plots by tile so points on the border my fall
- outside the boundary of a tile. To ensure all possible
- points are included in the appropriate output tile, this
- parameter will include matchpoints that are outside the
+ This parameter provides a tolerance when determining
+ searching for points that fall within the output plot
+ buffer. smtk plots by tile so points on the border my fall
+ outside the boundary of a tile. To ensure all possible
+ points are included in the appropriate output tile, this
+ parameter will include matchpoints that are outside the
boundary of the output tile by this amount.
</description>
<default><item>5.0</item></default>
@@ -484,18 +484,18 @@
Size of box around box around center match pixel
</brief>
<description>
- This parameter specifies the size of the box around the
- match pixel to compute DEM output values for. If the
- BOXSIZE is 1, then only the center pixel is used. If the
- BOXSIZE is 3, then a 3x3 box around the center pixel is used
- to computed output pixel values and each match pixel may add
+ This parameter specifies the size of the box around the
+ match pixel to compute DEM output values for. If the
+ BOXSIZE is 1, then only the center pixel is used. If the
+ BOXSIZE is 3, then a 3x3 box around the center pixel is used
+ to computed output pixel values and each match pixel may add
9 total pixels to the DEM.
</description>
<default><item>3</item></default>
<minimum inclusive="true">1</minimum>
</parameter>
</group>
-
+
<group name= "Other Output Files">
<parameter name="OSEEDNET">
<type>filename</type>
@@ -504,15 +504,15 @@
Control network of selected seed points
</brief>
<description>
- This file will be created from the set of chosen seed points generated
- by this application. It can be used to discern the quality of the
- automatic and randomly generated point set from which all others are
- defined. It will not be created if one is provided. To evaluate the
- points, create a list of FROM and MATCH files. Then use the ISIS
- program <b>qnet</b> to select the list and then this file. It will
- display the two images and plot all the seed points on the two images.
- Points can be updated, deleted and added to the control network and
- then provided in subsequent runs of <b>smtk</b> as the seed control
+ This file will be created from the set of chosen seed points generated
+ by this application. It can be used to discern the quality of the
+ automatic and randomly generated point set from which all others are
+ defined. It will not be created if one is provided. To evaluate the
+ points, create a list of FROM and MATCH files. Then use the ISIS
+ program <b>qnet</b> to select the list and then this file. It will
+ display the two images and plot all the seed points on the two images.
+ Points can be updated, deleted and added to the control network and
+ then provided in subsequent runs of <b>smtk</b> as the seed control
network file, CNET.
</description>
<internalDefault>None</internalDefault>
@@ -528,7 +528,7 @@
Pvl file of ControlNet
</brief>
<description>
- This file will be created that contains all the DEM points created
+ This file will be created that contains all the DEM points created
by the <b>smtk</b> application. The data will be in Pvl format.
</description>
<internalDefault>None</internalDefault>
diff --git a/isis/src/base/apps/stats/stats.cpp b/isis/src/base/apps/stats/stats.cpp
index d192551a25..cb15a043d8 100644
--- a/isis/src/base/apps/stats/stats.cpp
+++ b/isis/src/base/apps/stats/stats.cpp
@@ -18,7 +18,7 @@ namespace Isis {
/**
* Compute the stats for an ISIS cube. This is the programmatic interface to
- * the ISIS3 stats application.
+ * the ISIS stats application.
*
* @param ui The User Interface to parse the parameters from
*/
@@ -34,7 +34,7 @@ namespace Isis {
/**
* Compute the stats for an ISIS cube. This is the programmatic interface to
- * the ISIS3 stats application.
+ * the ISIS stats application.
*
* @param inputCube input Cube to compute stats for
* @param ui The User Interface to parse the parameters from
diff --git a/isis/src/base/apps/std2isis/std2isis.xml b/isis/src/base/apps/std2isis/std2isis.xml
index f85ca986df..26142a822c 100644
--- a/isis/src/base/apps/std2isis/std2isis.xml
+++ b/isis/src/base/apps/std2isis/std2isis.xml
@@ -9,13 +9,13 @@
<description>
This program will import several standard image formats to an Isis cube.
The input image formats may include PNG, JPEG, JP2, TIFF, BMP, and GIF. Not all
- formats are available as the program implementation depends on the Qt
+ formats are available as the program implementation depends on the Qt
library by TrollTech. This is not true of JPEG2000 files (JP2). It has
- support in the ISIS3 library. By default, the number of bands in the output cube
- will be one, three, and four when the input image is all gray, RGB,
- and RGB with an alpha channel, respectively. The user can, however, specify
- the color mode manually. 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.
+ support in the ISIS library. By default, the number of bands in the output cube
+ will be one, three, and four when the input image is all gray, RGB,
+ and RGB with an alpha channel, respectively. The user can, however, specify
+ the color mode manually. 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.
</description>
<history>
@@ -73,7 +73,7 @@
<type>cube</type>
<fileMode>output</fileMode>
<brief>
- Output image
+ Output image
</brief>
<description>
Use this parameter to specify the name of the output cube.
@@ -88,18 +88,18 @@
<default><item>AUTO</item></default>
<brief>Mode for determining color model</brief>
<description>
- This parameter specifies the image mode for the output cube. If
+ This parameter specifies the image mode for the output cube. If
GRAYSCALE, a single one-band cube will be created. If RGB, a
- three-band cube is created. Finally, if ARGB is selected, then
- a four-band cube will be created where the four bands correspond
- to first Red, second Green, third Blue, and last Alpha.
+ three-band cube is created. Finally, if ARGB is selected, then
+ a four-band cube will be created where the four bands correspond
+ to first Red, second Green, third Blue, and last Alpha.
</description>
<list>
<option value="AUTO">
<brief>Automatically determine output mode</brief>
<description>
- Checks to see if the image is a grayscale image, and if not,
- if it has an alpha channel, and sets the output mode
+ Checks to see if the image is a grayscale image, and if not,
+ if it has an alpha channel, and sets the output mode
accordingly.
</description>
</option>
@@ -263,9 +263,9 @@
Converting an image to an Isis Cube in Automatic mode
</brief>
<description>
- This example will show the conversion from a color PNG image to a cube,
- automatically determining the color mode. Here, the output image will
- be a four-band ARGB cube, because the input image is both in color, and
+ This example will show the conversion from a color PNG image to a cube,
+ automatically determining the color mode. Here, the output image will
+ be a four-band ARGB cube, because the input image is both in color, and
has an alpha channel.
</description>
<terminalInterface>
@@ -283,7 +283,7 @@
Example GUI
</brief>
<description>
- Screenshot of the GUI for std2isis, ready to convert the image
+ Screenshot of the GUI for std2isis, ready to convert the image
input.png to the Isis Cube argb.cub, with mode left at its default
of AUTOMATIC.
</description>
@@ -306,7 +306,7 @@
<image width="492" height="492" src="assets/images/gray_argb.png">
<brief>Output Isis Cube with Grayscale</brief>
<description>
- The four-band ARGB output image viewed in black-and-white with a
+ The four-band ARGB output image viewed in black-and-white with a
grayscale.
</description>
<thumbnail src="assets/thumbs/gray_argb.png" width="200" height="200" caption="Output Image in Black-and-White" />
@@ -314,10 +314,10 @@
<image width="492" height="492" src="assets/images/rgb.png">
<brief>Output Isis Cube with RGB</brief>
<description>
- The same four-band ARGB output image viewed in color with RGB
- filtering (Band 1 = Red, Band 2 = Green, Band 3 = Blue). Note that
- the image here appears brighter than the original, because qview has
- auto-stretched the DN values, and can be adjusted back with qview's
+ The same four-band ARGB output image viewed in color with RGB
+ filtering (Band 1 = Red, Band 2 = Green, Band 3 = Blue). Note that
+ the image here appears brighter than the original, because qview has
+ auto-stretched the DN values, and can be adjusted back with qview's
"stretch" tool. The actual data, however, has not been changed.
</description>
<thumbnail src="assets/thumbs/rgb.png" width="200" height="200" caption="Output Image in Color" />
@@ -326,7 +326,7 @@
<brief>Output Isis Cube with RGA</brief>
<description>
The same four-band ARGB output image viewed in color with RGB
- filtering as in the previous image, but here Band 4 (the alpha
+ filtering as in the previous image, but here Band 4 (the alpha
channel) is viewed through the Blue filter.
</description>
<thumbnail src="assets/thumbs/argb.png" width="200" height="200" caption="Output Image in Color with Band 4 in Blue" />
@@ -339,7 +339,7 @@
Converting an image to an Isis Cube in Grayscale mode
</brief>
<description>
- This example will show the conversion from a color PNG image to a cube,
+ This example will show the conversion from a color PNG image to a cube,
with the color mode set to GRAYSCALE, meaning that the output image will
be a single-band black-and-white cube.
</description>
@@ -371,7 +371,7 @@
<image height="492" width="492" src="assets/images/input.png">
<brief>Input Image</brief>
<description>
- The input image, in this example, the same color PNG from the
+ The input image, in this example, the same color PNG from the
previous example.
</description>
<thumbnail src="assets/thumbs/input.png" width="200" height="200" caption="Input Image" />
@@ -394,7 +394,7 @@
Converting an image to an Isis Cube in RGB mode
</brief>
<description>
- This example will show the conversion from a color PNG image to a cube,
+ This example will show the conversion from a color PNG image to a cube,
with the color mode set to RGB, meaning that the output image will
be a three-band color cube.
</description>
@@ -426,7 +426,7 @@
<image height="492" width="492" src="assets/images/input.png">
<brief>Input Image</brief>
<description>
- The input image, in this example, the same color PNG from the
+ The input image, in this example, the same color PNG from the
first example.
</description>
<thumbnail src="assets/thumbs/input.png" width="200" height="200" caption="Input Image" />
@@ -437,7 +437,7 @@
<image width="492" height="492" src="assets/images/gray_argb.png">
<brief>Output Isis Cube with Grayscale</brief>
<description>
- The three-band RGB output image viewed in black-and-white with a
+ The three-band RGB output image viewed in black-and-white with a
grayscale.
</description>
<thumbnail src="assets/thumbs/gray_argb.png" width="200" height="200" caption="Output Image in Black-and-White" />
@@ -445,11 +445,11 @@
<image width="492" height="492" src="assets/images/rgb.png">
<brief>Output Isis Cube with RGB</brief>
<description>
- The same three-band RGB output image viewed in color with RGB
- filtering (Band 1 = Red, Band 2 = Green, Band 3 = Blue). Once
- again, the output image appears to be brighter than the original due
- to qview's auto-stretching, but can be adjusted in qview with the
- "stretch" tool.
+ The same three-band RGB output image viewed in color with RGB
+ filtering (Band 1 = Red, Band 2 = Green, Band 3 = Blue). Once
+ again, the output image appears to be brighter than the original due
+ to qview's auto-stretching, but can be adjusted in qview with the
+ "stretch" tool.
</description>
<thumbnail src="assets/thumbs/rgb.png" width="200" height="200" caption="Output Image in Color" />
</image>
diff --git a/isis/src/base/objs/Anisotropic1/Anisotropic1.cpp b/isis/src/base/objs/Anisotropic1/Anisotropic1.cpp
index 2c03d87691..fa80617b9e 100644
--- a/isis/src/base/objs/Anisotropic1/Anisotropic1.cpp
+++ b/isis/src/base/objs/Anisotropic1/Anisotropic1.cpp
@@ -9,7 +9,7 @@ using std::max;
namespace Isis {
/**
* Constructs an Anisotropic1 object
- *
+ *
* @param pvl Pvl object containing a valid Anisotropic1 specification
* @param pmodel PhotoModel object containing valid Anisotropic1 data
*/
@@ -58,7 +58,7 @@ namespace Isis {
* @history 1999-03-12 K Teal Thompson Port to Unix/ISIS;
* declare vars; add implicit none.
* @history 2007-02-20 Janet Barrett - Imported from Isis2
- * pht_atm_functions to Isis3.
+ * pht_atm_functions to Isis.
* @history 2008-11-05 Jeannie Walldren - Replaced
* NumericalMethods::r8expint() with AtmosModel::En().
* Replaced Isis::PI with PI since this is in Isis
diff --git a/isis/src/base/objs/Application/Application.cpp b/isis/src/base/objs/Application/Application.cpp
index b74707e75b..c5373f2e29 100644
--- a/isis/src/base/objs/Application/Application.cpp
+++ b/isis/src/base/objs/Application/Application.cpp
@@ -517,7 +517,7 @@ namespace Isis {
const QString &message) {
// See if we need to connect to the parent
if (p_connectionToParent == NULL) {
- QString msg = "This process (program) was executed by an existing Isis 3 "
+ QString msg = "This process (program) was executed by an existing Isis "
"process. However, we failed to establish a communication channel "
"with the parent (launcher) process. The parent process has a PID of "
"[" + toString(iApp->GetUserInterface().ParentId()) + "]";
@@ -532,7 +532,7 @@ namespace Isis {
data += '\n';
if (p_connectionToParent->write(data.toLatin1().data(), data.toLatin1().size()) == -1) {
- QString msg = "This process (program) was executed by an exiting Isis 3 "
+ QString msg = "This process (program) was executed by an exiting Isis "
"process. A communication channel was established with the parent "
"(launcher) process, but when we tried to send data to the parent "
"process an error occurred. The parent process has a PID of [" +
diff --git a/isis/src/base/objs/CameraDistortionMap/CameraDistortionMap.cpp b/isis/src/base/objs/CameraDistortionMap/CameraDistortionMap.cpp
index 1e5ada7cb7..7cbc2c060b 100644
--- a/isis/src/base/objs/CameraDistortionMap/CameraDistortionMap.cpp
+++ b/isis/src/base/objs/CameraDistortionMap/CameraDistortionMap.cpp
@@ -24,13 +24,13 @@
#include "CameraDistortionMap.h"
namespace Isis {
- /**
+ /**
* Camera distortion map constructor
*
- * Create a radial camera distortion map. This class maps between
- * distorted and undistorted focal plane x/y's. The default mapping
- * is the identity, that is, the focal plane x/y and undistorted
- * focal plane x/y will be identical.
+ * Create a radial camera distortion map. This class maps between
+ * distorted and undistorted focal plane x/y's. The default mapping
+ * is the identity, that is, the focal plane x/y and undistorted
+ * focal plane x/y will be identical.
*
* @param parent the parent camera that will use this distortion map
* @param zDirection the direction of the focal plane Z-axis
@@ -45,13 +45,13 @@ namespace Isis {
/**
- * Destructor for the ISIS3 default camera distortion map.
+ * Destructor for the ISIS default camera distortion map.
*/
CameraDistortionMap::~CameraDistortionMap() {
}
- /**
+ /**
* Load distortion coefficients
*
* This method loads the distortion coefficients from the instrument
@@ -79,7 +79,7 @@ namespace Isis {
}
- /**
+ /**
* Compute undistorted focal plane x/y
*
* Compute undistorted focal plane x/y given a distorted focal plane x/y.
@@ -124,7 +124,7 @@ namespace Isis {
}
- /**
+ /**
* Compute distorted focal plane x/y
*
* Compute distorted focal plane x/y given an undistorted focal plane x/y.
@@ -202,9 +202,9 @@ namespace Isis {
}
- /**
- * Retrieve the distortion coefficients used for this model.
- *
+ /**
+ * Retrieve the distortion coefficients used for this model.
+ *
* @returns The optical distortion of polynomial coefficients.
*/
std::vector<double> CameraDistortionMap::OpticalDistortionCoefficients() const {
@@ -212,9 +212,9 @@ namespace Isis {
}
- /**
- * Gets the z-direction for this camera. The direction is represented as
- * +/- 1.
+ /**
+ * Gets the z-direction for this camera. The direction is represented as
+ * +/- 1.
* @returns The direction of the focal plane Z-axis
*/
double CameraDistortionMap::ZDirection() const {
@@ -222,55 +222,55 @@ namespace Isis {
}
- /**
- * Gets the x-value in the focal plane coordinate system. This is represented
- * in millimeters from the origin.
- *
+ /**
+ * Gets the x-value in the focal plane coordinate system. This is represented
+ * in millimeters from the origin.
+ *
* @returns The distorted focal plane x.
*/
double CameraDistortionMap::FocalPlaneX() const {
return p_focalPlaneX;
}
-
+
/**
- * Gets the y-value in the focal plane coordinate system. This is represented
+ * Gets the y-value in the focal plane coordinate system. This is represented
* in millimeters from the origin.
- *
+ *
* @returns The distorted focal plane y.
*/
double CameraDistortionMap::FocalPlaneY() const {
return p_focalPlaneY;
}
-
+
/**
- * Gets the x-value in the undistorted focal plane coordinate system. This is represented
+ * Gets the x-value in the undistorted focal plane coordinate system. This is represented
* in millimeters from the origin.
- *
+ *
*@returns The undistorted focal plane x
*/
double CameraDistortionMap::UndistortedFocalPlaneX() const {
return p_undistortedFocalPlaneX;
}
-
+
/**
- * Gets the y-value in the undistorted focal plane coordinate system. This is represented
- * in millimeters from the origin.
- *
+ * Gets the y-value in the undistorted focal plane coordinate system. This is represented
+ * in millimeters from the origin.
+ *
* @returns The undistorted focal plane y
*/
double CameraDistortionMap::UndistortedFocalPlaneY() const {
return p_undistortedFocalPlaneY;
}
-
+
/**
- * Gets the z-value in the undistorted focal plane coordinate system. This is
- * represented as the focal length, in millimeters, with the sign indicating
- * z-direction.
- *
+ * Gets the z-value in the undistorted focal plane coordinate system. This is
+ * represented as the focal length, in millimeters, with the sign indicating
+ * z-direction.
+ *
* @returns The undistorted focal plane z
*/
double CameraDistortionMap::UndistortedFocalPlaneZ() const {
@@ -278,4 +278,3 @@ namespace Isis {
}
}
-
diff --git a/isis/src/base/objs/Cube/Cube.cpp b/isis/src/base/objs/Cube/Cube.cpp
index 8416c578dc..9e93efd8ab 100644
--- a/isis/src/base/objs/Cube/Cube.cpp
+++ b/isis/src/base/objs/Cube/Cube.cpp
@@ -2272,7 +2272,7 @@ namespace Isis {
/**
* This is a helper, used by open(...), that handles opening Isis 2 cubes as
- * if they were Isis 3 cubes.
+ * if they were Isis cubes.
*
* @param oldCube The filename of the Isis 2 cube
*/
diff --git a/isis/src/base/objs/Cube/Cube.h b/isis/src/base/objs/Cube/Cube.h
index 8b951aecc6..56943e8094 100644
--- a/isis/src/base/objs/Cube/Cube.h
+++ b/isis/src/base/objs/Cube/Cube.h
@@ -180,7 +180,7 @@ namespace Isis {
virtual ~Cube();
/**
- * These are the possible storage formats of Isis3 cubes. There is an
+ * These are the possible storage formats of ISIS cubes. There is an
* internal IO handler for each one of these.
*/
enum Format {
@@ -260,7 +260,7 @@ namespace Isis {
void open(const QString &cfile, QString access = "r");
void reopen(QString access = "r");
- void read(Blob &blob,
+ void read(Blob &blob,
const std::vector<PvlKeyword> keywords = std::vector<PvlKeyword>()) const;
void read(Buffer &rbuf) const;
void write(Blob &blob, bool overwrite=true);
@@ -396,7 +396,7 @@ namespace Isis {
/**
* If open was called with an Isis 2 cube, then this will be
- * the name of the imported Isis3 cube. m_labelFileName and
+ * the name of the imported ISIS cube. m_labelFileName and
* m_dataFileName will store the Isis 2 cube's information.
*/
FileName *m_tempCube;
diff --git a/isis/src/base/objs/DemShape/DemShape.h b/isis/src/base/objs/DemShape/DemShape.h
index 9111dc26d1..b06592c26f 100644
--- a/isis/src/base/objs/DemShape/DemShape.h
+++ b/isis/src/base/objs/DemShape/DemShape.h
@@ -33,9 +33,9 @@ namespace Isis {
class Projection;
/**
- * @brief Define shapes and provide utilities for targets stored as Isis3 maps
+ * @brief Define shapes and provide utilities for targets stored as ISIS maps
*
- * This class will define shapes of Isis3 target bodies with the shape defined by an ISIS 3 map
+ * This class will define shapes of ISIS target bodies with the shape defined by an ISIS map
* fille (level 2 image), as well as provide utilities to retrieve radii and photometric
* information for the intersection point.
*
@@ -60,7 +60,7 @@ namespace Isis {
* @history 2017-05-19 Christopher Combs - Modified unitTest.cpp: Removed path of output in
* testDemCube() to allow the test to pass when not using the standard
* data areas. Fixes #4738.
- * @history 2017-06-07 Kristin Berry - Added a using declaration so that the new
+ * @history 2017-06-07 Kristin Berry - Added a using declaration so that the new
* intersectSurface methods in ShapeModel are accessible by DemShape.
*
*/
@@ -76,7 +76,7 @@ namespace Isis {
~DemShape();
// Make parent functions visible
- using Isis::ShapeModel::intersectSurface;
+ using Isis::ShapeModel::intersectSurface;
// Intersect the shape model
bool intersectSurface(std::vector<double> observerPos,
diff --git a/isis/src/base/objs/EllipsoidShape/EllipsoidShape.cpp b/isis/src/base/objs/EllipsoidShape/EllipsoidShape.cpp
index a350e65f69..5dd6fd2efe 100644
--- a/isis/src/base/objs/EllipsoidShape/EllipsoidShape.cpp
+++ b/isis/src/base/objs/EllipsoidShape/EllipsoidShape.cpp
@@ -23,7 +23,7 @@ namespace Isis {
/**
* Initialize the EllipsoidShape.
*
- * @param pvl Valid Isis3 cube label.
+ * @param pvl Valid ISIS cube label.
*/
EllipsoidShape::EllipsoidShape(Target *target) : ShapeModel (target) {
setName("Ellipsoid");
@@ -33,7 +33,7 @@ namespace Isis {
/**
* Initialize the EllipsoidShape.
*
- * @param pvl Valid Isis3 cube label.
+ * @param pvl Valid ISIS cube label.
*/
EllipsoidShape::EllipsoidShape() : ShapeModel () {
setName("Ellipsoid");
@@ -81,8 +81,8 @@ namespace Isis {
/**
- * Calculates the unit normal to an ellipsoid at the point of intersection.
- * In the event that the three axial radii of the body are equal, this
+ * Calculates the unit normal to an ellipsoid at the point of intersection.
+ * In the event that the three axial radii of the body are equal, this
* method returns the normal vector for a sphere.
*
* The implicit equation for an ellipsoid is:
diff --git a/isis/src/base/objs/EllipsoidShape/EllipsoidShape.h b/isis/src/base/objs/EllipsoidShape/EllipsoidShape.h
index 325350773d..e33abd0d39 100644
--- a/isis/src/base/objs/EllipsoidShape/EllipsoidShape.h
+++ b/isis/src/base/objs/EllipsoidShape/EllipsoidShape.h
@@ -30,9 +30,9 @@ namespace Isis {
class Pvl;
/**
- * @brief Define shapes and provide utilities for Isis3 targets
+ * @brief Define shapes and provide utilities for ISIS targets
*
- * This class will define shapes of Isis3 target bodies as well as
+ * This class will define shapes of ISIS target bodies as well as
* provide utilities to retrieve radii and photometric information.
*
*
@@ -46,7 +46,7 @@ namespace Isis {
* @history 2015-04-30 Jeannie Backer - Added isDEM() method. References #2243.
* @history 2015-07-21 Kristin Berry - Added NaifStatus::CheckErrors() to see if any NAIF errors
* were signaled. References #2248.
- * @history 2016-06-13 Kelvin Rodriguez - Removed redundant contructor
+ * @history 2016-06-13 Kelvin Rodriguez - Removed redundant contructor
* EllipsoidShape(Target, Pvl). References #2214
* @history 2017-05-19 Tyler Wilson - calculateSurfaceNormal() and calculateDefaultNormal()
* now call calculateLocalNormal(), which calculates the normal
@@ -54,7 +54,7 @@ namespace Isis {
* ShapeModel::calculateEllipsoidalSurfaceNormal() function
* which was incorrectly returning the normal vector to a sphere and not
* an ellipsoid. Fixes #1028.
- * @history 2017-06-07 Kristin Berry - Added a using declaration so that the new
+ * @history 2017-06-07 Kristin Berry - Added a using declaration so that the new
* intersectSurface methods in ShapeModel are accessible by
* EllipsoidShape.
*/
@@ -68,7 +68,7 @@ namespace Isis {
~EllipsoidShape() { };
// Make parent functions visible
- using Isis::ShapeModel::intersectSurface;
+ using Isis::ShapeModel::intersectSurface;
//! Intersect the shape model
bool intersectSurface(std::vector<double> observerPos,
diff --git a/isis/src/base/objs/Environment/Environment.h b/isis/src/base/objs/Environment/Environment.h
index c3b97b9269..d9789e4201 100644
--- a/isis/src/base/objs/Environment/Environment.h
+++ b/isis/src/base/objs/Environment/Environment.h
@@ -27,7 +27,7 @@
class QString;
namespace Isis {
-
+
/**
* @author 2011-04-01 Eric Hyer & Steven Lambright
*
@@ -35,7 +35,7 @@ namespace Isis {
* @history 2011-09-20 Steven Lambright - Added support for 4 line version
* file.
* @history 2012-03-06 Steven Lambright - Added automatic environment
- * setup that works with every Isis 3 application.
+ * setup that works with every Isis application.
* This includes the 'qisis' applications. The
* automatic setup is setting the Qt plugin path
* because picking up a plugin from the OS means
@@ -52,21 +52,21 @@ namespace Isis {
class Environment {
public:
~Environment() {}
-
+
static QString userName();
static QString hostName();
static QString isisVersion();
-
+
static QString getEnvironmentValue(QString, QString);
protected:
Environment();
-
-
+
+
private:
/**
* Construct an environment in static space to initialize some
- * global Isis 3 environment options. This initialization
- * applies to anything that links against the Isis 3 library.
+ * global Isis environment options. This initialization
+ * applies to anything that links against the Isis library.
*/
static Environment automaticEnvironmentSetup;
};
diff --git a/isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.cpp b/isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.cpp
index 27fe031faf..d05f540e29 100644
--- a/isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.cpp
+++ b/isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.cpp
@@ -30,9 +30,9 @@ using namespace std;
namespace Isis {
/**
- * Initialize the Isis3 Equatorial Cylindrical shape model.
+ * Initialize the ISIS Equatorial Cylindrical shape model.
*
- * @param pvl Valid Isis3 cube label.
+ * @param pvl Valid ISIS cube label.
*/
EquatorialCylindricalShape::EquatorialCylindricalShape(Target *target, Pvl &pvl) :
DemShape(target, pvl) {
@@ -64,7 +64,7 @@ namespace Isis {
/**
- * Destructor for Isis3 Equatorial Cylindrical shape model
+ * Destructor for ISIS Equatorial Cylindrical shape model
*/
EquatorialCylindricalShape::~EquatorialCylindricalShape() {
diff --git a/isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.h b/isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.h
index 7f4520bd1e..bddf9f072e 100644
--- a/isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.h
+++ b/isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.h
@@ -28,9 +28,9 @@ namespace Isis {
class Pvl;
/**
- * @brief Define shapes and provide utilities for shapes stored as Isis3 EquatorialCylindrical map
+ * @brief Define shapes and provide utilities for shapes stored as ISIS EquatorialCylindrical map
*
- * This class will define shapes of Isis3 target bodies with the shape defined by an
+ * This class will define shapes of ISIS target bodies with the shape defined by an
* EquatorialCylindrical map, as well as provide utilities to retrieve radii and photometric
* information for the intersection point.
*
diff --git a/isis/src/base/objs/ExportPdsTable/ExportPdsTable.cpp b/isis/src/base/objs/ExportPdsTable/ExportPdsTable.cpp
index e21ba7c7a9..e13c735039 100644
--- a/isis/src/base/objs/ExportPdsTable/ExportPdsTable.cpp
+++ b/isis/src/base/objs/ExportPdsTable/ExportPdsTable.cpp
@@ -24,13 +24,13 @@
#include <cmath>
#include <iostream>
-#include "Endian.h"
-#include "EndianSwapper.h"
+#include "Endian.h"
+#include "EndianSwapper.h"
#include "IString.h"
#include "IException.h"
-#include "Pvl.h"
-#include "PvlKeyword.h"
-#include "PvlObject.h"
+#include "Pvl.h"
+#include "PvlKeyword.h"
+#include "PvlObject.h"
#include "Table.h"
#include "TableField.h"
#include "TableRecord.h"
@@ -39,16 +39,16 @@
using namespace std;
namespace Isis {
- /**
+ /**
* Construct an ExportPdsTable object and set default member variable values.
- * This constructor sets the following defaults:
+ * This constructor sets the following defaults:
* <ul>
- * <li>BYTEORDER = "LSB"</li>
+ * <li>BYTEORDER = "LSB"</li>
* <li>ROWS = Records</li>
* <li>ROW_BYTES = RecordSize</li>
* </ul>
- *
- * @param isisTable The Isis3 Table object to be exported.
+ *
+ * @param isisTable The ISIS Table object to be exported.
*/
ExportPdsTable::ExportPdsTable(Table isisTable) {
// initialize member variables
@@ -56,30 +56,30 @@ namespace Isis {
m_pdsByteOrder = "LSB";
m_isisTable = new Table(isisTable);
m_numRows = isisTable.Records(); //one row in pdsTable per record in isisTable
- m_rowBytes = m_isisTable->RecordSize(); //this should be the same value
+ m_rowBytes = m_isisTable->RecordSize(); //this should be the same value
//for all pds rows and isis records
}
/**
* Destructs for ExportPdsTable objects.
- */
+ */
ExportPdsTable::~ExportPdsTable() {
// delete pointers and set to null
delete m_isisTable;
m_isisTable = NULL;
}
-
+
/**
- * This methods fills the given buffer with the binary PDS table data and
+ * This methods fills the given buffer with the binary PDS table data and
* returns label information.
*
* @param pdsTableBuffer This buffer will be filled with binary PDS table data.
* @param pdsFileRecordBytes The number or RECORD_BYTES in the PDS file.
* @param pdsByteOrder A string containing the byte order of the PDS file.
* Valid values are "LSB" or "MSB".
- * @return PvlObject A Pvl containing the PDS table's label information.
- */
- PvlObject ExportPdsTable::exportTable(char *pdsTableBuffer,
+ * @return PvlObject A Pvl containing the PDS table's label information.
+ */
+ PvlObject ExportPdsTable::exportTable(char *pdsTableBuffer,
int outputFileRecordBytes,
QString pdsTableByteOrder) {
// Currently, we will not allow our table rows to be wrapped. So we must
@@ -87,9 +87,9 @@ namespace Isis {
// record bytes allowed in the output pds file
m_outputRecordBytes = outputFileRecordBytes;
if (m_rowBytes > m_outputRecordBytes) {
- throw IException(IException::Unknown,
+ throw IException(IException::Unknown,
"Unable to export Isis::Table object to PDS. The "
- "Isis::Table record size [" + toString(m_rowBytes)
+ "Isis::Table record size [" + toString(m_rowBytes)
+ "] is larger than the record bytes allowed in the "
"PDS file [" + toString(m_outputRecordBytes) + "].",
_FILEINFO_);
@@ -97,24 +97,24 @@ namespace Isis {
// update variables
m_pdsByteOrder = pdsTableByteOrder.toUpper();
-
+
if (m_pdsByteOrder != "MSB" && m_pdsByteOrder != "LSB") {
- QString msg = "Unable to export the Isis Table [" + m_isisTable->Name()
- + "] to a PDS table using the requested byte order ["
- + m_pdsByteOrder + "]. Valid values are MSB or LSB.";
+ QString msg = "Unable to export the Isis Table [" + m_isisTable->Name()
+ + "] to a PDS table using the requested byte order ["
+ + m_pdsByteOrder + "]. Valid values are MSB or LSB.";
throw IException(IException::Unknown, msg, _FILEINFO_);
}
- // create an array of nulls to pad
- // from the end of each row to the end of the record
+ // create an array of nulls to pad
+ // from the end of each row to the end of the record
int numRowNulls = outputFileRecordBytes - m_rowBytes;
char endRowPadding[numRowNulls];
for (int i = 0; i < numRowNulls; i++) {
endRowPadding[i] = '\0';
}
- // loop through records in the input Isis::Table object
- // fill rowBuffer with packed record values, then fill with padding
+ // loop through records in the input Isis::Table object
+ // fill rowBuffer with packed record values, then fill with padding
EndianSwapper *endianSwap = new EndianSwapper(m_pdsByteOrder);
int buffsize = 0;
@@ -132,9 +132,9 @@ namespace Isis {
}
/**
- * Creates a PvlObject to be added to the PDS label with needed TABLE
+ * Creates a PvlObject to be added to the PDS label with needed TABLE
* information.
- *
+ *
* @return PvlObject containing PDS Table metadata.
*/
PvlObject ExportPdsTable::fillMetaData() {
@@ -148,7 +148,7 @@ namespace Isis {
pdsTableLabelInfo.addKeyword(PvlKeyword("COLUMNS", toString(m_isisTable->RecordFields())));
pdsTableLabelInfo.addKeyword(PvlKeyword("ROW_BYTES", toString(m_rowBytes)));
pdsTableLabelInfo.addKeyword(PvlKeyword("ROW_SUFFIX_BYTES", toString(m_outputRecordBytes - m_rowBytes)));
- int startByte = 1; // PDS begins indexing at 1
+ int startByte = 1; // PDS begins indexing at 1
for(int fieldIndex = 0; fieldIndex < m_isisTable->RecordFields(); fieldIndex++) {
int columnBytes = 0;
TableField field = (*m_isisTable)[0][fieldIndex];
@@ -169,7 +169,7 @@ namespace Isis {
columnObj.addKeyword(PvlKeyword("DATA_TYPE", "MSB_INTEGER"));
columnBytes = sizeof(int);
}
- else { // if (m_pdsByteOrder == "LSB") {
+ else { // if (m_pdsByteOrder == "LSB") {
// no need to check this. already validated in exportPdsTable()
columnObj.addKeyword(PvlKeyword("DATA_TYPE", "LSB_INTEGER"));
columnBytes = sizeof(int);
@@ -198,7 +198,7 @@ namespace Isis {
}
}
else { // This error is not covered in the unitTest since currently, there
- // are no other valid values for TableField types. It is meant to
+ // are no other valid values for TableField types. It is meant to
// catch other values if they are added to Table Field.
QString msg = "Unable to export Isis::Table object to PDS. Invalid "
"field type found for [" + field.name() + "].";
@@ -210,28 +210,28 @@ namespace Isis {
pdsTableLabelInfo.addObject(columnObj);
}
return pdsTableLabelInfo;
- }
+ }
/**
- * Format the PDS table object name using the Isis3 table name.
- *
+ * Format the PDS table object name using the ISIS table name.
+ *
* @return QString containing the formatted PDS table name.
*/
QString ExportPdsTable::formatPdsTableName() {
return ExportPdsTable::formatPdsTableName(m_isisTable->Name());
}
-
+
/**
- * Static method that formats the given Isis3 table name in PDS format.
+ * Static method that formats the given ISIS table name in PDS format.
* This method takes the upper camel case Isis table name and returns
- * a PDS table name that is underscore separated, all upper case and
- * with "_TABLE" appended to the end of the name, if not already present.
- *
- * @param isisTableName An QString containing the Isis3 upper camel case
+ * a PDS table name that is underscore separated, all upper case and
+ * with "_TABLE" appended to the end of the name, if not already present.
+ *
+ * @param isisTableName An QString containing the ISIS upper camel case
* table name.
* @return QString containing the formatted PDS table name.
*/
- QString ExportPdsTable::formatPdsTableName(QString isisTableName) {
+ QString ExportPdsTable::formatPdsTableName(QString isisTableName) {
QString tableName = isisTableName.simplified();
QString pdsTableName;
pdsTableName.push_back(tableName[0]);
@@ -254,19 +254,19 @@ namespace Isis {
/**
* Pack the buffer with data from the table record, swapping bytes if needed.
*
- * @param record Isis3 TableRecord to be exported
- * @param buffer Output buffer to be filled with PDS table row data in the
+ * @param record ISIS TableRecord to be exported
+ * @param buffer Output buffer to be filled with PDS table row data in the
* appropriate byte order.
- * @param endianSwap Pointer to EndianSwapper object to swap bytes if the
+ * @param endianSwap Pointer to EndianSwapper object to swap bytes if the
* input Isis Table byte order is not the same as the output
* PDS byte order.
*/
- void ExportPdsTable::Pack(TableRecord record, char *buffer,
+ void ExportPdsTable::Pack(TableRecord record, char *buffer,
EndianSwapper *endianSwap) {
// for each field, keep track of the start byte
int startByte = 0;
for(int fieldIndex = 0; fieldIndex < record.Fields(); fieldIndex++) {
- // check the data type of the field,
+ // check the data type of the field,
// swap the appropriate number of bytes
// fill the buffer at the appropriate address
// find the start byte of the next field
@@ -312,7 +312,7 @@ namespace Isis {
}
}
else { // This error is not covered in the unitTest since currently, there
- // are no other valid values for TableField types. It is meant to
+ // are no other valid values for TableField types. It is meant to
// catch other values if they are added to Table Field.
QString msg = "Unable to export Isis::Table object to PDS. Invalid "
"field type found for [" + field.name() + "].";
@@ -322,8 +322,8 @@ namespace Isis {
// after loopting through the fields, the value of the startByte variable
// should match the total number of row bytes for the table
if (startByte != m_rowBytes) { // thie error is not covered in the unitTest
- // tested since it should not be possible
- // unless the number of bytes reserved for
+ // tested since it should not be possible
+ // unless the number of bytes reserved for
// each of the types changes
QString msg = "Unable to export Isis::Table object [" + m_isisTable->Name()
+ "] to PDS. Record lengths are uneven.";
diff --git a/isis/src/base/objs/ExportPdsTable/ExportPdsTable.h b/isis/src/base/objs/ExportPdsTable/ExportPdsTable.h
index f3f59a815f..ad0ac326be 100644
--- a/isis/src/base/objs/ExportPdsTable/ExportPdsTable.h
+++ b/isis/src/base/objs/ExportPdsTable/ExportPdsTable.h
@@ -25,7 +25,7 @@
#include <fstream>
#include <QString>
-
+
namespace Isis {
class EndianSwapper;
class Pvl;
@@ -33,16 +33,16 @@ namespace Isis {
class Table;
class TableRecord;
/**
- * @brief Export a PDS table from an Isis3 Table.
- *
- * This class ingests an Isis3 Table and converts it to a PDS Table.
+ * @brief Export a PDS table from an ISIS Table.
+ *
+ * This class ingests an ISIS Table and converts it to a PDS Table.
*
- * @b NOTE: This class exports BINARY format PDS tables. The PDS Standards
- * Reference document indicates that for files containing multiple tables
- * with binary data, the records should be FIXED_LENGTH (not STREAM) and
+ * @b NOTE: This class exports BINARY format PDS tables. The PDS Standards
+ * Reference document indicates that for files containing multiple tables
+ * with binary data, the records should be FIXED_LENGTH (not STREAM) and
* that this value should be the length of the longest record in the file
- * (Appendix A, PDS Standards, last updated February 27, 2009). This
- * document also indicates that all table rows that are less than the fixed
+ * (Appendix A, PDS Standards, last updated February 27, 2009). This
+ * document also indicates that all table rows that are less than the fixed
* record length value should be padded (ususally with nulls).
*
* @see http://pds.nasa.gov/standards-reference.shtml
@@ -52,7 +52,7 @@ namespace Isis {
* ExportPdsTable pdsTable(isisTable);
* pdsTable.exportToPds(buffer, recordBytes, "LSB");
* @endcode
- *
+ *
* @ingroup Utility
*
* @author 2012-07-21 Jeannie Backer
@@ -60,7 +60,7 @@ namespace Isis {
* @internal
* @history 2012-11-21 Original Version. References #678.
*
- * @todo This class is currently only exporting BINARY format PDS tables.
+ * @todo This class is currently only exporting BINARY format PDS tables.
* Implementation may be added later to export ASCII PDS tables.
*
*/
@@ -70,23 +70,23 @@ namespace Isis {
~ExportPdsTable();
PvlObject exportTable(char *pdsTableBuffer, int pdsFileRecordBytes,
QString pdsByteOrder);
- QString formatPdsTableName();
- static QString formatPdsTableName(QString isisTableName);
+ QString formatPdsTableName();
+ static QString formatPdsTableName(QString isisTableName);
private:
void Pack(TableRecord record, char *buffer, EndianSwapper *endianSwap);
PvlObject fillMetaData();
- Table *m_isisTable; //!< Input Isis3 Table object to be exported.
- int m_numRows; /**< The number of rows in the exported PDS
- table. This value is the same as the number
- of records the Isis3 Table. **/
- int m_outputRecordBytes; /**< The number of bytes per record in the
+ Table *m_isisTable; //!< Input ISIS Table object to be exported.
+ int m_numRows; /**< The number of rows in the exported PDS
+ table. This value is the same as the number
+ of records the ISIS Table. **/
+ int m_outputRecordBytes; /**< The number of bytes per record in the
exported PDS file.**/
int m_rowBytes; /**< The number of bytes per row in the exported
- PDS table. This value is the same as the
- RecordSize (number of bytes per record) of
- the Isis3 Table.**/
- QString m_pdsByteOrder; /**< A string indicating the byte order of the
- exported PDS file.**/
+ PDS table. This value is the same as the
+ RecordSize (number of bytes per record) of
+ the ISIS Table.**/
+ QString m_pdsByteOrder; /**< A string indicating the byte order of the
+ exported PDS file.**/
};
}
#endif
diff --git a/isis/src/base/objs/Hapke/Hapke.h b/isis/src/base/objs/Hapke/Hapke.h
index 6d9ef72879..5805244dd9 100644
--- a/isis/src/base/objs/Hapke/Hapke.h
+++ b/isis/src/base/objs/Hapke/Hapke.h
@@ -41,7 +41,7 @@ namespace Isis {
* @author 1989-08-02 Unknown
*
* @internal
- * @history 2008-01-14 Janet Barret - Imported into Isis3 from Isis2.
+ * @history 2008-01-14 Janet Barret - Imported into ISIS from Isis2.
* @history 2008-03-07 Janet Barrett - Moved variables and related
* methods that pertain to Hapke specific parameters
* to the PhotoModel class.
diff --git a/isis/src/base/objs/ImportPdsTable/ImportPdsTable.cpp b/isis/src/base/objs/ImportPdsTable/ImportPdsTable.cpp
index c80a22957c..f5a86c7e87 100644
--- a/isis/src/base/objs/ImportPdsTable/ImportPdsTable.cpp
+++ b/isis/src/base/objs/ImportPdsTable/ImportPdsTable.cpp
@@ -469,7 +469,7 @@ namespace Isis {
if (tabObj.hasKeyword("RECORD_BYTES")) {
m_recordBytes = (int) tabObj.findKeyword("RECORD_BYTES");
}
- // The table description has "ROW_BYTES" and "ROW_SUFFIX_BYTES". These summed is the
+ // The table description has "ROW_BYTES" and "ROW_SUFFIX_BYTES". These summed is the
// record length. Can be for detached and attached labels
else if (tabObj.hasKeyword("ROW_BYTES") && tabObj.hasKeyword("ROW_SUFFIX_BYTES")) {
m_recordBytes = (int) tabObj.findKeyword("ROW_BYTES") +
@@ -888,7 +888,7 @@ namespace Isis {
*
* @param cols Columns for a given row
* @param cdesc Column description used to create TableField
- * @param tfield Isis3 TableField used to determine the data type to be imported.
+ * @param tfield Isis TableField used to determine the data type to be imported.
*
* @return TableField Returns the TableField with the value from the column
*
@@ -1183,7 +1183,7 @@ namespace Isis {
|| dataType == "DATE" || dataType == "TIME" ) {
return TableField(name, TableField::Text, cdesc.m_numBytes);
}
- // Isis3 tables currently don't support any of the following PDS DATA_TYPE:
+ // Isis tables currently don't support any of the following PDS DATA_TYPE:
// BIT_STRING, COMPLEX, N/A, BOOLEAN, UNSIGNED_INTEGER, IBM types, some VAX types
IString msg = "PDS Column [" + cdesc.m_name
+ "] has an unsupported DATA_TYPE ["
diff --git a/isis/src/base/objs/ImportPdsTable/ImportPdsTable.h b/isis/src/base/objs/ImportPdsTable/ImportPdsTable.h
index b8351847c9..2fe6d6daa7 100644
--- a/isis/src/base/objs/ImportPdsTable/ImportPdsTable.h
+++ b/isis/src/base/objs/ImportPdsTable/ImportPdsTable.h
@@ -41,28 +41,28 @@ namespace Isis {
* @brief Import a PDS table file with a label description
*
* This class ingests a PDS table and converts it to an ISIS Table
- * object. This class can handle importing PDS tables whose data is BINARY
+ * object. This class can handle importing PDS tables whose data is BINARY
* or ASCII format.
*
* The PDS label file should completely define the contents of a PDS
- * table with ASCII data or BINARY data. The location of the table data is
- * determined from a label keyword, ^TABLE (or ^NAME_TABLE). This keyword
+ * table with ASCII data or BINARY data. The location of the table data is
+ * determined from a label keyword, ^TABLE (or ^NAME_TABLE). This keyword
* will indicate the name of the file containing the table data and the start
- * record value where the table data begins. If the keyword only gives the
+ * record value where the table data begins. If the keyword only gives the
* start record, the table is attached to the file that contains the label.
- * If the keyword only gives a file name, that file only contains the data
- * for the indicated table. PDS table files have the extension *.TAB if the
- * table data is ASCII format and *.DAT if the data is BINARY. When
+ * If the keyword only gives a file name, that file only contains the data
+ * for the indicated table. PDS table files have the extension *.TAB if the
+ * table data is ASCII format and *.DAT if the data is BINARY. When
* constructing an ImportPdsTable object, programmers can provide a different
* name for the PDS table file.
*
* <p>
- * @b NOTE: Depending on the INTERCHANGE_FORMAT value, programmers should
+ * @b NOTE: Depending on the INTERCHANGE_FORMAT value, programmers should
* choose the appropriate methods from this class.
*
* Example of PDS ASCII table import. Construct the ImportPdsTable object
- * with a label name, set the data type for the specified PDS columns, and
- * import the PDS table to an Isis3 table with the comma separtated column
+ * with a label name, set the data type for the specified PDS columns, and
+ * import the PDS table to an Isis table with the comma separtated column
* names.
* <code>
* ImportPdsTable pdsTable(labelFileName, tableFileName);
@@ -73,9 +73,9 @@ namespace Isis {
* Table isisTable = pdsTable.importTable("ScetTimeClock,ShutterStatus,MirrorSin,MirrorCos",
* "VIRHouseKeeping");
* </code>
- * Example of PDS BINARY table import. If the default constructor is used,
- * the load method must be called to pass in the label file name. The PDS
- * table can then be imported and an Isis3 Table object is returned.
+ * Example of PDS BINARY table import. If the default constructor is used,
+ * the load method must be called to pass in the label file name. The PDS
+ * table can then be imported and an Isis Table object is returned.
* <code>
* ImportPdsTable pdsTable;
* load(labelFileName, "", pdsTableName);
@@ -86,14 +86,14 @@ namespace Isis {
*
* @author 2011-07-20 Kris Becker
*
- * @internal
+ * @internal
* @history 2011-08-02 Kris Becker - Modified to ensure the proper size of strings are
* exported to the TableRecord
* @history 2012-10-04 Jeannie Backer - Changed references to TableField
* methods to lower camel case. Added and ordered
* includes. Moved method implementation to cpp.
* References #1169.
- * @history 2012-11-21 Jeannie Backer - Added implementation for importing
+ * @history 2012-11-21 Jeannie Backer - Added implementation for importing
* binary PDS tables. Changed method name from
* "exportAsTable" to "importTable". Improved
* unitTest coverage. References #700.
@@ -105,9 +105,9 @@ namespace Isis {
* @history 2016-03-10 Jeannie Backer - Removed non-UTF8 character. References #2397.
* @history 2018-02-12 Stuart Sides - Added detached table capabilities for label files
* without a "RECORD_BYTES" keyword. References #5525.
- *
- *
- * @todo The binary table import methods were written after the ascii table
+ *
+ *
+ * @todo The binary table import methods were written after the ascii table
* import. The class should be better organized so that the programmer
* does not need to know which methods to call based on
* INTERCHANGE_FORMAT. The program should take care of this
@@ -116,7 +116,7 @@ namespace Isis {
class ImportPdsTable {
public:
ImportPdsTable();
- ImportPdsTable(const QString &pdsLabFile,
+ ImportPdsTable(const QString &pdsLabFile,
const QString &pdsTabFile="",
const QString &pdsTableName ="TABLE");
virtual ~ImportPdsTable();
@@ -127,11 +127,11 @@ namespace Isis {
int columns() const;
int rows() const;
- void load(const QString &pdsLabFile, const QString &pdsTabFile = "",
+ void load(const QString &pdsLabFile, const QString &pdsTabFile = "",
const QString &pdsTableName = "TABLE");
bool hasColumn(const QString &colName) const;
- QString getColumnName(const unsigned int &index = 0,
+ QString getColumnName(const unsigned int &index = 0,
const bool &formatted = true) const;
QStringList getColumnNames(const bool &formatted = true) const;
QString getFormattedName(const QString &colname) const;
@@ -153,7 +153,7 @@ namespace Isis {
QString m_dataType; //!< PDS table DATA_TYPE of column
int m_startByte; //!< Starting byte of data
int m_numBytes; //!< Number bytes in column
- int m_itemBytes; //!< Number bytes per item
+ int m_itemBytes; //!< Number bytes per item
int m_items; //!< Number of items in column
};
@@ -213,10 +213,9 @@ namespace Isis {
QString m_tableName; //!< The name of the PDS table object
QString m_pdsTableFile; //!< The name of the file containing the table data.
int m_pdsTableStart; //!< The start byte of the PDS table data.
- QString m_byteOrder; /**< The byte order of the PDS table file, if
+ QString m_byteOrder; /**< The byte order of the PDS table file, if
binary. Valid values are "MSB" or "LSB".*/
};
}
#endif
-
diff --git a/isis/src/base/objs/JP2Error/JP2Error.cpp b/isis/src/base/objs/JP2Error/JP2Error.cpp
index c2850977b8..d7b3b88199 100644
--- a/isis/src/base/objs/JP2Error/JP2Error.cpp
+++ b/isis/src/base/objs/JP2Error/JP2Error.cpp
@@ -32,7 +32,7 @@ namespace Isis {
/**
* This class is necessary to catch the error messages produced by
- * Kakadu so that they can be output using ISIS3 methods. If these
+ * Kakadu so that they can be output using ISIS methods. If these
* routines are not registered with the Kakadu error handling facility,
* then the Kakadu errors will be lost and not reported to the user.
*
@@ -62,7 +62,7 @@ namespace Isis {
/**
* Register flush routine with Kakadu error and warning handling
* facility. This routine writes Kakadu error messages out using
- * ISIS3 preferred method.
+ * ISIS preferred method.
*
*/
void JP2Error::flush(bool end_of_message) {
diff --git a/isis/src/base/objs/JP2Error/JP2Error.h b/isis/src/base/objs/JP2Error/JP2Error.h
index 78434be3ff..4e79b4cf37 100644
--- a/isis/src/base/objs/JP2Error/JP2Error.h
+++ b/isis/src/base/objs/JP2Error/JP2Error.h
@@ -45,7 +45,7 @@ namespace Isis {
* @history 2009-12-18 Janet Barrett - Original version.
* @history 2017-08-21 Tyler Wilson, Ian Humphrey, Summer Stapleton - Added
* support for new kakadu libraries. References #4809.
- *
+ *
*/
#if ENABLEJP2K
@@ -60,7 +60,7 @@ namespace Isis {
//!<Place newline character between successive Kakadu produced error messages
void add_text(const std::string &message);
- //!<Write Kakadu error messages using ISIS3 methods
+ //!<Write Kakadu error messages using ISIS methods
void flush(bool end_of_message = false);
//!<Used to store accumulated Kakadu error messages
diff --git a/isis/src/base/objs/NumericalApproximation/NumericalApproximation.h b/isis/src/base/objs/NumericalApproximation/NumericalApproximation.h
index 362790b060..9d951f305d 100644
--- a/isis/src/base/objs/NumericalApproximation/NumericalApproximation.h
+++ b/isis/src/base/objs/NumericalApproximation/NumericalApproximation.h
@@ -16,7 +16,7 @@ namespace Isis {
* analysis methods of interpolation, extrapolation and
* approximation of a tabulated set of @a x, @a y data.
*
- * This class contains a merged version of the Isis3 classes
+ * This class contains a merged version of the Isis classes
* @b DataInterp and @b NumericalMethods. In addition,
* some methods from @b AtmosModel were moved to this class, the
* @a CubicNeighborhood interpolation type was
diff --git a/isis/src/base/objs/Pipeline/PipelineApplication.cpp b/isis/src/base/objs/Pipeline/PipelineApplication.cpp
index b214bf3fa7..ad82fd3555 100644
--- a/isis/src/base/objs/Pipeline/PipelineApplication.cpp
+++ b/isis/src/base/objs/Pipeline/PipelineApplication.cpp
@@ -65,7 +65,7 @@ namespace Isis {
/**
* Set the input parameter for this application and whether or not this
* application supports the virtual bands functionality. It supports the virtual
- * bands functionality if the input is an Isis 3 cube.
+ * bands functionality if the input is an Isis cube.
*
* @param inputParamName Name of the input parameter, typically "FROM"
* @param supportsVirtualBands True if this application supports virtual bands
@@ -80,7 +80,7 @@ namespace Isis {
/**
* Set the input parameter for this application and whether or not this
* application supports the virtual bands functionality. It supports the virtual
- * bands functionality if the input is an Isis 3 cube.
+ * bands functionality if the input is an Isis cube.
*
* @param inputParamName Name of the input parameter, typically "FROM"
* @param value Custom parameter value; Recommended to use an alternate
diff --git a/isis/src/base/objs/PlaneShape/PlaneShape.cpp b/isis/src/base/objs/PlaneShape/PlaneShape.cpp
index 45dc61353a..9a641639df 100644
--- a/isis/src/base/objs/PlaneShape/PlaneShape.cpp
+++ b/isis/src/base/objs/PlaneShape/PlaneShape.cpp
@@ -20,7 +20,7 @@ namespace Isis {
/**
* Initialize the PlaneShape.
*
- * @param pvl Valid Isis3 cube label.
+ * @param pvl Valid ISIS cube label.
*/
PlaneShape::PlaneShape(Target *target, Pvl &pvl) : ShapeModel (target) {
setName("Plane");
@@ -33,7 +33,7 @@ namespace Isis {
/**
* Initialize the PlaneShape.
*
- * @param pvl Valid Isis3 cube label.
+ * @param pvl Valid ISIS cube label.
*/
PlaneShape::PlaneShape(Target *target) : ShapeModel (target) {
setName("Plane");
@@ -46,7 +46,7 @@ namespace Isis {
/**
* Initialize the PlaneShape.
*
- * @param pvl Valid Isis3 cube label.
+ * @param pvl Valid ISIS cube label.
*/
PlaneShape::PlaneShape() : ShapeModel () {
setName("Plane");
diff --git a/isis/src/base/objs/PlaneShape/PlaneShape.h b/isis/src/base/objs/PlaneShape/PlaneShape.h
index ec995e7ae3..736a93cc5f 100644
--- a/isis/src/base/objs/PlaneShape/PlaneShape.h
+++ b/isis/src/base/objs/PlaneShape/PlaneShape.h
@@ -39,7 +39,7 @@ namespace Isis {
/**
* @brief Define plane shape model
*
- * This class defines a plane shape model for Isis3 target bodies as well as
+ * This class defines a plane shape model for ISIS target bodies as well as
* provide utilities to retrieve radii and photometric information.
*
*
@@ -54,7 +54,7 @@ namespace Isis {
* errors were signaled. References #2248.
* @history 2016-06-13 Kelvin Rodriguez - Removed redundant contructor PlaneShape(Target, Pvl).
* References #2214
- * @history 2017-06-07 Kristin Berry - Added a using declaration so that the new
+ * @history 2017-06-07 Kristin Berry - Added a using declaration so that the new
* intersectSurface methods in ShapeModel are accessible by DemShape.
*/
class PlaneShape : public Isis::ShapeModel {
@@ -68,8 +68,8 @@ namespace Isis {
~PlaneShape();
// Make parent functions visible
- using Isis::ShapeModel::intersectSurface;
-
+ using Isis::ShapeModel::intersectSurface;
+
// Intersect the shape model
bool intersectSurface(std::vector<double> observerPos,
std::vector<double> lookDirection);
diff --git a/isis/src/base/objs/ProcessExportPds/ProcessExportPds.cpp b/isis/src/base/objs/ProcessExportPds/ProcessExportPds.cpp
index 455fecdde7..560901bf4c 100644
--- a/isis/src/base/objs/ProcessExportPds/ProcessExportPds.cpp
+++ b/isis/src/base/objs/ProcessExportPds/ProcessExportPds.cpp
@@ -999,7 +999,7 @@ namespace Isis {
* use the method ProcessExportPds::SetAttached() before
* calling ExportTable()."
- * @param isisTable The Isis3 Table object to be exported to PDS.
+ * @param isisTable The ISIS Table object to be exported to PDS.
* @param detachedPdsTableFileName The name of the exported PDS table file,
* if detached. This value should not
* include a path. The path from the label
diff --git a/isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.cpp b/isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.cpp
index e7b3d5cc26..c4323f1a10 100644
--- a/isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.cpp
+++ b/isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.cpp
@@ -56,7 +56,7 @@ namespace Isis {
m_domDoc = new QDomDocument("");
- // base xml file
+ // base xml file
// <?xml version="1.0" encoding="UTF-8"?>
QString xmlVersion = "version=\"1.0\" encoding=\"utf-8\"";
QDomProcessingInstruction xmlHeader =
@@ -64,7 +64,7 @@ namespace Isis {
m_domDoc->appendChild(xmlHeader);
// base pds4 schema location
- m_schemaLocation = "http://pds.nasa.gov/pds4/pds/v1 http://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1B00.xsd";
+ m_schemaLocation = "http://pds.nasa.gov/pds4/pds/v1 http://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1B00.xsd";
QString xmlModel;
xmlModel += "href=\"http://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1B00.sch\" ";
@@ -88,7 +88,7 @@ namespace Isis {
/**
* Create a standard PDS4 image label from the input cube.
- *
+ *
* @return @b QDomDocument The output PDS4 label.
*/
QDomDocument &ProcessExportPds4::StandardPds4Label() {
@@ -100,7 +100,7 @@ namespace Isis {
/**
* Create a standard PDS4 image label from the input cube.
- *
+ *
* @return @b QDomDocument The output PDS4 label.
*/
void ProcessExportPds4::setImageType(ImageType imageType) {
@@ -110,12 +110,12 @@ namespace Isis {
/**
* Creates a PDS4 label. The image label will be
- * stored internally in the class.
- *
- * This method has a similar function to
- * ProcessExportPds::CreateImageLabel. However, it will create
- * images of object type Array_3D_Image, Array_2D_Image, or
- * Array_3D_Spectrum.
+ * stored internally in the class.
+ *
+ * This method has a similar function to
+ * ProcessExportPds::CreateImageLabel. However, it will create
+ * images of object type Array_3D_Image, Array_2D_Image, or
+ * Array_3D_Spectrum.
*/
void ProcessExportPds4::CreateImageLabel() {
if (InputCubes.size() == 0) {
@@ -167,13 +167,13 @@ namespace Isis {
// <Discipline_Area>
// <sp:Spectral_Characteristics> OR <img:Imaging>
standardBandBin();
- }
+ }
catch (IException &e) {
QString msg = "Unable to translate and export spectral information.";
throw IException(e, IException::Programmer, msg, _FILEINFO_);
}
- try {
+ try {
// <Product_Observational>
// <Observation_Area>
// <Discipline_Area>
@@ -197,25 +197,25 @@ namespace Isis {
/**
- * This method translates the information from the ISIS
- * Instrument group to the PDS4 labels.
+ * This method translates the information from the ISIS
+ * Instrument group to the PDS4 labels.
*/
void ProcessExportPds4::standardInstrument() {
Pvl *inputLabel = InputCubes[0]->label();
FileName translationFileName;
if (inputLabel->findObject("IsisCube").hasGroup("Instrument")) {
-
+
// Translate the Instrument group
translationFileName = "$ISISROOT/appdata/translations/pds4ExportInstrument.trn";
PvlToXmlTranslationManager instXlator(*inputLabel, translationFileName.expanded());
instXlator.Auto(*m_domDoc);
-
+
// If instrument and spacecraft values were translated, create the combined name
QDomElement obsAreaNode = m_domDoc->documentElement().firstChildElement("Observation_Area");
-
+
if ( !obsAreaNode.isNull() ) {
-
+
// fix start/stop times, if needed
QDomElement timeNode = obsAreaNode.firstChildElement("Time_Coordinates");
if (!timeNode.isNull()) {
@@ -225,9 +225,9 @@ namespace Isis {
}
else {
QString timeValue = startTime.text();
- PvlToXmlTranslationManager::resetElementValue(startTime, timeValue + "Z");
+ PvlToXmlTranslationManager::resetElementValue(startTime, timeValue + "Z");
}
- QDomElement stopTime = timeNode.firstChildElement("stop_date_time");
+ QDomElement stopTime = timeNode.firstChildElement("stop_date_time");
if (stopTime.text() == "") {
stopTime.setAttribute("xsi:nil", "true");
}
@@ -236,7 +236,7 @@ namespace Isis {
PvlToXmlTranslationManager::resetElementValue(stopTime, timeValue + "Z");
}
}
-
+
QDomElement obsSysNode = obsAreaNode.firstChildElement("Observing_System");
if ( !obsSysNode.isNull() ) {
QString instrumentName;
@@ -247,7 +247,7 @@ namespace Isis {
if ( compTypeNode.text().compare("Spacecraft") == 0 ) {
QString componentName = obsSysCompNode.firstChildElement("name").text();
if (QString::compare(componentName, "TBD", Qt::CaseInsensitive) != 0) {
- spacecraftName = componentName;
+ spacecraftName = componentName;
}
}
else if ( compTypeNode.text().compare("Instrument") == 0 ) {
@@ -267,19 +267,19 @@ namespace Isis {
obsSysNode.insertBefore( combinedNode, obsSysNode.firstChild() );
}
}
-
+
// Translate the Target name
- translationFileName = "$ISISROOT/appdata/translations/pds4ExportTargetFromInstrument.trn";
+ translationFileName = "$ISISROOT/appdata/translations/pds4ExportTargetFromInstrument.trn";
PvlToXmlTranslationManager targXlator(*inputLabel, translationFileName.expanded());
targXlator.Auto(*m_domDoc);
- // Move target to just below Observing_System.
+ // Move target to just below Observing_System.
QDomElement targetIdNode = obsAreaNode.firstChildElement("Target_Identification");
obsAreaNode.insertAfter(targetIdNode, obsAreaNode.firstChildElement("Observing_System"));
}
else if (inputLabel->findObject("IsisCube").hasGroup("Mapping")) {
- translationFileName = "$ISISROOT/appdata/translations/pds4ExportTargetFromMapping.trn";
+ translationFileName = "$ISISROOT/appdata/translations/pds4ExportTargetFromMapping.trn";
PvlToXmlTranslationManager targXlator(*inputLabel, translationFileName.expanded());
targXlator.Auto(*m_domDoc);
}
@@ -307,18 +307,18 @@ namespace Isis {
else {
QString timeValue = startTime.text();
if (!timeValue.contains("Z")) {
- PvlToXmlTranslationManager::resetElementValue(startTime, timeValue + "Z");
+ PvlToXmlTranslationManager::resetElementValue(startTime, timeValue + "Z");
}
}
- QDomElement stopTime = timeNode.firstChildElement("stop_date_time");
+ QDomElement stopTime = timeNode.firstChildElement("stop_date_time");
if (stopTime.text() == "") {
stopTime.setAttribute("xsi:nil", "true");
}
else {
QString timeValue = stopTime.text();
if (!timeValue.contains("Z")) {
- PvlToXmlTranslationManager::resetElementValue(stopTime, timeValue + "Z");
+ PvlToXmlTranslationManager::resetElementValue(stopTime, timeValue + "Z");
}
}
QStringList xmlPath;
@@ -374,7 +374,7 @@ namespace Isis {
identificationAreaNode.insertAfter(aliasListNode, identificationAreaNode.firstChildElement("product_class"));
}
- // Put Reference list in correct place:
+ // Put Reference list in correct place:
QDomElement referenceListNode = m_domDoc->documentElement().firstChildElement("Reference_List");
if ( !referenceListNode.isNull() && !identificationAreaNode.isNull() ) {
m_domDoc->documentElement().insertAfter(referenceListNode, obsAreaNode);
@@ -389,31 +389,31 @@ namespace Isis {
}
/**
- * Allows mission specific programs to set logical_identifier
- * required for PDS4 labels. This value is added to the xml file
- * by the identificationArea() method.
- *
- * The input value will be converted to all-lowercase if not already
- * in line with PDS4 requirements.
- *
- * The input string should be colon separated string with 6
- * identifiers:
- *
- * <ol>
+ * Allows mission specific programs to set logical_identifier
+ * required for PDS4 labels. This value is added to the xml file
+ * by the identificationArea() method.
+ *
+ * The input value will be converted to all-lowercase if not already
+ * in line with PDS4 requirements.
+ *
+ * The input string should be colon separated string with 6
+ * identifiers:
+ *
+ * <ol>
* <li> urn </li>
* <li> space_agency (ususally nasa) </li>
* <li> archiving_organization (usually pds) </li>
* <li> bundle_id </li>
* <li> collection_id </li>
* <li> product_id </li>
- * </ol>
- *
- * Example:
- * urn:esa:psa:em16_tgo_frd:data_raw:frd_raw_sc_d_20150625T133700-20150625T135700
- *
+ * </ol>
+ *
+ * Example:
+ * urn:esa:psa:em16_tgo_frd:data_raw:frd_raw_sc_d_20150625T133700-20150625T135700
+ *
* @author 2018-05-21 Jeannie Backer
- *
- * @param lid The logical identifier value required for PDS4
+ *
+ * @param lid The logical identifier value required for PDS4
* compliant labels.
*/
void ProcessExportPds4::setLogicalId(QString lid) {
@@ -423,15 +423,15 @@ namespace Isis {
/**
* Allows mission specific programs to set version_id
- * required for PDS4 labels. This value is added to the xml file
- * by the identificationArea() method.
- *
- * The input string should be colon separated string with 6
- * identifiers:
- *
+ * required for PDS4 labels. This value is added to the xml file
+ * by the identificationArea() method.
+ *
+ * The input string should be colon separated string with 6
+ * identifiers:
+ *
* @author 2019-03-01 Kristin Berry
- *
- * @param versiondId The version_id value required for PDS4
+ *
+ * @param versiondId The version_id value required for PDS4
* compliant labels.
*/
void ProcessExportPds4::setVersionId(QString versionId) {
@@ -441,12 +441,12 @@ namespace Isis {
/**
* Allows mission specific programs to set the title
- * required for PDS4 labels. This value is added to the xml file
- * by the identificationArea() method.
- *
+ * required for PDS4 labels. This value is added to the xml file
+ * by the identificationArea() method.
+ *
* @author 2019-03-01 Kristin Berry
- *
- * @param title The title value required for PDS4
+ *
+ * @param title The title value required for PDS4
* compliant labels.
*/
void ProcessExportPds4::setTitle(QString title) {
@@ -455,11 +455,11 @@ namespace Isis {
/**
- * Allows mission specific programs to use specified
- * versions of dictionaries.
- *
+ * Allows mission specific programs to use specified
+ * versions of dictionaries.
+ *
* @author 2018-05-21 Jeannie Backer
- *
+ *
* @param schema The string of schema to be set.
*/
void ProcessExportPds4::setSchemaLocation(QString schema) {
@@ -469,10 +469,10 @@ namespace Isis {
/**
* This method writes the identification information to the PDS4
- * labels.
+ * labels.
*/
void ProcessExportPds4::identificationArea() {
- Pvl *inputLabel = InputCubes[0]->label();
+ Pvl *inputLabel = InputCubes[0]->label();
FileName translationFileName;
translationFileName = "$ISISROOT/appdata/translations/pds4ExportIdentificationArea.trn";
PvlToXmlTranslationManager xlator(*inputLabel, translationFileName.expanded());
@@ -502,12 +502,12 @@ namespace Isis {
PvlToXmlTranslationManager::resetElementValue(lidElement, m_lid);
if (m_versionId != "") {
- QDomElement versionElement = identificationElement.firstChildElement("version_id");
+ QDomElement versionElement = identificationElement.firstChildElement("version_id");
PvlToXmlTranslationManager::resetElementValue(versionElement, m_versionId);
}
if (m_title != "") {
- QDomElement titleElement = identificationElement.firstChildElement("title");
+ QDomElement titleElement = identificationElement.firstChildElement("title");
PvlToXmlTranslationManager::resetElementValue(titleElement, m_title);
}
@@ -525,48 +525,48 @@ namespace Isis {
addHistory(historyDescription, historyDate);
}
-
+
/**
- * This method writes the display direction information to
- * the PDS4 labels.
+ * This method writes the display direction information to
+ * the PDS4 labels.
*/
void ProcessExportPds4::displaySettings() {
// Add header info
- addSchema("PDS4_DISP_1B00.sch",
+ addSchema("PDS4_DISP_1B00.sch",
"PDS4_DISP_1B00.xsd",
- "xmlns:disp",
- "http://pds.nasa.gov/pds4/disp/v1");
+ "xmlns:disp",
+ "http://pds.nasa.gov/pds4/disp/v1");
- Pvl *inputLabel = InputCubes[0]->label();
+ Pvl *inputLabel = InputCubes[0]->label();
FileName translationFileName;
translationFileName = "$ISISROOT/appdata/translations/pds4ExportDisplaySettings.trn";
PvlToXmlTranslationManager xlator(*inputLabel, translationFileName.expanded());
xlator.Auto(*m_domDoc);
}
-
+
/**
- * Export bandbin group to sp:Spectral Characteristics
- *
+ * Export bandbin group to sp:Spectral Characteristics
+ *
*/
void ProcessExportPds4::standardBandBin() {
- Pvl *inputLabel = InputCubes[0]->label();
+ Pvl *inputLabel = InputCubes[0]->label();
if ( !inputLabel->findObject("IsisCube").hasGroup("BandBin") ) return;
// Add header info
- addSchema("PDS4_IMG_1A10_1510.sch",
+ addSchema("PDS4_IMG_1A10_1510.sch",
"PDS4_IMG_1A10_1510.xsd",
- "xmlns:img",
- "http://pds.nasa.gov/pds4/img/v1");
-
+ "xmlns:img",
+ "http://pds.nasa.gov/pds4/img/v1");
+
// Get the input Isis cube label and find the BandBin group if it has one
if (m_imageType == StandardImage) {
translateBandBinImage(*inputLabel);
}
else {
// Add header info
- addSchema("PDS4_SP_1100.sch",
+ addSchema("PDS4_SP_1100.sch",
"PDS4_SP_1100.xsd",
- "xmlns:sp",
+ "xmlns:sp",
"http://pds.nasa.gov/pds4/sp/v1");
if (m_imageType == UniformlySampledSpectrum) {
translateBandBinSpectrumUniform(*inputLabel);
@@ -728,7 +728,7 @@ namespace Isis {
}
}
}
-
+
}
@@ -757,15 +757,15 @@ namespace Isis {
// sampling_interval (units Hz, Angstrom, cm**-1, respectively)
// bin_width (units Hz, Angstrom, cm**-1, respectively)
// first_center_value (units Hz, Angstrom, cm**-1, respectively)
- // last_center_value (units Hz, Angstrom, cm**-1, respectively)
- // Local_Internal_Reference
+ // last_center_value (units Hz, Angstrom, cm**-1, respectively)
+ // Local_Internal_Reference
// Local_Internal_Reference:local_reference_type = spectral_characteristics_to_array_axis
- // Local_Internal_Reference:local_identifier_reference,
- // 1. At least one Axis_Array:axis_name must match the
- // value of the local_identifier_reference in the
+ // Local_Internal_Reference:local_identifier_reference,
+ // 1. At least one Axis_Array:axis_name must match the
+ // value of the local_identifier_reference in the
// Axis_Uniformly_Sampled.
// Set Axis_Uniformly_Sampled:local_identifier_reference = Axis_Array:axis_name = Band
- // 2. At least one Array_3D_Spectrum:local_identifier must match
+ // 2. At least one Array_3D_Spectrum:local_identifier must match
// the value of the local_identifier_reference in the
// Spectral_Characteristics.
// Set Spectral_Characteristics:local_identifier_reference = Array_3D_Spectrum:local_identifier = Spectral_Array_Object
@@ -793,13 +793,13 @@ namespace Isis {
QDomElement lastCenterElement = m_domDoc->createElement("sp:last_center_value");
PvlToXmlTranslationManager::setElementValue(lastCenterElement, lastCenter);
spectralCharElement.appendChild(lastCenterElement);
-
+
}
/**
- * Sets the description string which describes the pixel vales in
- * File_Area_Observational
- *
+ * Sets the description string which describes the pixel vales in
+ * File_Area_Observational
+ *
* @param description Description of pixel values to use.
*/
void ProcessExportPds4::setPixelDescription(QString description) {
@@ -807,12 +807,12 @@ namespace Isis {
}
/**
- * Create and internalize an image output label from the input
- * image. This method has a similar function to
- * ProcessExportPds::StandardImageImage.
+ * Create and internalize an image output label from the input
+ * image. This method has a similar function to
+ * ProcessExportPds::StandardImageImage.
*/
void ProcessExportPds4::fileAreaObservational() {
- Pvl *inputLabel = InputCubes[0]->label();
+ Pvl *inputLabel = InputCubes[0]->label();
QString imageObject = "";
QString translationFile = "$ISISROOT/appdata/translations/pds4Export";
@@ -877,13 +877,13 @@ namespace Isis {
fileAreaObservationalElement.firstChildElement(imageObject);
if (!arrayImageElement.isNull()) {
- // reorder axis elements.
+ // reorder axis elements.
// Translation order: elements, axis_name, sequence_number
// Correct order: axis_name, elements, sequence_number
QDomElement axisArrayElement = arrayImageElement.firstChildElement("Axis_Array");
while( !axisArrayElement.isNull() ) {
QDomElement axisNameElement = axisArrayElement.firstChildElement("axis_name");
- axisArrayElement.insertBefore(axisNameElement,
+ axisArrayElement.insertBefore(axisNameElement,
axisArrayElement.firstChildElement("elements"));
axisArrayElement = axisArrayElement.nextSiblingElement("Axis_Array");
}
@@ -909,16 +909,16 @@ namespace Isis {
}
// Add the Special_Constants class to define ISIS special pixel values if pixel type is
- QDomElement specialConstantElement = m_domDoc->createElement("Special_Constants");
+ QDomElement specialConstantElement = m_domDoc->createElement("Special_Constants");
arrayImageElement.insertAfter(specialConstantElement,
arrayImageElement.lastChildElement("Axis_Array"));
switch (p_pixelType) {
- case Real:
+ case Real:
{ QDomElement nullElement = m_domDoc->createElement("missing_constant");
PvlToXmlTranslationManager::setElementValue(nullElement, QString::number(NULL4, 'g', 18));
specialConstantElement.appendChild(nullElement);
-
+
QDomElement highInstrumentSatElement = m_domDoc->createElement("high_instrument_saturation");
PvlToXmlTranslationManager::setElementValue(highInstrumentSatElement, QString::number(HIGH_INSTR_SAT4, 'g', 18));
specialConstantElement.appendChild(highInstrumentSatElement);
@@ -933,14 +933,14 @@ namespace Isis {
QDomElement lowRepresentationSatElement = m_domDoc->createElement("low_representation_saturation");
PvlToXmlTranslationManager::setElementValue(lowRepresentationSatElement, QString::number(LOW_REPR_SAT4, 'g', 18));
- specialConstantElement.appendChild(lowRepresentationSatElement);
+ specialConstantElement.appendChild(lowRepresentationSatElement);
break;}
case UnsignedByte:
{ QDomElement nullElement = m_domDoc->createElement("missing_constant");
PvlToXmlTranslationManager::setElementValue(nullElement, QString::number(NULL1, 'g', 18));
specialConstantElement.appendChild(nullElement);
-
+
QDomElement highInstrumentSatElement = m_domDoc->createElement("high_instrument_saturation");
PvlToXmlTranslationManager::setElementValue(highInstrumentSatElement, QString::number(HIGH_INSTR_SAT1, 'g', 18));
specialConstantElement.appendChild(highInstrumentSatElement);
@@ -962,7 +962,7 @@ namespace Isis {
{ QDomElement nullElement = m_domDoc->createElement("missing_constant");
PvlToXmlTranslationManager::setElementValue(nullElement, QString::number(NULL2, 'g', 18));
specialConstantElement.appendChild(nullElement);
-
+
QDomElement highInstrumentSatElement = m_domDoc->createElement("high_instrument_saturation");
PvlToXmlTranslationManager::setElementValue(highInstrumentSatElement, QString::number(HIGH_INSTR_SAT2, 'g', 18));
specialConstantElement.appendChild(highInstrumentSatElement);
@@ -977,14 +977,14 @@ namespace Isis {
QDomElement lowRepresentationSatElement = m_domDoc->createElement("low_representation_saturation");
PvlToXmlTranslationManager::setElementValue(lowRepresentationSatElement, QString::number(LOW_REPR_SAT2, 'g', 18));
- specialConstantElement.appendChild(lowRepresentationSatElement);
+ specialConstantElement.appendChild(lowRepresentationSatElement);
break; }
case UnsignedWord:
{ QDomElement nullElement = m_domDoc->createElement("missing_constant");
PvlToXmlTranslationManager::setElementValue(nullElement, QString::number(NULLU2, 'g', 18));
specialConstantElement.appendChild(nullElement);
-
+
QDomElement highInstrumentSatElement = m_domDoc->createElement("high_instrument_saturation");
PvlToXmlTranslationManager::setElementValue(highInstrumentSatElement, QString::number(HIGH_INSTR_SATU2, 'g', 18));
specialConstantElement.appendChild(highInstrumentSatElement);
@@ -999,7 +999,7 @@ namespace Isis {
QDomElement lowRepresentationSatElement = m_domDoc->createElement("low_representation_saturation");
PvlToXmlTranslationManager::setElementValue(lowRepresentationSatElement, QString::number(LOW_REPR_SATU2, 'g', 18));
- specialConstantElement.appendChild(lowRepresentationSatElement);
+ specialConstantElement.appendChild(lowRepresentationSatElement);
break; }
case None:
@@ -1012,7 +1012,7 @@ namespace Isis {
if (!m_pixelDescription.isEmpty()) {
- QDomElement descriptionElement = m_domDoc->createElement("description");
+ QDomElement descriptionElement = m_domDoc->createElement("description");
PvlToXmlTranslationManager::setElementValue(descriptionElement,
m_pixelDescription);
arrayImageElement.insertAfter(descriptionElement, arrayImageElement.lastChildElement());
@@ -1022,11 +1022,11 @@ namespace Isis {
/**
- * Adds necessary information to the xml header for a pds4 class for schema which lack
- * schematron files (.sch)
- *
+ * Adds necessary information to the xml header for a pds4 class for schema which lack
+ * schematron files (.sch)
+ *
* @param xsd Schema filename without path
- * @param xmlns The xml namespace used
+ * @param xmlns The xml namespace used
* @param xmlnsURI Full URL to the xml namespace URI. Also used as the location of the sch and xsd
*/
void ProcessExportPds4::addSchema(QString xsd, QString xmlns, QString xmlnsURI) {
@@ -1035,7 +1035,7 @@ namespace Isis {
root.setAttribute(xmlns, xmlnsURI);
// Add to xsi:schemaLocation
- m_schemaLocation += " ";
+ m_schemaLocation += " ";
m_schemaLocation += xmlnsURI;
m_schemaLocation += " ";
m_schemaLocation += xmlnsURI;
@@ -1046,11 +1046,11 @@ namespace Isis {
/**
- * Adds necessary information to the xml header for a pds4 class.
- *
+ * Adds necessary information to the xml header for a pds4 class.
+ *
* @param sch Schematron filename without path
* @param xsd Schema filename without path
- * @param xmlns The xml namespace used
+ * @param xmlns The xml namespace used
* @param xmlnsURI Full URL to the xml namespace URI. Also used as the location of the sch and xsd
*/
void ProcessExportPds4::addSchema(QString sch, QString xsd, QString xmlns, QString xmlnsURI) {
@@ -1095,7 +1095,7 @@ namespace Isis {
/**
* Return the internalized PDS4 label. If no label is internalized yet, an
* empty label will be returned.
- *
+ *
* @return @b QDomDocument The PDS4 Xml label
*/
QDomDocument &ProcessExportPds4::GetLabel() {
@@ -1109,18 +1109,18 @@ namespace Isis {
}
return *m_domDoc;
}
-
-
+
+
/**
* This method write out the labels and image data to the specified output file.
* Creates an IMG and XML file.
- *
- * @param outFile QString of the name of the output image file. Will create an XML
+ *
+ * @param outFile QString of the name of the output image file. Will create an XML
* and an IMG file with the output file name.
*
*/
void ProcessExportPds4::WritePds4(QString outFile) {
-
+
FileName outputFile(outFile);
// Name for output label
@@ -1132,7 +1132,7 @@ namespace Isis {
QString imageName = outputFile.expanded();
// If input file ends in .xml, the user entered a label name for the output file, not an
- // image name with a unique file extension.
+ // image name with a unique file extension.
if (QString::compare(outputFile.extension(), "xml", Qt::CaseInsensitive) == 0) {
imageName = path + "/" + name + ".img";
}
@@ -1142,7 +1142,7 @@ namespace Isis {
rootElement.firstChildElement("File_Area_Observational");
QDomElement fileElement = m_domDoc->createElement("File");
- fileAreaObservationalElement.insertBefore(fileElement,
+ fileAreaObservationalElement.insertBefore(fileElement,
fileAreaObservationalElement.firstChildElement());
QDomElement fileNameElement = m_domDoc->createElement("file_name");
@@ -1156,7 +1156,7 @@ namespace Isis {
ofstream outputLabel(labelName.toLatin1().data());
OutputLabel(outputLabel);
outputLabel.close();
-
+
ofstream outputImageFile(imageName.toLatin1().data());
StartProcess(outputImageFile);
outputImageFile.close();
@@ -1170,8 +1170,8 @@ namespace Isis {
* label
*
*
- * @throws IException::User "Unable to export projection [" + projName + "] to PDS4 product. " +
- "This projection is not supported in ISIS3."
+ * @throws IException::User "Unable to export projection [" + projName + "] to PDS4 product. " +
+ "This projection is not supported in ISIS."
*/
void ProcessExportPds4::StandardAllMapping() {
// Cartography
@@ -1181,33 +1181,33 @@ namespace Isis {
!(inputLabel->findObject("IsisCube").hasGroup("Mapping"))) return;
PvlGroup &inputMapping = inputLabel->findGroup("Mapping", Pvl::Traverse);
- addSchema("PDS4_CART_1900.sch",
+ addSchema("PDS4_CART_1900.sch",
"PDS4_CART_1900.xsd",
- "xmlns:cart",
- "http://pds.nasa.gov/pds4/cart/v1");
+ "xmlns:cart",
+ "http://pds.nasa.gov/pds4/cart/v1");
// Translate the projection specific keywords for a PDS IMAGE_MAP_PROJECTION
- Projection *proj = ProjectionFactory::Create(*inputLabel);
+ Projection *proj = ProjectionFactory::Create(*inputLabel);
QString projName = proj->Name();
try {
- PvlToXmlTranslationManager xlatorSpecProj(*inputLabel,
+ PvlToXmlTranslationManager xlatorSpecProj(*inputLabel,
"$ISISROOT/appdata/translations/pds4Export" + projName + ".trn");
xlatorSpecProj.Auto(*m_domDoc);
- }
+ }
catch (IException &e) {
- QString msg = "Unable to export projection [" + projName + "] to PDS4 product. " +
+ QString msg = "Unable to export projection [" + projName + "] to PDS4 product. " +
"This projection is not supported in ISIS3.";
throw IException(e, IException::User, msg, _FILEINFO_);
}
// convert units.
QStringList xmlPath;
- xmlPath << "Product_Observational"
- << "Observation_Area"
- << "Discipline_Area"
- << "cart:Cartography"
- << "cart:Map_Projection"
- << "cart:Spatial_Reference_Information"
+ xmlPath << "Product_Observational"
+ << "Observation_Area"
+ << "Discipline_Area"
+ << "cart:Cartography"
+ << "cart:Map_Projection"
+ << "cart:Spatial_Reference_Information"
<< "cart:Horizontal_Coordinate_System_Definition"
<< "cart:Geodetic_Model";
@@ -1217,7 +1217,7 @@ namespace Isis {
if (!semiMajorRadElement.isNull()) {
QString units = semiMajorRadElement.attribute("unit");
- if( units.compare("km", Qt::CaseInsensitive) != 0 && units.compare("kilometers", Qt::CaseInsensitive) != 0) {
+ if( units.compare("km", Qt::CaseInsensitive) != 0 && units.compare("kilometers", Qt::CaseInsensitive) != 0) {
//if no units, assume in meters
double dValue = toDouble(semiMajorRadElement.text());
@@ -1230,7 +1230,7 @@ namespace Isis {
if (!semiMinorRadElement.isNull()) {
QString units = semiMinorRadElement.attribute("unit");
- if( units.compare("km", Qt::CaseInsensitive) != 0 && units.compare("kilometers", Qt::CaseInsensitive) != 0) {
+ if( units.compare("km", Qt::CaseInsensitive) != 0 && units.compare("kilometers", Qt::CaseInsensitive) != 0) {
// If no units, assume in meters
double dValue = toDouble(semiMinorRadElement.text());
dValue /= 1000.0;
@@ -1241,7 +1241,7 @@ namespace Isis {
QDomElement polarRadElement = geodeticModelElement.firstChildElement("cart:polar_radius");
if (!polarRadElement.isNull()) {
QString units = polarRadElement.attribute("unit");
- if( units.compare("km", Qt::CaseInsensitive) != 0 && units.compare("kilometers", Qt::CaseInsensitive) != 0) {
+ if( units.compare("km", Qt::CaseInsensitive) != 0 && units.compare("kilometers", Qt::CaseInsensitive) != 0) {
// If no units, assume in meters
double dValue = toDouble(polarRadElement.text());
dValue /= 1000.0;
@@ -1252,16 +1252,16 @@ namespace Isis {
PvlKeyword &isisLonDir = inputMapping.findKeyword("LongitudeDirection");
QString lonDir = isisLonDir[0];
lonDir = lonDir.toUpper();
-
+
// Add Lat/Lon range
- double maxLon, minLon, maxLat, minLat;
- InputCubes[0]->latLonRange(minLat, maxLat, minLon, maxLon);
-
+ double maxLon, minLon, maxLat, minLat;
+ InputCubes[0]->latLonRange(minLat, maxLat, minLon, maxLon);
+
xmlPath.clear();
xmlPath << "Product_Observational"
- << "Observation_Area"
+ << "Observation_Area"
<< "Discipline_Area"
- << "cart:Cartography"
+ << "cart:Cartography"
<< "cart:Spatial_Domain"
<< "cart:Bounding_Coordinates";
QDomElement boundingCoordElement = getElement(xmlPath, baseElement);
@@ -1288,9 +1288,9 @@ namespace Isis {
// longitude_of_central_meridian and latitude_of_projection_origin need to be converted to floats.
xmlPath.clear();
xmlPath << "Product_Observational"
- << "Observation_Area"
+ << "Observation_Area"
<< "Discipline_Area"
- << "cart:Cartography"
+ << "cart:Cartography"
<< "cart:Spatial_Reference_Information"
<< "cart:Horizontal_Coordinate_System_Definition"
<< "cart:Planar"
@@ -1301,29 +1301,29 @@ namespace Isis {
QDomElement tempElement = projectionElement.firstChildElement();
QDomElement nameElement = tempElement.nextSiblingElement();
- QDomElement longitudeElement = nameElement.firstChildElement("cart:longitude_of_central_meridian");
+ QDomElement longitudeElement = nameElement.firstChildElement("cart:longitude_of_central_meridian");
QDomElement originElement = nameElement.firstChildElement("cart:latitude_of_projection_origin");
- double longitudeElementValue = longitudeElement.text().toDouble();
- double originElementValue = originElement.text().toDouble();
+ double longitudeElementValue = longitudeElement.text().toDouble();
+ double originElementValue = originElement.text().toDouble();
- // Only update the ouput formatting if there are no digits after the decimal point.
+ // Only update the ouput formatting if there are no digits after the decimal point.
if (!longitudeElement.text().contains('.')) {
- QString toset1 = QString::number(longitudeElementValue, 'f', 1);
- PvlToXmlTranslationManager::resetElementValue(longitudeElement, toset1, "deg");
+ QString toset1 = QString::number(longitudeElementValue, 'f', 1);
+ PvlToXmlTranslationManager::resetElementValue(longitudeElement, toset1, "deg");
}
if (!originElement.text().contains('.')) {
- QString toset2 = QString::number(originElementValue, 'f', 1);
+ QString toset2 = QString::number(originElementValue, 'f', 1);
PvlToXmlTranslationManager::resetElementValue(originElement, toset2, "deg");
}
}
/**
- * Convenience method to get an element given a path and its parent.
- *
- * @param xmlPath The XML path to the element to retrieve,
+ * Convenience method to get an element given a path and its parent.
+ *
+ * @param xmlPath The XML path to the element to retrieve,
* starting at the parent element. Note: The
* first element of this path must be the same as
* the parent element passed in, unless the
@@ -1333,22 +1333,22 @@ namespace Isis {
* given.
* @param parent The parent QDomElement of the given path. Defaults to
* the root element of the document.
- *
- * @return QDomElement
+ *
+ * @return QDomElement
*/
QDomElement ProcessExportPds4::getElement(QStringList xmlPath, QDomElement parent) {
QDomElement baseElement = parent;
if (baseElement.isNull()) {
baseElement = m_domDoc->documentElement();
}
- if (baseElement.isNull()) {
- QString msg = "Unable to get element from empty XML document.";
+ if (baseElement.isNull()) {
+ QString msg = "Unable to get element from empty XML document.";
throw IException(IException::Programmer, msg, _FILEINFO_);
}
QString parentName = xmlPath[0];
if (parentName != baseElement.tagName()) {
QString msg = "The tag name of the parent element passed in "
- "must be the first value in the given XML path.";
+ "must be the first value in the given XML path.";
throw IException(IException::Programmer, msg, _FILEINFO_);
}
for (int i = 1; i < xmlPath.size(); i++) {
@@ -1362,10 +1362,10 @@ namespace Isis {
/**
* Helper function for converting ISIS pixel type and byte order to a PDS4 data_type value.
- *
+ *
* @param pixelType The ISIS pixel type of the data
* @param endianType The byte order of the data
- *
+ *
* @return @b QString The PDS4 data_type value for the given pixel type and byte order.
*/
QString ProcessExportPds4::PDS4PixelType(PixelType pixelType, ByteOrder endianType) {
@@ -1403,7 +1403,7 @@ namespace Isis {
* Add a modification history instance by adding a Modification_Detail entry
* to the Modification_History element. If there are no existing entries,
* this will create a Modification_History element also.
- *
+ *
* @param description The description of the modification.
* @param date The date of the modification. Expected format is "YYYY-MM-DD". Defaults to "tbd".
* @param version The product version. Expected format is "m.n". Defaults to "tbd".
@@ -1459,15 +1459,15 @@ namespace Isis {
/**
* This function will go through an XML document and attempt to convert all
* "units" attributes to the appropriate PDS4 units format.
- *
+ *
* This method uses a pvl config file to determine what the proper PDS4
* format is and what potential input formats are. The file is converted to
* a map which is then used to convert all of the input units. See
* $ISISROOT/appdata/translations/pds4ExportUnits.pvl for more information on this file.
- *
+ *
* This method is automatically called in StandardPds4Label(), but may need
* to be called again if the label is changed afterwards.
- *
+ *
* @param[in,out] label A reference to the label that the units will be
* translated in.
* @param transMapFile The path to the config file that will be used to
@@ -1506,12 +1506,12 @@ namespace Isis {
/**
* Helper function for creating the unit translation map from a PVL object.
- *
+ *
* @param configPvl The config PVL that defines the map.
- *
+ *
* @return @b QMap<QString,QString> The map that converts lower case ISIS
* units to PDS4 units.
- *
+ *
* @see ProcessExportPds4::translateUnits
*/
QMap<QString, QString> ProcessExportPds4::createUnitMap(Pvl configPvl) {
@@ -1538,7 +1538,7 @@ namespace Isis {
}
}
}
- return transMap;
+ return transMap;
}
@@ -1546,12 +1546,12 @@ namespace Isis {
* Recursive method that will translate the "unit" attribute of any child
* elements of a given element. Returns void if the given element has no
* children.
- *
+ *
* @param parent The element whose children's units will be translated. This
* method will be recursively called on all child elements.
* @param transMap The translation map with lowercase ISIS units as keys and
* PDS4 units as values.
- *
+ *
* @see ProcessExportPds4::translateUnits
*/
void ProcessExportPds4::translateChildUnits(QDomElement parent, QMap<QString, QString> transMap) {
diff --git a/isis/src/base/objs/ProcessImportPds/ProcessImportPds.cpp b/isis/src/base/objs/ProcessImportPds/ProcessImportPds.cpp
index 93d4e9cc35..b7307b15ad 100644
--- a/isis/src/base/objs/ProcessImportPds/ProcessImportPds.cpp
+++ b/isis/src/base/objs/ProcessImportPds/ProcessImportPds.cpp
@@ -1460,7 +1460,7 @@ namespace Isis {
/**
- * Fill as many of the Isis3 BandBin labels as possible
+ * Fill as many of the Isis BandBin labels as possible
*
* @param lab The label where the translated Isis2 keywords will
* be placed
@@ -1478,7 +1478,7 @@ namespace Isis {
/**
- * Fill as many of the Isis3 instrument labels as possible
+ * Fill as many of the Isis instrument labels as possible
*
* @param lab The label where the tramslated Isis2 keywords will
* be placed
@@ -1519,7 +1519,7 @@ namespace Isis {
/**
- * Fill as many of the Isis3 BandBin labels as possible
+ * Fill as many of the Isis BandBin labels as possible
*
* @param lab The lable where the translated PDS keywords will
* be placed
@@ -1535,7 +1535,7 @@ namespace Isis {
/**
- * Fill as many of the Isis3 BandBin labels as possible
+ * Fill as many of the Isis BandBin labels as possible
*
* @param lab The lable where the translated PDS keywords will
* be placed
diff --git a/isis/src/base/objs/ProgramLauncher/ProgramLauncher.cpp b/isis/src/base/objs/ProgramLauncher/ProgramLauncher.cpp
index 495b22998b..0e4f8fd232 100644
--- a/isis/src/base/objs/ProgramLauncher/ProgramLauncher.cpp
+++ b/isis/src/base/objs/ProgramLauncher/ProgramLauncher.cpp
@@ -66,7 +66,7 @@ namespace Isis {
if(!isIsisProgram) {
QString msg = "Program [" + programName + "] does not appear to be a "
- "valid Isis 3 program";
+ "valid Isis program";
throw IException(IException::Unknown, msg, _FILEINFO_);
}
diff --git a/isis/src/base/objs/ProgramLauncher/ProgramLauncher.truth b/isis/src/base/objs/ProgramLauncher/ProgramLauncher.truth
index 4386e62984..fd1657c395 100644
--- a/isis/src/base/objs/ProgramLauncher/ProgramLauncher.truth
+++ b/isis/src/base/objs/ProgramLauncher/ProgramLauncher.truth
@@ -1,11 +1,11 @@
-Testing ProgramLauncher Class ...
+Testing ProgramLauncher Class ...
-Testing ls, grep, sed and pipes ...
+Testing ls, grep, sed and pipes ...
ProgramLauncher.cpp
ProgramLauncher.h
ProgramLauncher.truth
-Testing stats ...
+Testing stats ...
Group = Results
From = unitTest.cub
@@ -30,11 +30,11 @@ Group = Results
HrsPixels = 0
End_Group
-Testing non-existant Isis 3 program...
+Testing non-existant Isis program...
-**ERROR** Program [chocolatelab] does not appear to be a valid Isis 3 program.
+**ERROR** Program [chocolatelab] does not appear to be a valid Isis program.
-Testing using Isis 3 program as a system program without pid...
+Testing using Isis program as a system program without pid...
Group = Results
From = unitTest.cub
diff --git a/isis/src/base/objs/ProgramLauncher/unitTest.cpp b/isis/src/base/objs/ProgramLauncher/unitTest.cpp
index 33ed9cac02..b801f9c683 100644
--- a/isis/src/base/objs/ProgramLauncher/unitTest.cpp
+++ b/isis/src/base/objs/ProgramLauncher/unitTest.cpp
@@ -32,7 +32,7 @@ void IsisMain() {
"-preference=$ISISROOT/TestPreferences");
cerr << endl;
- cerr << "Testing non-existant Isis 3 program... " << endl;
+ cerr << "Testing non-existant Isis program... " << endl;
cerr << endl;
try {
ProgramLauncher::RunIsisProgram("chocolatelab",
@@ -44,7 +44,7 @@ void IsisMain() {
cerr << endl;
- cerr << "Testing using Isis 3 program as a system program without pid... "
+ cerr << "Testing using Isis program as a system program without pid... "
<< endl;
cerr << endl;
try {
diff --git a/isis/src/base/objs/SerialNumberList/SerialNumberList.cpp b/isis/src/base/objs/SerialNumberList/SerialNumberList.cpp
index 60db49aed2..cfd601bc1c 100644
--- a/isis/src/base/objs/SerialNumberList/SerialNumberList.cpp
+++ b/isis/src/base/objs/SerialNumberList/SerialNumberList.cpp
@@ -46,7 +46,7 @@ namespace Isis {
try {
FileList flist(listfile);
if (progress != NULL) {
- progress->SetText("Creating Isis 3 serial numbers from list file.");
+ progress->SetText("Creating Isis serial numbers from list file.");
progress->SetMaximumSteps((int) flist.size() + 1);
progress->CheckStatus();
}
@@ -106,10 +106,10 @@ namespace Isis {
* @internal
* @history 2007-06-04 Tracie Sucharski - Expand filename to include full path before adding
* to list.
- * @history 2010-11-24 Tracie Sucharski - Added bool def2filename parameter. This will allow
+ * @history 2010-11-24 Tracie Sucharski - Added bool def2filename parameter. This will allow
* level 2 images to be added to a serial number list.
* @history 2010-11-29 Tracie Sucharski - Only read the Instrument group if m_checkTarget is
- * True. If def2filename is True, check for Mapping group if Target
+ * True. If def2filename is True, check for Mapping group if Target
* does not exist.
*/
void SerialNumberList::add(const QString &filename, bool def2filename) {
@@ -205,7 +205,7 @@ namespace Isis {
*
* @param serialNumber The serial number to be added
* @param filename The filename to be added
- *
+ *
* @see add(QString, QString)
*/
void SerialNumberList::add(const char *serialNumber, const char *filename) {
@@ -225,12 +225,12 @@ namespace Isis {
* @throws IException::User "Duplicate serial number from files [file1] and [file2]."
* @throws IException::User "Unable to find Instrument group need for performing bundle
* adjustment."
- * @throws IException::User "Unable to find Spacecraftname or InstrumentId keywords needed for
+ * @throws IException::User "Unable to find Spacecraftname or InstrumentId keywords needed for
* performing bundle adjustment."
* @throws IException::User "[SerialNumber, FileName] can not be added to serial number list."
- *
- * @author 2012-07-12 Tracie Sucharski
- *
+ *
+ * @author 2012-07-12 Tracie Sucharski
+ *
*/
void SerialNumberList::add(const QString &serialNumber, const QString &filename) {
Pvl p(Isis::FileName(filename).expanded());
@@ -381,7 +381,7 @@ namespace Isis {
* @return @b QString The serial number corresponding to the input filename
*
* @internal
- * @history 2007-06-04 Tracie Sucharski - Expand filename to include full path before searching
+ * @history 2007-06-04 Tracie Sucharski - Expand filename to include full path before searching
* list.
*/
QString SerialNumberList::serialNumber(const QString &filename) {
@@ -470,7 +470,7 @@ namespace Isis {
*
* @return @b int The index of the input filename
*
- * @internal
+ * @internal
* @history 2007-06-04 Tracie Sucharski - Expand filename to include full path before
* searching list.
* @history 2007-07-11 Stuart Sides - Fixed bug where the correct index was not returned.
@@ -568,7 +568,7 @@ namespace Isis {
* @throws IException::Programmer "Unable to get the possible serial numbers. The given
* observation number does not exist in the list."
*
- * @return @b vector<QString> The list of possible serial numbers matching the input observation
+ * @return @b vector<QString> The list of possible serial numbers matching the input observation
* number
*/
std::vector<QString> SerialNumberList::possibleSerialNumbers(const QString &on) {
diff --git a/isis/src/base/objs/ShapeModel/ShapeModel.cpp b/isis/src/base/objs/ShapeModel/ShapeModel.cpp
index 661292dcf7..a19e247bc5 100644
--- a/isis/src/base/objs/ShapeModel/ShapeModel.cpp
+++ b/isis/src/base/objs/ShapeModel/ShapeModel.cpp
@@ -44,7 +44,7 @@ namespace Isis {
* empty string, surface point to an empty surface point, has intersection to
* FALSE, has normal to FALSE, has ellipsoid intersection to FALSE, normal
* vector size to 3, and target to the given target.
- *
+ *
* @param target A pointer to a valid ISIS target.
*/
ShapeModel::ShapeModel(Target *target) {
@@ -78,20 +78,20 @@ namespace Isis {
/**
- * @brief Compute surface intersection with optional occlusion check
- *
- * This method sets the surface point at the given latitude, longitude. The
- * derived model is called to get the radius at that location to complete the
- * accuracy of the surface point, them the derived method is called to complete
- * the intersection.
- *
+ * @brief Compute surface intersection with optional occlusion check
+ *
+ * This method sets the surface point at the given latitude, longitude. The
+ * derived model is called to get the radius at that location to complete the
+ * accuracy of the surface point, them the derived method is called to complete
+ * the intersection.
+ *
* @author 2017-03-23 Kris Becker
- *
+ *
* @param lat Latitude of the surface point
* @param lon Longitude of the surface point
* @param observerPos Position of the observer
* @param backCheck Flag to indicate occlusion check
- *
+ *
* @return bool True if the intersection point is valid (visable)
*/
bool ShapeModel::intersectSurface(const Latitude &lat, const Longitude &lon,
@@ -103,22 +103,22 @@ namespace Isis {
/**
- * @brief Compute surface intersection with optional occlusion check
- *
- * This method sets the surface point at the given latitude, longitude. The
- * derived model is called to get the radius at that location to complete the
- * accuracy of the surface point, them the derived method is called to complete
- * the intersection.
- *
+ * @brief Compute surface intersection with optional occlusion check
+ *
+ * This method sets the surface point at the given latitude, longitude. The
+ * derived model is called to get the radius at that location to complete the
+ * accuracy of the surface point, them the derived method is called to complete
+ * the intersection.
+ *
* @author 2017-03-23 Kris Becker
- *
+ *
* @param surfpt Absolute point on the surface to check
* @param observerPos Position of the observer
* @param backCheck Flag to indicate occlusion check
- *
+ *
* @return bool True if the intersection point is valid (visable)
*/
- bool ShapeModel::intersectSurface(const SurfacePoint &surfpt,
+ bool ShapeModel::intersectSurface(const SurfacePoint &surfpt,
const std::vector<double> &observerPos,
const bool &backCheck) {
@@ -134,7 +134,7 @@ namespace Isis {
void ShapeModel::calculateEllipsoidalSurfaceNormal() {
// The below code is not truly normal unless the ellipsoid is a sphere. TODO Should this be
// fixed? Send an email asking Jeff and Stuart. See Naif routine surfnm.c to get the true
- // for an ellipsoid. For testing purposes to match old results do as Isis3 currently does until
+ // for an ellipsoid. For testing purposes to match old results do as Isis currently does until
// Jeff and Stuart respond.
if (!m_hasIntersection || !surfaceIntersection()->Valid()) {
@@ -404,22 +404,22 @@ namespace Isis {
}
/**
- * @brief Default occulsion implementation
- *
+ * @brief Default occulsion implementation
+ *
* This method is originally copied from Sensor::SetLocalGround(bool
* backCheck). This version checks for the emission angle from the observer to
* be less than or equal to 90 degrees.
- *
+ *
* It is recommended that models derived from this base class reimplement this
* method if a more robust, efficent test can be made.
- *
+ *
* Note this implementation does not handle occlusion!
- *
- * @author 2017-03-17 Kris Becker
- *
+ *
+ * @author 2017-03-17 Kris Becker
+ *
* @param observerPos Position of the observer in body fixed coordinates
* @param lookDirection Look direction from the observer
- *
+ *
* @return bool True if the point is not visable, false if it can be seen
*/
bool ShapeModel::isVisibleFrom(const std::vector<double> observerPos,
diff --git a/isis/src/base/objs/ShapeModel/ShapeModel.h b/isis/src/base/objs/ShapeModel/ShapeModel.h
index a00d8a7cbd..58f6043e0d 100644
--- a/isis/src/base/objs/ShapeModel/ShapeModel.h
+++ b/isis/src/base/objs/ShapeModel/ShapeModel.h
@@ -38,9 +38,9 @@ namespace Isis {
class Target;
/**
- * @brief Define shapes and provide utilities for Isis3 targets
+ * @brief Define shapes and provide utilities for Isis targets
*
- * This base class will define shapes of Isis3 target bodies as well as provide utilities to
+ * This base class will define shapes of Isis target bodies as well as provide utilities to
* retrieve radii and photometric information.
*
*
@@ -93,15 +93,15 @@ namespace Isis {
std::vector<double> lookDirection)=0;
// These two methods are for optional testing of occlusions when checking
- // specific locations on the body from the observer. The first uses
- // localRadius() by default and so may be OK as is.
+ // specific locations on the body from the observer. The first uses
+ // localRadius() by default and so may be OK as is.
virtual bool intersectSurface(const Latitude &lat, const Longitude &lon,
const std::vector<double> &observerPos,
const bool &backCheck = true);
- virtual bool intersectSurface(const SurfacePoint &surfpt,
+ virtual bool intersectSurface(const SurfacePoint &surfpt,
const std::vector<double> &observerPos,
const bool &backCheck = true);
-
+
// Return the surface intersection
diff --git a/isis/src/base/objs/ShapeModelFactory/ShapeModelFactory.cpp b/isis/src/base/objs/ShapeModelFactory/ShapeModelFactory.cpp
index ef0057a7b7..63f48d5e6a 100644
--- a/isis/src/base/objs/ShapeModelFactory/ShapeModelFactory.cpp
+++ b/isis/src/base/objs/ShapeModelFactory/ShapeModelFactory.cpp
@@ -65,15 +65,15 @@ namespace Isis {
/**
- * Construct a valid shape model from the given target and contents of kernels
- * group. If the Kernels group does not have a ShapeModel or ElevationModel
- * specified, then the default model is an ellipsoidal shape.
- *
+ * Construct a valid shape model from the given target and contents of kernels
+ * group. If the Kernels group does not have a ShapeModel or ElevationModel
+ * specified, then the default model is an ellipsoidal shape.
+ *
* @param target Pointer to target body model.
* @param pvl Pvl containing a Kernels group.
- *
+ *
* @return ShapeModel* Pointer to the created ShapeModel object.
- *
+ *
* @author 2017-03-17 Kris Becker
*/
ShapeModel *ShapeModelFactory::create(Target *target, Pvl &pvl) {
@@ -174,7 +174,7 @@ namespace Isis {
// Check to see of ISIS cube DEMs get a pass
FileName v_shapefile(shapeModelFilenames);
QString ext = v_shapefile.extension().toLower();
- // Cubes are not supported at this time.
+ // Cubes are not supported at this time.
try {
BulletTargetShape *bullet = BulletTargetShape::load(shapeModelFilenames);
@@ -187,9 +187,9 @@ namespace Isis {
throw IException(IException::Unknown, mess, _FILEINFO_);
}
- // Always throw an error in this case
+ // Always throw an error in this case
QString b_msg = "Bullet could not initialize DEM!";
- throw IException(IException::Unknown, b_msg, _FILEINFO_);
+ throw IException(IException::Unknown, b_msg, _FILEINFO_);
}
else {
@@ -212,9 +212,9 @@ namespace Isis {
if ("fail" == onerror) throw fileError;
}
- // Don't have ShapeModel yet - invoke pre-exising behavior (2017-03-23)
+ // Don't have ShapeModel yet - invoke pre-exising behavior (2017-03-23)
}
-
+
//-------------- Check for Embree engine -------------------------------//
if ( "embree" == preferred ) {
@@ -238,7 +238,7 @@ namespace Isis {
PvlContainer::Replace);
return ( embreeModel );
-
+
} catch (IException &ie) {
fileError.append(ie);
QString mess = "Unable to create preferred EmbreeShapeModel";
@@ -274,7 +274,7 @@ namespace Isis {
// TODO Deal with stacks -- this could be a list of DEMs
Isis::Cube* shapeModelCube = new Isis::Cube;
try {
- // first, try to open the shape model file as an Isis3 cube
+ // first, try to open the shape model file as an Isis cube
shapeModelCube->open(FileName(shapeModelFilenames).expanded(), "r" );
}
catch (IException &e) {
@@ -336,7 +336,7 @@ namespace Isis {
// in case no error was thrown, but constructor returned NULL
fileError.append(IException(IException::Unknown, msg, _FILEINFO_));
}
-
+
delete shapeModelCube;
}
diff --git a/isis/src/base/objs/ShapeModelFactory/ShapeModelFactory.h b/isis/src/base/objs/ShapeModelFactory/ShapeModelFactory.h
index f26e1005e5..5035854eb2 100644
--- a/isis/src/base/objs/ShapeModelFactory/ShapeModelFactory.h
+++ b/isis/src/base/objs/ShapeModelFactory/ShapeModelFactory.h
@@ -47,8 +47,8 @@ namespace Isis {
* Fixes #4890.
* @history 2017-03-23 Kris Becker - Added support for Embree and Bullet models.
* @history 2017-08-04 Kristin Berry - Removed checks for a 'CubeSupported' IsisPreferences Pvl
- * Keyword. ISIS3 Cube DEMs are not supported by Embree and Bullet
- * at this time.
+ * Keyword. ISIS Cube DEMs are not supported by Embree and Bullet
+ * at this time.
*/
class ShapeModelFactory {
public:
diff --git a/isis/src/base/objs/SpicePosition/SpicePosition.cpp b/isis/src/base/objs/SpicePosition/SpicePosition.cpp
index 1cf7eda039..c047d9a6ec 100644
--- a/isis/src/base/objs/SpicePosition/SpicePosition.cpp
+++ b/isis/src/base/objs/SpicePosition/SpicePosition.cpp
@@ -39,7 +39,7 @@ namespace Isis {
* observer/target order in the NAIF spkez_c/spkezp_c routines when determining
* the state of spacecraft and target body.
*
- * Traditionally, ISIS3 (and ISIS2!) has had the target/observer order swapped
+ * Traditionally, ISIS (and ISIS2!) has had the target/observer order swapped
* improperly to determine state vector between the two bodies. This
* constructor provides a transaitional path to correct this in a
* controlled way. See SpacecraftPosition for details.
diff --git a/isis/src/base/objs/SpiceRotation/SpiceRotation.h b/isis/src/base/objs/SpiceRotation/SpiceRotation.h
index 8525bf3ce7..035019ba06 100644
--- a/isis/src/base/objs/SpiceRotation/SpiceRotation.h
+++ b/isis/src/base/objs/SpiceRotation/SpiceRotation.h
@@ -172,7 +172,7 @@ namespace Isis {
* includes, fixed history indentation and line
* length. References #1181.
* @history 2013-03-27 Jeannie Backer - Added methods for MsiCamera. Brought
- * class closer to Isis3 standards: moved method
+ * class closer to Isis standards: moved method
* implementation to cpp file, fixed documentation.
* References #1248.
* @history 2013-11-12 Ken Edmundson Programmers notes - Commented out cout
@@ -425,7 +425,7 @@ namespace Isis {
int cacheSize() {
if (m_orientation) {
- return m_orientation->getRotations().size();
+ return m_orientation->getRotations().size();
}
return 0;
}
@@ -444,7 +444,7 @@ namespace Isis {
int p_axis2; //!< Axis of rotation for angle 2 of rotation
int p_axis3; //!< Axis of rotation for angle 3 of rotation
ale::Orientations *m_orientation; //! Cached orientation information
-
+
private:
// method
void setFrameType();
diff --git a/isis/src/base/objs/Table/Table.h b/isis/src/base/objs/Table/Table.h
index 84aa5634f2..b0b8b8ecc5 100644
--- a/isis/src/base/objs/Table/Table.h
+++ b/isis/src/base/objs/Table/Table.h
@@ -31,16 +31,16 @@ namespace Isis {
/**
* @brief Class for storing Table blobs information.
*
- * This class can create new Tables or read table blobs from files. In
- * general, records correspond to rows and fields correspond to columns. Thus
- * the TableRecord class corresponds to a vector of row entries and
- * TableField class corresponds to a specific entry of the table for a given
- * record. Isis3 Table objects are record based, N records in a table. Each
- * record will have the same number of fields, F. The fields can be of
- * different types including Integer, Double, Text, and Real. The class
- * uses PVL to store the structure of the table N, F, and Field types and
+ * This class can create new Tables or read table blobs from files. In
+ * general, records correspond to rows and fields correspond to columns. Thus
+ * the TableRecord class corresponds to a vector of row entries and
+ * TableField class corresponds to a specific entry of the table for a given
+ * record. Isis Table objects are record based, N records in a table. Each
+ * record will have the same number of fields, F. The fields can be of
+ * different types including Integer, Double, Text, and Real. The class
+ * uses PVL to store the structure of the table N, F, and Field types and
* binary to store the table data.
- *
+ *
* See the classes TableRecord and TableField for more information.
*
* If you would like to see Table being used in implementation, see histats.cpp
@@ -71,19 +71,19 @@ namespace Isis {
* operator+=(record) that verifies that the record sizes match.
* References #1178
* @history 2018-08-13 Summer Stapleton - Added a default constructor for logic relating to the
- * overhaul of the mosaic tracking now being handled in a separate
+ * overhaul of the mosaic tracking now being handled in a separate
* tracking cube.
*/
class Table : public Isis::Blob {
public:
- /**
- *
- */
- enum Association {
- None,
- Samples,
- Lines,
- Bands
+ /**
+ *
+ */
+ enum Association {
+ None,
+ Samples,
+ Lines,
+ Bands
};
// Constructors and Destructors
@@ -98,7 +98,7 @@ namespace Isis {
~Table();
-
+
friend std::istream&operator>>(std::istream &is, Table &table);
friend std::ostream&operator<<(std::ostream &os, Table &table);
@@ -146,4 +146,3 @@ namespace Isis {
};
#endif
-
diff --git a/isis/src/base/objs/TableField/TableField.h b/isis/src/base/objs/TableField/TableField.h
index 37d7c922cb..b75db0e50c 100644
--- a/isis/src/base/objs/TableField/TableField.h
+++ b/isis/src/base/objs/TableField/TableField.h
@@ -29,15 +29,15 @@
namespace Isis {
class PvlGroup;
/**
- * @brief Class for storing an Isis::Table's field information.
- *
- * This class represents the field values of an Isis3 table. In Isis3, fields
- * correspond to column values. Each TableField object is a single table
- * entry for a column value at a specific row (or record) of the table.
- *
- * Be careful to note that the size of a field is the number of array values
- * for a single column entry. It is not the number of rows or records of the
- * table.
+ * @brief Class for storing an Isis::Table's field information.
+ *
+ * This class represents the field values of an Isis table. In Isis3, fields
+ * correspond to column values. Each TableField object is a single table
+ * entry for a column value at a specific row (or record) of the table.
+ *
+ * Be careful to note that the size of a field is the number of array values
+ * for a single column entry. It is not the number of rows or records of the
+ * table.
*
* @ingroup LowLevelCubeIO
*
@@ -57,18 +57,18 @@ namespace Isis {
* field is set to a string value that is longer than the number of
* allowed bytes for the field. References #700.
* @history 2015-10-04 Jeannie Backer Improved coding standards. References #1178
- *
+ *
* @todo Finish class documentation
*/
class TableField {
public:
/**
- * This enum describes the value type for the TableField.
+ * This enum describes the value type for the TableField.
*/
- enum Type {
+ enum Type {
Integer, //!< The values in the field are 4 byte integers.
- Double, //!< The values in the field are 8 byte doubles.
- Text, /**< The values in the field are text strings with 1 byte
+ Double, //!< The values in the field are 8 byte doubles.
+ Text, /**< The values in the field are text strings with 1 byte
per character.*/
Real //!< The values in the field are 4 byte reals or floats.
};
@@ -78,7 +78,7 @@ namespace Isis {
TableField(PvlGroup &field);
~TableField();
-
+
QString name() const;
Type type() const;
bool isInteger() const;
@@ -113,7 +113,7 @@ namespace Isis {
private:
QString m_name; //!< Field name
Type m_type; //!< Field value type
- int m_size; /**< Field size. This is the number of
+ int m_size; /**< Field size. This is the number of
values per field entry of the table.*/
int m_bytes; //!< Number of bytes in field
std::vector<int> m_ivalues; /**< Vector containing integer field values.
diff --git a/isis/src/base/objs/Target/Target.h b/isis/src/base/objs/Target/Target.h
index 1cd4105970..4b5de41616 100644
--- a/isis/src/base/objs/Target/Target.h
+++ b/isis/src/base/objs/Target/Target.h
@@ -42,7 +42,7 @@ namespace Isis {
class Spice;
/**
- * This class is used to create and store valid Isis3 targets.
+ * This class is used to create and store valid Isis targets.
*
* @author 2012-03-20 Debbie A. Cook
*
@@ -50,10 +50,10 @@ namespace Isis {
* @history 2015-07-31 Kristin Berry - Added additional NaifStatus::CheckErrors() to see if any
* NAIF errors were signaled. References #2248.
* @history 2016-05-18 Jeannie Backer - Moved TProjection::TargetRadii() methods to
- * Target::radiiGroup() methods. Added overloaded
- * lookupNaifBodyCode(QString) to have a generic static method that
- * takes the TargetName as an input parameter. Added overloaded
- * lookupNaifBodyCode(Pvl) to use the label passed into Target's
+ * Target::radiiGroup() methods. Added overloaded
+ * lookupNaifBodyCode(QString) to have a generic static method that
+ * takes the TargetName as an input parameter. Added overloaded
+ * lookupNaifBodyCode(Pvl) to use the label passed into Target's
* constructor to find the code if not found using
* the name or spice pointer provided. References #3934.
* @history 2016-05-18 Jeannie Backer - Removed unused lookupNaifBodyCode() method that takes no
@@ -66,7 +66,7 @@ namespace Isis {
* up the Naif body code instead of the Naif body frame code. We may
* need to add a method to look up the Naif body frame code as well.
* Also moved the try loop attempting to find the radii tagged with the
- * Naif body code ahead of the try loop that attempts to find the radii
+ * Naif body code ahead of the try loop that attempts to find the radii
* tagged with the body frame code in the method radiiGroup. Fixed
* any mention of Naif body frame code that should be Naif body code.
* These are not the same. Naif tags the body radii keyword with the
diff --git a/isis/src/base/objs/XmlToPvlTranslationManager/XmlToPvlTranslationManager.cpp b/isis/src/base/objs/XmlToPvlTranslationManager/XmlToPvlTranslationManager.cpp
index 052ccc2c14..ecca6fcb1f 100644
--- a/isis/src/base/objs/XmlToPvlTranslationManager/XmlToPvlTranslationManager.cpp
+++ b/isis/src/base/objs/XmlToPvlTranslationManager/XmlToPvlTranslationManager.cpp
@@ -142,15 +142,15 @@ namespace Isis {
/**
- * Returns a translated value. The translation group name is
- * used to find the input group, keyword, default and
- * tranlations in the translation table. If the keyword does not
- * exist in the input label, the input default if available will
- * be used as the input value. This input value is then used to
- * search all of the translations. If a match is found the
- * translated value is returned.
+ * Returns a translated value. The translation group name is
+ * used to find the input group, keyword, default and
+ * tranlations in the translation table. If the keyword does not
+ * exist in the input label, the input default if available will
+ * be used as the input value. This input value is then used to
+ * search all of the translations. If a match is found the
+ * translated value is returned.
*
- * @param translationGroupName The name of the PVL translation
+ * @param translationGroupName The name of the PVL translation
* group used to identify the
* input/output keywords to be
* translated. Often, this is the
@@ -158,8 +158,8 @@ namespace Isis {
*
* @param index The index into the input keyword array. Defaults to 0
*
- * @return @b QString The translated output value to be
- * placed in the ISIS3 cube label.
+ * @return @b QString The translated output value to be
+ * placed in the ISIS cube label.
*
* @throws IException::Unknown "Failed to translate output value."
* @throws IException::Unknown "Cannot translate value. Xml files can only
@@ -175,7 +175,7 @@ namespace Isis {
* @throws IException::Unknown "Could not find an input value or default value."
* @throws IException::Unknown "Input element does not have the named attribute."
*/
- QString XmlToPvlTranslationManager::Translate(QString translationGroupName,
+ QString XmlToPvlTranslationManager::Translate(QString translationGroupName,
int index) {
try {
if (index != 0) {
@@ -245,7 +245,7 @@ namespace Isis {
cout << endl << "Finding input element:" << endl << endl;
cout << inputParentElement.tagName() << endl;
}
- // traverse the input position path
+ // traverse the input position path
Pvl::ConstPvlKeywordIterator it = transGroup.findKeyword("InputPosition",
transGroup.begin(),
transGroup.end());
@@ -254,7 +254,7 @@ namespace Isis {
QString childName;
while(it != transGroup.end()) {
const PvlKeyword &inputPosition = *it;
- inputParentElement = oldInputParentElement;
+ inputParentElement = oldInputParentElement;
for (int i = 0; i < inputPosition.size(); i++) {
childName = inputPosition[i];
@@ -270,9 +270,9 @@ namespace Isis {
if (!inputParentElement.isNull()) {
break;
}
- it = transGroup.findKeyword("InputPosition", it + 1, transGroup.end());
+ it = transGroup.findKeyword("InputPosition", it + 1, transGroup.end());
}
-
+
if (inputParentElement.isNull()) {
if (hasInputDefault(translationGroupName)) {
if (isDebug) {
@@ -372,9 +372,9 @@ namespace Isis {
* dependencies are requirements on the values of attributes of the element
* and/or the values of sibling elements. The dependencies are specified by
* strings that are formatted as follows
- * <code>[tag/att]\@[tagName/attName]|[value]</code> or
- * <code>[tagName/attName]|[value]</code>
- *
+ * <code>[tag/att]\@[tagName/attName]|[value]</code> or
+ * <code>[tagName/attName]|[value]</code>
+ *
* @param element The element to check dependencies on.
* @param dependencies A multi-valued keyword were every entry specifies a
* requirement upon either an attribute of the element or
@@ -461,7 +461,7 @@ namespace Isis {
* @param inputLabel The input label file to be translated.
* @param outputLabel The output translated Pvl.
*/
- void XmlToPvlTranslationManager::Auto(FileName &inputLabel,
+ void XmlToPvlTranslationManager::Auto(FileName &inputLabel,
Pvl &outputLabel) {
parseFile(inputLabel);
Auto(outputLabel);
diff --git a/isis/src/cassini/apps/ciss2isis/ciss2isis.xml b/isis/src/cassini/apps/ciss2isis/ciss2isis.xml
index 5d77ef85ec..19d81396d4 100644
--- a/isis/src/cassini/apps/ciss2isis/ciss2isis.xml
+++ b/isis/src/cassini/apps/ciss2isis/ciss2isis.xml
@@ -109,14 +109,14 @@
Use this parameter to select the Cassini PDS Image Label. The file must
contain PDS labels for Cassini ISS data. This can be a detached label file with
pointer to the cube data.
-
- <strong>NOTE:</strong> While we support most Cassini ISS Targets for ingestion, some of
- the smaller bodies do not currently have support for parameters such as their body radii.
- Therefore, spiceinit will fail when run on cubes created with these targets. The current
+
+ <strong>NOTE:</strong> While we support most Cassini ISS Targets for ingestion, some of
+ the smaller bodies do not currently have support for parameters such as their body radii.
+ Therefore, spiceinit will fail when run on cubes created with these targets. The current
list of these target bodies is : ANTHE, AEGAEON, BERGELMIR, BESTLA, ERRIAPO, ERRIAPUS,
FORNJOT, GREIP, HATI, HYROKKIN, IJIRAQ, JARNSAXA, K07S4, KARI, KIVIUQ, LOGE, MUNDILFARI,
NARVI, PAALIAQ, SIARNAQ, SKADI, SKATHI, SKOLL, SURTUR, SUTTUNG, SUTTUNGR, TARVOS, TARQEQ,
- THRYM, THRYMR, YMIR.
+ THRYM, THRYMR, YMIR.
</description>
<filter>
*.lbl *.LBL
@@ -131,7 +131,7 @@
</brief>
<description>
Use this parameter to select the output filename
-
+
<strong>NOTE:</strong> The following TARGET_NAMEs will be translated to 'Sky' in the
output cube's PVL: SKY, DARK SKY, S8_2004, S12_2004, S13_2004, S14_2004, S18_2004.
</description>
@@ -148,7 +148,7 @@
Using ciss2isis
</brief>
<description>
- The use of ciss2isis to ingest PDS images and output Isis3 cubes.
+ The use of ciss2isis to ingest PDS images and output Isis cubes.
</description>
<terminalInterface>
<commandLine>
@@ -156,7 +156,7 @@
to= N1472853667_1.cub
</commandLine>
<description>
- This example shows the use of ciss2isis create an Isis3 cube from a PDS image.
+ This example shows the use of ciss2isis create an Isis cube from a PDS image.
</description>
</terminalInterface>
@@ -203,7 +203,7 @@
Final output image after the conversion
</brief>
<description>
- Converts from PDS format to a Isis3 cube.
+ Converts from PDS format to a Isis cube.
</description>
<thumbnail caption= "The cube image after conversion"
src="assets/thumbs/N1472853667_1.jpg" width="200" height="200"/>
diff --git a/isis/src/cassini/apps/vims2isis/vims2isis.xml b/isis/src/cassini/apps/vims2isis/vims2isis.xml
index 46f8a118ee..99bd55553a 100644
--- a/isis/src/cassini/apps/vims2isis/vims2isis.xml
+++ b/isis/src/cassini/apps/vims2isis/vims2isis.xml
@@ -3,12 +3,12 @@
<application name="vims2isis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Converts Vims images to Isis 3 format
+ Converts Vims images to Isis format
</brief>
<description>
- This program takes the BIL formatted vims cubes and translates them into Isis 3
- standard BSQ format. It also separates them into two cubes, one containing the
+ This program takes the BIL formatted vims cubes and translates them into Isis
+ standard BSQ format. It also separates them into two cubes, one containing the
data from the Infrared camera, and one containing the data from the visual camera.
</description>
@@ -39,7 +39,7 @@
Checks if input file is rdr.
</change>
<change name="Steven Lambright" date="2008-05-13">
- Removed references to CubeInfo
+ Removed references to CubeInfo
</change>
<change name="Steven Lambright" date="2008-07-14">
Added support for more raw data
@@ -50,18 +50,18 @@
</change>
<change name="Steven Lambright" date="2009-08-21">
Saturation values are now set when present and if IR or VIS
- was turned off then files will not be imported for those channels.
+ was turned off then files will not be imported for those channels.
</change>
- <change name="Sharmila Prasad" date="2009-09-10">
- Added the ability to translate Vims label for both IR and VIS
+ <change name="Sharmila Prasad" date="2009-09-10">
+ Added the ability to translate Vims label for both IR and VIS
cubes
</change>
<change name="Tracie Sucharski" date="2009-10-20">
Corrected indexing for SAMPLING_MODE_ID and GAIN_MODE_ID values.
</change>
<change name="Mackenzie Boyd" date="2010-01-28">
- Changed DATA_SET_ID check to be INSTRUMENT_ID check instead,
- DATA_SET_ID was too specific and wasn't allowing imports of
+ Changed DATA_SET_ID check to be INSTRUMENT_ID check instead,
+ DATA_SET_ID was too specific and wasn't allowing imports of
appropriate data.
</change>
<change name="Tracie Sucharski" date="2011-12-16">
diff --git a/isis/src/cassini/apps/vimscal/main.cpp b/isis/src/cassini/apps/vimscal/main.cpp
index 67de6008f4..13b14f7b4e 100644
--- a/isis/src/cassini/apps/vimscal/main.cpp
+++ b/isis/src/cassini/apps/vimscal/main.cpp
@@ -568,7 +568,7 @@ void calculateSpecificEnergy(Cube *icube) {
else {
//Discrepancies between the VIMS and Spacecraft clock necessitated a
- //conversion multiplier, which is in the USGS: ISIS3 version of vimscal
+ //conversion multiplier, which is in the USGS: ISIS version of vimscal
//but was not part of the University of Arizona pipeline. Below is the
//text describing this problem:
/**
diff --git a/isis/src/cassini/apps/vimscal/makecubes.py b/isis/src/cassini/apps/vimscal/makecubes.py
index 007089e898..39a5429dc0 100644
--- a/isis/src/cassini/apps/vimscal/makecubes.py
+++ b/isis/src/cassini/apps/vimscal/makecubes.py
@@ -8,7 +8,7 @@ import numpy as np
Author: 2016-09-09 Tyler Wilson
History:
-Description: This script creates calibration cubes for use
+Description: This script creates calibration cubes for use
by the VIMS calibration program vimscal.
Input: Calibration text files.
@@ -35,9 +35,9 @@ example_usage = "Example: python makecubes.py /home/tjwilson/cal_files/RC19-mul
def cleanup(filepath):
"""Cleaner function which attempts to remove temporary cubes and cube lists.
-
+
Args:
- filepath: The path to the directory containing the filewe wish to remove.
+ filepath: The path to the directory containing the filewe wish to remove.
Raises: A general exception if anything goes wrong. The script exits at that point.
"""
@@ -58,10 +58,10 @@ except IndexError:
print("Please enter a valid path to the calibration files.")
print(usage)
sys.exit(example_usage)
-
+
try:
files = os.listdir(sys.argv[1])
-except OSError:
+except OSError:
print("There is no directory named: "+datapath)
print(usage)
sys.exit(example_usage)
@@ -81,8 +81,8 @@ match = re.search(r'[0-9]{4}',version)
if (match == None):
sys.exit("Please enter a 4 digit version number such as: 0001")
-'''
-try:
+'''
+try:
precision=sys.argv[4]
except IndexError:
print("Please enter an integer value for the number of decimal places in the calibration files.")
@@ -92,7 +92,7 @@ except IndexError:
precision=10
filtered = []
-#This is to ensure that we are only grabbing the txt calibration files and not
+#This is to ensure that we are only grabbing the txt calibration files and not
#anything else which might be in the directory.
for f in files:
if (f.startswith(prefix) and f.endswith('.txt') ):
@@ -105,14 +105,14 @@ if ( len(filtered) == 0):
for datafile in filtered:
- try:
+ try:
#datafile without it's extension
datafilename=os.path.splitext(datafile)[0]
if (datafilename.find("-") > 0 ):
datafilename.replace("-",".")
#import the datafile into a matrix
data = np.genfromtxt(datapath+"/"+datafile)
- bandvals = data[:,1]
+ bandvals = data[:,1]
args3="samples=64"
args4 ="lines=64"
args5="bands=1"
@@ -130,20 +130,20 @@ for datafile in filtered:
fstring = format_string.format(float(band))
args2="value="+fstring
#print(fstring)
- try:
+ try:
p=subprocess.Popen([cmd,args1,args2,args3,args4,args5],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
except OSError:
- sys.exit("Please set a valid ISIS3 version before executing this script.")
+ sys.exit("Please set a valid ISIS version before executing this script.")
except:
- sys.exit("Something went wrong. Please set a valid ISIS3 version before executing this script.")
+ sys.exit("Something went wrong. Please set a valid ISIS version before executing this script.")
out,err = p.communicate()
if (str (err) ):
print(err)
-
+
cubelist.write(tempcubepath+"\n")
print(tempcubepath)
- i = i+1
-
+ i = i+1
+
cubelist.close()
#Stack the temp cubes (there are 352 of them) into the calibration cube using cubeit
cmd = "cubeit"
@@ -160,5 +160,3 @@ for datafile in filtered:
cleanup(datapath)
-
-
diff --git a/isis/src/clementine/apps/clem2isis/clem2isis.xml b/isis/src/clementine/apps/clem2isis/clem2isis.xml
index c7cff98397..41eef333ca 100755
--- a/isis/src/clementine/apps/clem2isis/clem2isis.xml
+++ b/isis/src/clementine/apps/clem2isis/clem2isis.xml
@@ -10,7 +10,7 @@
images are decompressed from Clementine 8-bit into a pixel type selected by
the user.
</description>
-
+
<category>
<missionItem>Clementine</missionItem>
</category>
@@ -62,18 +62,18 @@
Checks if input file is rdr.
</change>
<change name="Steven Lambright" date="2008-05-13">
- Removed references to CubeInfo
+ Removed references to CubeInfo
</change>
<change name="Tracie Sucharski" date="2009-02-17">
Added BandBin keywords Center and Width to clementine.trn and
alter the output values only if the filter is not the F filter.
</change>
<change name="Mackenzie Boyd" date="2009-05-26">
- Modified label transfer to include MCP_Gain_Mode_ID when images is from
+ Modified label transfer to include MCP_Gain_Mode_ID when images is from
HIRES camera.
</change>
<change name="Jeff Anderson and Victor Silva" date="2017-12-27">
- Modified Kernels group to support filter dependent focal length and optical distortion
+ Modified Kernels group to support filter dependent focal length and optical distortion
for UVVIS camera.
</change>
<change name="Jeannie Backer" date="2018-09-01">
@@ -115,7 +115,7 @@
Using clem2isis
</brief>
<description>
- The use of clem2isis to ingest PDS images and output Isis3 cubes
+ The use of clem2isis to ingest PDS images and output Isis cubes
</description>
<terminalInterface>
<commandLine>
@@ -123,11 +123,11 @@
to=lne4885r.cub
</commandLine>
<description>
- This example shows the use of clem2isis create an Isis3 cube from a PDS
+ This example shows the use of clem2isis create an Isis cube from a PDS
image.
</description>
</terminalInterface>
-
+
<guiInterfaces>
<guiInterface>
<image width="448" height="550" src="assets/images/clem2isisGUI.jpg">
@@ -154,14 +154,14 @@
<parameterName>FROM</parameterName>
</dataFile>
</dataFiles>
-
+
<outputImages>
<image width="491" height="492" src="assets/images/lne4885r.jpg">
<brief>
Final output image after the conversion
</brief>
<description>
- Converts from PDS format to a Isis3 cube.
+ Converts from PDS format to a Isis cube.
</description>
<thumbnail caption= "The cube image after conversion"
src="assets/thumbs/lne4885r.jpg" width="200" height="200"/>
diff --git a/isis/src/clipper/apps/eis2isis/main.cpp b/isis/src/clipper/apps/eis2isis/main.cpp
index 043fd20426..3eaa4e11a3 100644
--- a/isis/src/clipper/apps/eis2isis/main.cpp
+++ b/isis/src/clipper/apps/eis2isis/main.cpp
@@ -31,13 +31,13 @@ void translateCoreInfo(XmlToPvlTranslationManager labelXlater, ProcessImport &im
void translateEISLabels(FileName &inputLabel, Pvl *outputLabel);
void translateLabels(FileName &inputLabel, Pvl *outputLabel, FileName transFile);
Table normalizeTimeTable(const FileName &file, const QString &tableName, int numLines);
-Table createTable(const FileName &file, const QString &tableName, int numLines);
+Table createTable(const FileName &file, const QString &tableName, int numLines);
void modifyNacRollingShutterLabel(Cube *outputCube, FileName xmlFileName, OriginalXmlLabel xmlLabel);
void IsisMain() {
UserInterface &ui = Application::GetUserInterface();
FileName xmlFileName = ui.GetFileName("FROM");
-
+
try {
ProcessImport p;
translateCoreInfo(xmlFileName, p);
@@ -50,24 +50,24 @@ void IsisMain() {
".dat file for this XML exists and is located in the same directory.";
throw IException(IException::User, msg, _FILEINFO_);
}
-
+
Cube *outputCube = p.SetOutputCube("TO");
Pvl *outputLabel = outputCube->label();
-
+
translateEISLabels(xmlFileName, outputLabel);
-
+
FileName outputCubeFileName(ui.GetFileName("TO"));
OriginalXmlLabel xmlLabel;
xmlLabel.readFromXmlFile(xmlFileName);
p.StartProcess();
-
+
// The ClipperNacRollingShutterCamera requires extra information for instantiating a camera.
if (outputLabel->findKeyword("InstrumentId", PvlObject::Traverse)[0] == "EIS-NAC-RS") {
modifyNacRollingShutterLabel(outputCube, xmlFileName, xmlLabel);
}
-
+
// Write out original label before closing the cube
outputCube->write(xmlLabel);
@@ -100,8 +100,8 @@ void IsisMain() {
throw IException(IException::Unknown, msg, _FILEINFO_);
}
- outputCube->putGroup(kerns);
-
+ outputCube->putGroup(kerns);
+
p.EndProcess();
}
catch (IException &e) {
@@ -169,7 +169,7 @@ void translateCoreInfo(XmlToPvlTranslationManager labelXlater, ProcessImport &im
importer.SetBase(toDouble(str));
str = labelXlater.Translate("CoreMultiplier");
importer.SetMultiplier(toDouble(str));
-
+
// These are hard-coded to ISIS values, but the team may choose to set them
// differently and include them in the imported xml file in the future
importer.SetNull(Isis::NULL4, Isis::NULL4);
@@ -187,7 +187,7 @@ void translateCoreInfo(XmlToPvlTranslationManager labelXlater, ProcessImport &im
* @param Pvl outputCube Pointer to the output cube where ISIS labels will be added and updated.
*/
void translateEISLabels(FileName &inputLabel, Pvl *outputLabel) {
-
+
// Translate labels for each translation file needed
translateLabels(inputLabel, outputLabel, FileName("$ISISROOT/appdata/translations/ClipperEisInstrument.trn"));
}
@@ -216,24 +216,24 @@ void translateLabels(FileName &inputLabel, Pvl *outputLabel, FileName transFile)
* @param FileName xmlFileName File name of the original xml label
*/
void modifyNacRollingShutterLabel(Cube *outputCube, FileName xmlFileName, OriginalXmlLabel xmlLabel) {
-
+
UserInterface &ui = Application::GetUserInterface();
-
+
Pvl *outputLabel = outputCube->label();
-
+
// Set a default value for the JitterSampleCoefficients and the JitterLineCoefficient keywords in the Instrument group.
// These values are overwritten with a call to the jitterfit application.
PvlKeyword jitterLineCoefficients = PvlKeyword("JitterLineCoefficients", (toString(0.0)));
jitterLineCoefficients += toString(0.0);
jitterLineCoefficients += toString(0.0);
outputLabel->findGroup("Instrument", PvlObject::Traverse).addKeyword(jitterLineCoefficients);
-
+
PvlKeyword jitterSampleCoefficients = PvlKeyword("JitterSampleCoefficients", (toString(0.0)));
jitterSampleCoefficients += toString(0.0);
jitterSampleCoefficients += toString(0.0);
outputLabel->findGroup("Instrument", PvlObject::Traverse).addKeyword(jitterSampleCoefficients);
-
-
+
+
// Write the line times tables to the main EIS cube
if (ui.WasEntered("MAINREADOUT")) {
@@ -245,24 +245,24 @@ void modifyNacRollingShutterLabel(Cube *outputCube, FileName xmlFileName, Origin
outputCube->write(normalizedReadout);
}
- // Since ClipperNacRolingShutterCamera requires the "Normailized Main Readout Line
+ // Since ClipperNacRolingShutterCamera requires the "Normailized Main Readout Line
// Times" table, we are requiring that a file of lines and their times be
// provided in the MAINREADOUT parameter. It may be possible to refactor
// the camera object to be able to handle when a table does not exist and
// this will be able to be refactored to not require a line times file.
else {
QString msg = "This image appears to be a Narrow Angle Rolling Shutter Camera. "
- "You must provide the line times file associated with [" + xmlFileName.name() +
+ "You must provide the line times file associated with [" + xmlFileName.name() +
"] as the [MAINREADOUT] parameter.";
throw IException(IException::User, msg, _FILEINFO_);
}
-
- // Handle an optional checkline cube.
+
+ // Handle an optional checkline cube.
if (ui.WasEntered("FROM2")) {
FileName checklineXmlFileName = ui.GetFileName("FROM2");
if (ui.WasEntered("CHECKLINEREADOUT")) {
- // Process the checkline image to an ISIS3 cube and write the checkline tables
+ // Process the checkline image to an ISIS cube and write the checkline tables
ProcessImport p2;
translateCoreInfo(checklineXmlFileName, p2);
if (checklineXmlFileName.removeExtension()
@@ -277,12 +277,12 @@ void modifyNacRollingShutterLabel(Cube *outputCube, FileName xmlFileName, Origin
".dat file for this XML exists and is located in the same directory.";
throw IException(IException::User, msg, _FILEINFO_);
}
-
+
Cube *checklineCube = p2.SetOutputCube("TO2");
Pvl *checklineLabel = checklineCube->label();
translateEISLabels(checklineXmlFileName, checklineLabel);
-
+
OriginalXmlLabel checklineXmlLabel;
xmlLabel.readFromXmlFile(checklineXmlFileName);
p2.StartProcess();
@@ -382,34 +382,34 @@ Table normalizeTimeTable(const FileName &file, const QString &tableName, int num
/**
* Creates a table from a CSV file.
- *
+ *
* @param const FileName &file Name of the CSV file to read in
* @param const QString &tableName Name of the table to create
* @param int numLines Number of lines in the CSV file (without header)
- *
+ *
* @return Table Returns the created table.
*/
Table createTable(const FileName &file, const QString &tableName, int numLines) {
CSVReader csv(file.expanded());
-
+
// Number of lines provided must match number of rows in csv file
if (numLines != csv.rows()) {
QString msg = "Readout table [" + file.expanded() +
"] does not have the same number of lines as the image";
throw IException(IException::User, msg, _FILEINFO_);
}
-
+
// Define the fields and their types
TableField lineField("line number", TableField::Integer);
TableField timeField("time", TableField::Double);
-
+
// Add the fields to a TableRecord to define the Table
TableRecord record;
record += lineField;
record += timeField;
-
+
Table table(tableName, record);
-
+
// Grab the values from the csv and put them into the table row-by-row
for (int i = 0; i < csv.rows(); i++) {
CSVReader::CSVAxis row = csv.getRow(i);
diff --git a/isis/src/control/apps/cnet2mat/cnet2mat.xml b/isis/src/control/apps/cnet2mat/cnet2mat.xml
index 5567261354..7045ebc0b0 100644
--- a/isis/src/control/apps/cnet2mat/cnet2mat.xml
+++ b/isis/src/control/apps/cnet2mat/cnet2mat.xml
@@ -2,16 +2,16 @@
<application name="cnet2mat" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Converts an Isis3 control network file to an ISIS2 match point file.
+ Converts an Isis control network file to an ISIS2 match point file.
</brief>
<description>
<p>
- This program converts an Isis3 control network file to an ISIS2 match
+ This program converts an Isis control network file to an ISIS2 match
point file.
</p>
<p>
- The following indicates how the Isis3 MeasureType is translated to an Isis2 Class
+ The following indicates how the Isis MeasureType is translated to an Isis2 Class
<ul>
<li> Ignored measure is translated to "U" (Unmeasured)</li>
<li> Ignored point is translated to "U" (Unmeasured) for all measures</li>
@@ -33,8 +33,8 @@
<change name="Brendan George" date="2007-08-10">
Original version
</change>
- <change name="Stuart Sides" date="2008-03-12">
- Added ability to use ISIS2 keyword IMAGE_NUMBER. Fixed bug where the
+ <change name="Stuart Sides" date="2008-03-12">
+ Added ability to use ISIS2 keyword IMAGE_NUMBER. Fixed bug where the
diameter was being written as an Isis::Null when it had not been set.
</change>
<change name="Christopher Austin" date="2009-09-29">
@@ -61,12 +61,12 @@
<type>filename</type>
<fileMode>input</fileMode>
<brief>
- List of ISIS3 input cubes in the match point file.
+ List of ISIS input cubes in the match point file.
</brief>
<description>
- A text file containing one column of ISIS3 cube file names. Every file
+ A text file containing one column of ISIS cube file names. Every file
used in the match point file should be represented in this list. The
- cubes must be available for the program to open and must be in the
+ cubes must be available for the program to open and must be in the
same order as the Isis2 cubes in LIST2
</description>
<filter>
@@ -78,7 +78,7 @@
<type>filename</type>
<fileMode>input</fileMode>
<brief>
- Isis3 output control network file
+ Isis output control network file
</brief>
<description>
Use this parameter to specify the control network file containing
@@ -100,8 +100,8 @@
<description>
A text file containing one column of ISIS2 cube file names. Every file
used in the match point file should be represented in this list. The
- cubes must be available for the program to open and must be in the
- same order as the Isis3 cubes in LIST3
+ cubes must be available for the program to open and must be in the
+ same order as the Isis cubes in LIST3
</description>
<filter>
*.lis
diff --git a/isis/src/control/apps/cnetadd/cnetadd.xml b/isis/src/control/apps/cnetadd/cnetadd.xml
index 22f625b17a..3b9fbc1144 100644
--- a/isis/src/control/apps/cnetadd/cnetadd.xml
+++ b/isis/src/control/apps/cnetadd/cnetadd.xml
@@ -3,137 +3,137 @@
<application name="cnetadd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Adds Level 1 or Level 2 images to an existing Isis3 Control Net file.
+ Adds Level 1 or Level 2 images to an existing Isis Control Net file.
</brief>
<description>
<p>
- This application adds Level 1 and Level 2 images to an existing ISIS3
- <def>Control Net</def> file. It takes in an input Control Net CNET and a
- list file ADDLIST which contains filenames of all the images to be
- added to the Control Net. The application adds the images to the
- network depending on the Retrieval options. The resulting output
- Control Net is placed in the user specified output file ONET. All other
- Control Net configurations remain unchanged.
+ This application adds Level 1 and Level 2 images to an existing ISIS
+ <def>Control Net</def> file. It takes in an input Control Net CNET and a
+ list file ADDLIST which contains filenames of all the images to be
+ added to the Control Net. The application adds the images to the
+ network depending on the Retrieval options. The resulting output
+ Control Net is placed in the user specified output file ONET. All other
+ Control Net configurations remain unchanged.
</p>
<p>
- FROMLIST contains the list of all the images that are part of the input
- Control Net. This input parameter is optional with Control Nets
- generated by applications such as "seedgrid" which will contain only
- lat/lon but no other <def link="Control Measure">Control Measures</def>.
- However, FROMLIST is required if the RETRIEVAL option is REFERENCE
- (described herein) where the lat/lon's are obtained from the FROMLIST
+ FROMLIST contains the list of all the images that are part of the input
+ Control Net. This input parameter is optional with Control Nets
+ generated by applications such as "seedgrid" which will contain only
+ lat/lon but no other <def link="Control Measure">Control Measures</def>.
+ However, FROMLIST is required if the RETRIEVAL option is REFERENCE
+ (described herein) where the lat/lon's are obtained from the FROMLIST
<def link="Cube">cubes</def>.
</p>
<p>
- The application checks each image in the ADDLIST for all the <def link="Control Point">Control
- Points</def> in the input Control Network as to whether it can be added
- to any given Control Point. If the image already exists for the
- Control Point, it is skipped. Otherwise, it is checked to see if the
- Control Point's location is within the latitude/longitude (lat/lon)
+ The application checks each image in the ADDLIST for all the <def link="Control Point">Control
+ Points</def> in the input Control Network as to whether it can be added
+ to any given Control Point. If the image already exists for the
+ Control Point, it is skipped. Otherwise, it is checked to see if the
+ Control Point's location is within the latitude/longitude (lat/lon)
boundaries of the image, and adds the image measures if it is.
</p>
<p>
- TOLIST is an optional output list which contains the list of all images
- in the output Control Net. If TOLIST is defined then FROMLIST is
- required to make the output list complete. Otherwise the TOLIST will
+ TOLIST is an optional output list which contains the list of all images
+ in the output Control Net. If TOLIST is defined then FROMLIST is
+ required to make the output list complete. Otherwise the TOLIST will
contain only the new images from ADDLIST added to the Control Net.
</p>
<p>
- The images in the FROMLIST and ADDLIST must be available for the program
- to open. All the PVL log information such as duplicate <def link="Serial Number">serial numbers</def>
- common to FROMLIST and ADDLIST, images added, images omitted and Points
+ The images in the FROMLIST and ADDLIST must be available for the program
+ to open. All the PVL log information such as duplicate <def link="Serial Number">serial numbers</def>
+ common to FROMLIST and ADDLIST, images added, images omitted and Points
modified are placed in LOG file if specified.
</p>
<p>
- MODIFIEDPOINTS is an optional output parameter that allows the user to
- create a list of the modified points in the final Control Net.
+ MODIFIEDPOINTS is an optional output parameter that allows the user to
+ create a list of the modified points in the final Control Net.
</p>
- <p>
- The program has four additional Options or parameters: POLYGON,
- RETRIEVAL, EXTRACT, and DEFILE. If the POLYGON option is enabled, this
- optimization will prune points that fall outside the latitude/longitude
- bounding box of the polygon for the image being added. By performing
- this check up front, no expensive camera calculations to find a Point's
- location on an image will be performed for points that fail this test.
- In most cases, the vast majority of points fall outside of any given
- image during the adding process, so performance gains can be orders of
- magnitude. IMPORTANT NOTE: this optimization requires that all images
- have had "footprintinit" run beforehand in order to find the image
+ <p>
+ The program has four additional Options or parameters: POLYGON,
+ RETRIEVAL, EXTRACT, and DEFILE. If the POLYGON option is enabled, this
+ optimization will prune points that fall outside the latitude/longitude
+ bounding box of the polygon for the image being added. By performing
+ this check up front, no expensive camera calculations to find a Point's
+ location on an image will be performed for points that fail this test.
+ In most cases, the vast majority of points fall outside of any given
+ image during the adding process, so performance gains can be orders of
+ magnitude. IMPORTANT NOTE: this optimization requires that all images
+ have had "footprintinit" run beforehand in order to find the image
polygons.
</p>
- <p>
- The Control Point's location (lat/lon) is retrieved from either the
- REFERENCE (default) or POINT preference of the RETRIEVAL parameter. If
- REFERENCE is chosen, the lat/lon is calculated from the reference camera
- information of the corresponding images in FROMLIST. If POINT is chosen,
- the lat/lon is taken directly from the information attached to the
- Control Point. The lat/lon is then used to get the Line and Sample of
- the point on the image. IMPORTANT NOTE: the POINT option is meant for
- Control Networks built using "seedgrid" because this program attaches
- the lat/lon information to the points. If you use this option on
- networks with Control Points that do not have this information, those
+ <p>
+ The Control Point's location (lat/lon) is retrieved from either the
+ REFERENCE (default) or POINT preference of the RETRIEVAL parameter. If
+ REFERENCE is chosen, the lat/lon is calculated from the reference camera
+ information of the corresponding images in FROMLIST. If POINT is chosen,
+ the lat/lon is taken directly from the information attached to the
+ Control Point. The lat/lon is then used to get the Line and Sample of
+ the point on the image. IMPORTANT NOTE: the POINT option is meant for
+ Control Networks built using "seedgrid" because this program attaches
+ the lat/lon information to the points. If you use this option on
+ networks with Control Points that do not have this information, those
points will be ignored.
</p>
<p>
- The EXTRACT parameter allows the user to define what goes into the
- ONET. If ALL (default)is specified, then the entire input Control Net
- with the modified points will be written out to the output Control Net.
- If MODIFIED is specified, then only the modified Points(points which has
- the images from the ADDLIST added to it) will be extracted to the
+ The EXTRACT parameter allows the user to define what goes into the
+ ONET. If ALL (default)is specified, then the entire input Control Net
+ with the modified points will be written out to the output Control Net.
+ If MODIFIED is specified, then only the modified Points(points which has
+ the images from the ADDLIST added to it) will be extracted to the
output.
</p>
<p>
- DEFFILE could be specified to validate measures (images). If the image
- being added to a particular point fails the validation test then the
- Measure is set to be Ignored. Following are the different options which
- could be specified in the DEFFILE.The application will validate the
- measure for specified properties. These properties are optional and the
- DEFFILE can have different combinations of these properties. The DEFFILE
- should be in the format shown below:
+ DEFFILE could be specified to validate measures (images). If the image
+ being added to a particular point fails the validation test then the
+ Measure is set to be Ignored. Following are the different options which
+ could be specified in the DEFFILE.The application will validate the
+ measure for specified properties. These properties are optional and the
+ DEFFILE can have different combinations of these properties. The DEFFILE
+ should be in the format shown below:
</p>
<p><div style="font-family: Arial, Helvetica, Geneva, sans-serif; font-size:95%">
<table border="0"><tr><td width="40"></td><td>
<table border="0" cellspacing="0" cellpadding="0">
<tr><th colspan="3" align="left">Group=ValidMeasure </th></tr>
- <tr><td width="25"></td><td align="left">MinDN
+ <tr><td width="25"></td><td align="left">MinDN
</td>
- <td>= Default is Min DN value (depends on the pixel size of the
+ <td>= Default is Min DN value (depends on the pixel size of the
image)
</td></tr>
<tr><td></td><td align="left">MaxDN </td>
- <td>= Default is Max DN value (depends on the pixel size of the
+ <td>= Default is Max DN value (depends on the pixel size of the
image)
- </td></tr>
+ </td></tr>
<tr><td></td><td align="left">MinEmission </td>
<td>= 0 (Default)</td></tr>
<tr><td></td><td align="left">MaxEmission </td>
- <td>= 135 (Default) </td></tr>
+ <td>= 135 (Default) </td></tr>
<tr><td></td><td align="left">MinIncidence </td>
<td>= 0 (Default) </td></tr>
<tr><td></td><td align="left">MaxIncidence </td>
- <td>= 135 (Default) </td></tr>
+ <td>= 135 (Default) </td></tr>
<tr><td></td><td align="left">MinResolution </td>
<td>= 0 (Default) </td></tr>
<tr><td></td><td align="left">MaxResolution </td>
- <td>= Maximum integer value</td></tr>
+ <td>= Maximum integer value</td></tr>
<tr><td></td><td align="left">PixelsFromEdge</td>
- <td>= 0 (Default) OR</td></tr>
+ <td>= 0 (Default) OR</td></tr>
<tr><td></td><td align="left">MetersFromEdge</td>
- <td>= 0 (Default) </td></tr>
- <tr><th colspan="3" align="left">EndGroup</th><td></td></tr>
+ <td>= 0 (Default) </td></tr>
+ <tr><th colspan="3" align="left">EndGroup</th><td></td></tr>
</table></td></tr>
</table>
</div>
<br/>
</p>
<p>
- Measures are added if a Point is locked. But if the Point is locked and
- <def>Apriori</def> source is "AverageOfMeasures" then the measures are not
- added to the Control Point. This is because the Point being locked, it
- cannot be be updated for lat/lon values, so newly added measures did not
- contribute to the average that had been previously computed for at the
+ Measures are added if a Point is locked. But if the Point is locked and
+ <def>Apriori</def> source is "AverageOfMeasures" then the measures are not
+ added to the Control Point. This is because the Point being locked, it
+ cannot be be updated for lat/lon values, so newly added measures did not
+ contribute to the average that had been previously computed for at the
point level.
</p>
</description>
@@ -155,19 +155,19 @@
Fixed an error with not catching the failed ground range setting.
</change>
<change name="Travis Addair" date="2009-08-27">
- Added radio button allowing user to fill a skeleton Control Network (no
- Control measures) generated by the seedgrid application so long as it
- contains a latitude/longitude for each Control point. This list of files
- to add has also had its parameter name changed from FROMLIST2 to ADDLIST
+ Added radio button allowing user to fill a skeleton Control Network (no
+ Control measures) generated by the seedgrid application so long as it
+ contains a latitude/longitude for each Control point. This list of files
+ to add has also had its parameter name changed from FROMLIST2 to ADDLIST
for clarity.
</change>
<change name="Travis Addair" date="2009-09-02">
- When adding measures to a Network generated by the seedgrid application,
- the Ignore keyword for a Control Point is now set to false if the Point
+ When adding measures to a Network generated by the seedgrid application,
+ the Ignore keyword for a Control Point is now set to false if the Point
has at least two measures.
</change>
<change name="Travis Addair" date="2009-09-04">
- A sorted list of Control points that were modified will now be put into
+ A sorted list of Control points that were modified will now be put into
the log file.
</change>
<change name="Christopher Austin" date="2010-04-07">
@@ -189,7 +189,7 @@
Reset Apriori values if Apriori source is AvgOfMeasures
</change>
<change name="Sharmila Prasad" date="2010-10-28">
- Do not add measures if the Control Point is locked and Apriori source is
+ Do not add measures if the Control Point is locked and Apriori source is
"AverageOfMeasures".
</change>
<change name="Christopher Austin" date="2010-11-19">
@@ -219,11 +219,11 @@
TOLIST.
</change>
<change name="Sharmila Prasad" date="2011-09-29">
- Updated Documentation, moved output file MODIFIEDPOINTS to output file
- group, changed group name Retrieval options to options and added new test
+ Updated Documentation, moved output file MODIFIEDPOINTS to output file
+ group, changed group name Retrieval options to options and added new test
Polygon to test the parameter POLYGON.
</change>
- <change name="Jac Shinaman, Janet Richie" date="2011-09-29">Reviewed,
+ <change name="Jac Shinaman, Janet Richie" date="2011-09-29">Reviewed,
Edited the Documentation and the GUI display
</change>
<change name="Debbie A. Cook" date="2012-02-17">
@@ -244,17 +244,17 @@
<type>filename</type>
<fileMode>input</fileMode>
<brief>
- List of ISIS3 input cubes in the Control Net.
+ List of ISIS input cubes in the Control Net.
</brief>
<description>
- FROMLIST is a text file that contains the list of all the images
- that are part of the input Control Net. Every file used in the
- Control Net file should be represented in this list. This input
- parameter is optional as Control Net from applications such as
- seedgrid will have only Control points but no Control Measures. FROMLIST
- is required if the Retrieval option is REFERENCE which is the default and
+ FROMLIST is a text file that contains the list of all the images
+ that are part of the input Control Net. Every file used in the
+ Control Net file should be represented in this list. This input
+ parameter is optional as Control Net from applications such as
+ seedgrid will have only Control points but no Control Measures. FROMLIST
+ is required if the Retrieval option is REFERENCE which is the default and
also if TOLIST is specified.
-
+
The cubes must be available for the program to open.
</description>
<filter>
@@ -267,25 +267,25 @@
<type>filename</type>
<fileMode>input</fileMode>
<brief>
- ISIS3 existing Control Net file
+ ISIS existing Control Net file
</brief>
<description>
- This parameter specifies the input Control Net file to which the
- images are to be added.
- </description>
+ This parameter specifies the input Control Net file to which the
+ images are to be added.
+ </description>
<filter>
*.net
</filter>
</parameter>
-
+
<parameter name="ADDLIST">
- <type>filename</type>
+ <type>filename</type>
<fileMode>input</fileMode>
<brief>
- List of ISIS3 input cubes to be added to the Control Net.
+ List of ISIS input cubes to be added to the Control Net.
</brief>
<description>
- A text file containing one column of ISIS3 cube file names. The cubes
+ A text file containing one column of ISIS cube file names. The cubes
must be available for the program to open. If cubes in this list are
also in the FROMLIST, process time will be increased.
</description>
@@ -302,27 +302,27 @@
<type>filename</type>
<fileMode>output</fileMode>
<brief>
- Isis3 output Control Network file
+ Isis output Control Network file
</brief>
<description>
- Isis3 output Control Network file. The resulting output Control Net
- with the added images is placed in the specified output file in
- ONET.
- </description>
+ ISIS output Control Network file. The resulting output Control Net
+ with the added images is placed in the specified output file in
+ ONET.
+ </description>
<filter>
*.net
</filter>
</parameter>
<parameter name="TOLIST">
- <type>filename</type>
+ <type>filename</type>
<fileMode>input</fileMode>
<brief>
- List of ISIS3 output images in the ONET
+ List of ISIS output images in the ONET
</brief>
<description>
- Use this optional parameter to receive a list of all images in the ONET
- that are also in the FROMLIST or ADDLIST. To have a complete
+ Use this optional parameter to receive a list of all images in the ONET
+ that are also in the FROMLIST or ADDLIST. To have a complete
list, it is important to have the FROMLIST.
</description>
<filter>
@@ -330,7 +330,7 @@
</filter>
<internalDefault>None</internalDefault>
</parameter>
-
+
<parameter name="LOG">
<type>filename</type>
<fileMode>output</fileMode>
@@ -338,8 +338,8 @@
Optional Log File
</brief>
<description>
- This optional log file contains information about which files were
- added to the Control Net, which ones were not, and which
+ This optional log file contains information about which files were
+ added to the Control Net, which ones were not, and which
images were common in both the FROMLIST and ADDLIST.
</description>
<internalDefault>None</internalDefault>
@@ -351,7 +351,7 @@
<internalDefault>Do not list</internalDefault>
<brief>Creates a list of all modified Control Points</brief>
<description>
- This optional output file will create a list of the Control points
+ This optional output file will create a list of the Control points
that were modified by the addition of measures.
</description>
<filter> *.lis *.txt </filter>
@@ -359,7 +359,7 @@
</group>
- <group name="Options">
+ <group name="Options">
<parameter name="POLYGON">
<type>boolean</type>
@@ -385,18 +385,18 @@
<parameter name="RETRIEVAL">
<type>string</type>
<brief>
- Retrieve latitude and longitude from Control points in the
+ Retrieve latitude and longitude from Control points in the
Control Network or the reference cameras obtained from the
FROMLIST
</brief>
<description>
- This option allows the user to specify whether the latitude and
- longitude used for calculating Control measures' sample/line
- information should be retrieved from the reference cameras
- generated with the FROMLIST or the Control points contained
- within the input Control Network itself. If the POINT option is
+ This option allows the user to specify whether the latitude and
+ longitude used for calculating Control measures' sample/line
+ information should be retrieved from the reference cameras
+ generated with the FROMLIST or the Control points contained
+ within the input Control Network itself. If the POINT option is
selected, then there is no need to specify a FROMLIST, otherwise
- one must be specified.
+ one must be specified.
</description>
<default><item>REFERENCE</item></default>
<list>
@@ -405,9 +405,9 @@
Retrieve latitudes and longitudes from reference cameras
</brief>
<description>
- This default option will retrieve the latitude and
- longitude used for computing sample/line position in
- each Control Measure from a reference camera obtained
+ This default option will retrieve the latitude and
+ longitude used for computing sample/line position in
+ each Control Measure from a reference camera obtained
from the FROMLIST.
</description>
<inclusions>
@@ -419,9 +419,9 @@
Retrieve latitudes and longitudes from Control points
</brief>
<description>
- This option will retrieve the latitude and longitude
- used for computing sample/line position in each Control
- Measure from its Control Point in the input Control
+ This option will retrieve the latitude and longitude
+ used for computing sample/line position in each Control
+ Measure from its Control Point in the input Control
Network.
</description>
</option>
@@ -443,7 +443,7 @@
<option value="ALL">
<brief>Place all Control Points in the ONET</brief>
<description>
- This default option will add the new cubes to the CNET and
+ This default option will add the new cubes to the CNET and
place the result in ONET.
</description>
</option>
@@ -468,10 +468,10 @@
Measure Keywords for new/added measures
</brief>
<description>
- This optional PVL file containing the description of the Validity
- Control Measure Keywords. <strong>Newly added Control
- Measures</strong> which are not valid based on these keywords will
- be set to Ignored. Control Measures that are originally in the CNET
+ This optional PVL file containing the description of the Validity
+ Control Measure Keywords. <strong>Newly added Control
+ Measures</strong> which are not valid based on these keywords will
+ be set to Ignored. Control Measures that are originally in the CNET
will <strong>not</strong> be evaluated/Ignored by the DEFFILE.
</description>
<filter>
@@ -479,6 +479,6 @@
</filter>
</parameter>
</group>
-</groups>
+</groups>
</application>
diff --git a/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.xml b/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.xml
index 32a1e9c2f9..683002ee51 100644
--- a/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.xml
+++ b/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.xml
@@ -2,12 +2,12 @@
<application name="cnetbin2pvl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Converts an Isis3 control network file from binary into pvl format.
+ Converts an Isis control network file from binary into pvl format.
</brief>
<description>
<p>
- This program converts an Isis3 control network file from binary into a human readable
+ This program converts an Isis control network file from binary into a human readable
UTF-8 pvl formatted file. The output .pvl will be written as the latest PVL version.
The most recent PVL template can be found in the Control data directory under templates/controlnetworks.
</p>
diff --git a/isis/src/control/apps/cnetcheck/cnetcheck.xml b/isis/src/control/apps/cnetcheck/cnetcheck.xml
index ee79498b41..00b0c2364a 100644
--- a/isis/src/control/apps/cnetcheck/cnetcheck.xml
+++ b/isis/src/control/apps/cnetcheck/cnetcheck.xml
@@ -12,7 +12,7 @@
is recommended to run cnetcheck before running jigsaw (can use the same
input image cube list and control network) in order to catch a choice of
potential issues with the control network and the corresponding input
- image cube list.
+ image cube list.
</p>
<p>
The default primary function of cnetcheck is to idenify any
@@ -32,7 +32,7 @@
<p>
NOTE2: If it is discovered that a known island is missing an output island
file (i.e., output list not created as expected), it is possible that the
- image cube file name(s) were not listed in the input list (FROMLIST).
+ image cube file name(s) were not listed in the input list (FROMLIST).
</p>
<p>
All output files are created in the working directory where cnetcheck is
@@ -81,7 +81,7 @@
Added the SINGLECUBE parameter, renaming SINGLE to SINGLEMEASURE as a consequence.
</change>
<change name="Mackenzie Boyd" date="2010-05-28">
- Modified functionality of NOLATLON option to check all measures, not just
+ Modified functionality of NOLATLON option to check all measures, not just
each cube.
</change>
<change name="Christopher Austin" date="2009-06-08">
@@ -122,11 +122,11 @@
List of input cube file names in the Control Network
</brief>
<description>
- A text file containing one column of ISIS3 image cube file names.
+ A text file containing one column of ISIS image cube file names.
Every image cube file used in the control network should be included
in this list. The input images are required to be a <def>Level0</def>
or <def>Level1</def> cube with a successful 'spiceinit' applied
- previously.
+ previously.
</description>
<filter>
*.txt *.lis *.list
@@ -158,9 +158,9 @@
The character to be inserted between output file field entries
</brief>
<description>
- This option determines which character will be used to separate
+ This option determines which character will be used to separate
the output file field entries, with the default option as a tab.
- Other options are comma, single space, or "OTHER," which allows
+ Other options are comma, single space, or "OTHER," which allows
the user to input whatever they wish as the delimiter character.
</description>
<default><item>TAB</item></default>
@@ -228,7 +228,7 @@
</brief>
<description>
The results of the validity check are placed in output file names with
- the given prefix.
+ the given prefix.
<p>
For example, PREFIX=CHK_, will result in an output filename
CHK_Island.1 or CHK_NoControl.txt
@@ -246,7 +246,7 @@
When Ignore=TRUE, any <def link="Control Point">control points</def>
and <def link="Control Measures">control measures</def> that are
flagged as invalid within the network (IGNORE=TRUE), are NOT
- considered links across images/groups when identifying islands.
+ considered links across images/groups when identifying islands.
<p>
Ignore=TRUE is the default for consistency with other apps, such as
jigsaw, that do NOT consider invalid points or measures.
@@ -272,9 +272,9 @@
not found in the input control network (CNET) are considered images
without control. These filenames and serial numbers will be listed in
the output file named [PREFIX]NoControl.txt (with a field delimiter
- [DELIMIT]).
+ [DELIMIT]).
<p>
- No output file will be created if all images are controlled.
+ No output file will be created if all images are controlled.
</p>
<p>
NOCONTROL=False will turn off this testing of images without
@@ -293,13 +293,13 @@
NOCUBE=True, an output file named [PREFIX]NoCube.txt will be created,
which will list all <def link="Serial Number">serial numbers</def>
encountered in the input Control Network (CNET) that do not have a
- corresponding image cube file name in the provided list (FROMLIST).
+ corresponding image cube file name in the provided list (FROMLIST).
<p>
- No output file will be created if all serial numbers match to an
- image cube file name.
+ No output file will be created if all serial numbers match to an
+ image cube file name.
</p>
<p>
- NOCUBE=False will turn off the testing for matching serial number
+ NOCUBE=False will turn off the testing for matching serial number
and input image file names.
</p>
</description>
@@ -315,9 +315,9 @@
SINGLEMEASURE=True, a file named [PREFIX]SinglePointCubes.txt will be
created, which will list all image cube file names that exist as the
single Control Measure in any Control Point within the provided
- Control Network.
+ Control Network.
<p>
- Note: In general and when possible, a control point should have more
+ Note: In general and when possible, a control point should have more
than one control measures (more than three).
</p>
<p>
@@ -341,7 +341,7 @@
Images under this scenario must be resolved before running jigsaw.
A single image must not have more than one measure to the same
control point.
- </p>
+ </p>
<p>
If there are no such duplicate Control Measures, then no file is
created.
@@ -356,8 +356,8 @@
Check for images that are measured to only one Control Point
</brief>
<description>
- When true, a file named [PREFIX]SingleCubes.txt will be created,
- that will list all image cube filenames that are measured to only
+ When true, a file named [PREFIX]SingleCubes.txt will be created,
+ that will list all image cube filenames that are measured to only
one control point.
<p>
These images would have a convex hull value near zero, meaning there
@@ -368,7 +368,7 @@
</p>
<p>
If there are no such single Cubes, then no file is created.
- </p>
+ </p>
</description>
</parameter>
@@ -382,7 +382,7 @@
When true, a file named [PREFIX]NoLatLon.txt will be created, which
will list all Serial Numbers within the given Control Network and
FROMLIST which a latitude and longitude value cannot be computed at
- their respective image measure coordinate.
+ their respective image measure coordinate.
<p>
These identified Serial Numbers and image cube filenames will be
followed by the Control Point IDs where the latitude and longitude
@@ -421,11 +421,11 @@
</p>
<p>
The default of 1.0 for a max tolerance will effectively cause
- nearly every image to be reported, as it is highly unlikely that
- a convex hull will cover 100% of it's corresponding image.
- With a tolerance of 0.25, any image whose convex hull covers less
- than a quarter of the image area will be reported. A minimal
- tolerance of 0.0 effectively makes the test meaningless, allowing
+ nearly every image to be reported, as it is highly unlikely that
+ a convex hull will cover 100% of it's corresponding image.
+ With a tolerance of 0.25, any image whose convex hull covers less
+ than a quarter of the image area will be reported. A minimal
+ tolerance of 0.0 effectively makes the test meaningless, allowing
images to "pass" this test without having ay control point coverage.
</p>
<p>
diff --git a/isis/src/control/apps/cnetextract/cnetextract.xml b/isis/src/control/apps/cnetextract/cnetextract.xml
index 7de954a082..6016b3187f 100644
--- a/isis/src/control/apps/cnetextract/cnetextract.xml
+++ b/isis/src/control/apps/cnetextract/cnetextract.xml
@@ -273,7 +273,7 @@
</change>
<change name="Kelvin Rodriguez" date="2016-08-16">
removed redundant boolean statement (len == 0) which caused warnings in clang.
- Part of porting to OS X 10.11.
+ Part of porting to OS X 10.11.
</change>
<change name="Ian Humphrey" date="2016-09-29">
When using LATLON=true, control points that are out of the specified latitude and longitude
@@ -295,10 +295,10 @@
<fileMode>input</fileMode>
<internalDefault>No input cube list</internalDefault>
<brief>
- List of ISIS3 cubes in the input Control Network
+ List of ISIS cubes in the input Control Network
</brief>
<description>
- A text file containing one column of ISIS3 cube file names. Every cube
+ A text file containing one column of ISIS cube file names. Every cube
used in the input control network should be contained in this list.
</description>
<filter>
@@ -349,10 +349,10 @@
<fileMode>output</fileMode>
<internalDefault>No output cube list</internalDefault>
<brief>
- List of ISIS3 cubes in the output Control Network file
+ List of ISIS cubes in the output Control Network file
</brief>
<description>
- This optional output text file contains one column of ISIS3 cube file names associated
+ This optional output text file contains one column of ISIS cube file names associated
with the ONET. This list can only include cubes that were provided in the FROMLIST.
</description>
<filter>
@@ -666,7 +666,7 @@
<description>
<p>
Use this parameter to select a text file that contains a list of
- ISIS3 cubes. All the Control Points which contain at least one of
+ ISIS cubes. All the Control Points which contain at least one of
these cubes will be extracted.
</p>
diff --git a/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.xml b/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.xml
index 7c58ff1dd5..80fc38604c 100644
--- a/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.xml
+++ b/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.xml
@@ -2,13 +2,13 @@
<application name="cnetpvl2bin" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Converts an Isis3 control network file from pvl format into binary.
+ Converts an Isis control network file from pvl format into binary.
</brief>
<description>
<p>
- This program converts an Isis3 control network file from an ascii pvl
- format into a binary formatted file.
+ This program converts an Isis control network file from an ascii pvl
+ format into a binary formatted file.
</p>
</description>
@@ -43,7 +43,7 @@
*.cnet *.pvl
</filter>
</parameter>
-
+
<parameter name="TO">
<type>filename</type>
<fileMode>output</fileMode>
@@ -57,6 +57,6 @@
*.bin
</filter>
</parameter>
- </group>
+ </group>
</groups>
</application>
diff --git a/isis/src/control/apps/cnetwinnow/cnetwinnow.xml b/isis/src/control/apps/cnetwinnow/cnetwinnow.xml
index b83742aa6e..5c31db8145 100644
--- a/isis/src/control/apps/cnetwinnow/cnetwinnow.xml
+++ b/isis/src/control/apps/cnetwinnow/cnetwinnow.xml
@@ -6,7 +6,7 @@
<description>
<p>
- After <b>jigsaw</b> has done a bundle adjustment on a group of overlapping Isis 3, level
+ After <b>jigsaw</b> has done a bundle adjustment on a group of overlapping Isis, level
1, <def>cube</def>s every image measure in the network will have associated residuals.
A historgram of the residuals is constructed in order to determine the magnitude at which
the noise (bad data) starts to dominate the solution. The points are segregated into three
@@ -15,7 +15,7 @@
for measure rejection provided. If guilty measures cannot be ingored a report is generated
documenting why. No additional action is taken if suspect measure cannot be elliminated.
</p>
-
+
<h4>Known Issues</h4>
<blockquote>
Not spliting a network into <b>islands</b> is one of the primary considerations for whether
@@ -65,8 +65,8 @@
Input control network
</brief>
<description>
- This file is a <def>control network</def> generated from programs such as
- <b>autoseed</b> or <b>qnet</b>. It contains the <def>control point</def>s
+ This file is a <def>control network</def> generated from programs such as
+ <b>autoseed</b> or <b>qnet</b>. It contains the <def>control point</def>s
and associated measures.
</description>
<filter>
@@ -98,7 +98,7 @@
</description>
</parameter>
</group>
-
+
<group name="Histogram Analysis Parameters--The user is advised to use caution if changing the defualts">
<parameter name="BIN_WIDTH">
@@ -106,7 +106,7 @@
<description>
The program will build and analyze a histogram of the R^2 residual lengths.
This prameter tells the software how wide to make each bin. Unless the user
- has studied the behaviour of residuals (particularly with regard to their
+ has studied the behaviour of residuals (particularly with regard to their
networks), we do not advise changing the default.
</description>
<type>double</type>
@@ -122,7 +122,7 @@
If all of the measurements in network belong to Gaussian distribution (one of the typical assumptions in
least squares analysis) then the residual histogram should be strictly decreasing in the tail. There should
be only one local maxima near the median (a results of using equal distance bins instead of equal area). All
- other local maxima are 'bumps' and reveal where the assumption of Gaussian noise is breaking down. The
+ other local maxima are 'bumps' and reveal where the assumption of Gaussian noise is breaking down. The
SUSPECT_BUMP_PERCENT is the minimum bump height (in percentage of the preceding local minima) for a bump to be
considered suspect. And barring user override will be the boundary between inocent and suspect points.
Changing the default is not typically recomended.
@@ -141,7 +141,7 @@
If all of the measurements in network belong to Gaussian distribution (one of the typical assumptions in
least squares analysis) then the residual histogram should be strictly decreasing in the tail. There should
be only one local maxima near the median (a results of using equal distance bins instead of equal area). All
- other local maxima are 'bumps' and reveal where the assumption of Gaussian noise is breaking down. The
+ other local maxima are 'bumps' and reveal where the assumption of Gaussian noise is breaking down. The
GUILTY_BUMP_PERCENT is the minimum bump height (in percentage of the preceding local minima) for a bump to be
considered guilty. And barring user override will be the boundary between suspect and guilty points.
Changing the default is not typically recomended.
@@ -166,7 +166,7 @@
</default>
<minimum inclusive="yes">0.0</minimum>
</parameter>
-
+
<parameter name="GUILTY_FLOOR">
<brief>Every residual greater than user defined GUILTY_FLOOR is guilty</brief>
<description>
diff --git a/isis/src/control/apps/coreg/coreg.xml b/isis/src/control/apps/coreg/coreg.xml
index befda7801f..55878b387c 100644
--- a/isis/src/control/apps/coreg/coreg.xml
+++ b/isis/src/control/apps/coreg/coreg.xml
@@ -9,40 +9,40 @@
<description>
<p>
This program co-regsisters two images using an image-wide averaged
- sample/line translation with the TRANSLATE option or a set of variable
+ sample/line translation with the TRANSLATE option or a set of variable
sample/line translations with the WARP option. The program computes local
translations spaced evenly throughout the image. The number and spacing
of local translations is user defined. This allows for many output
options including 1) directly creating the translated image, 2)
creating a control network which can be used in other programs (e.g.,
- translate, warp and qview-matchtool) or 3) creating a flat-field file
- usable in spreadsheets or plotting packages to visualize magnitude and
+ translate, warp and qview-matchtool) or 3) creating a flat-field file
+ usable in spreadsheets or plotting packages to visualize magnitude and
direction of varying translations.
- For the TRANSLATE option, this implies that the internal geometry of both
- images be nearly the same so that the translation can be computed. That
- is, this program will not work if the translation varies significantly
- throughout the image. If condition of near constant translation is met
- then the translation can be computed to sub-pixel accuracy.
-
- If the internal geometry of both images do not match well, or a simple
- line/sample shift is not sufficient to register the images, the WARP
- option is a better choice than TRANSLATE because this uses the local
- translations to perform a rubber-sheet transformation. This option must
- be used with caution. It works very well with a well distributed
+ For the TRANSLATE option, this implies that the internal geometry of both
+ images be nearly the same so that the translation can be computed. That
+ is, this program will not work if the translation varies significantly
+ throughout the image. If condition of near constant translation is met
+ then the translation can be computed to sub-pixel accuracy.
+
+ If the internal geometry of both images do not match well, or a simple
+ line/sample shift is not sufficient to register the images, the WARP
+ option is a better choice than TRANSLATE because this uses the local
+ translations to perform a rubber-sheet transformation. This option must
+ be used with caution. It works very well with a well distributed
collection of accurate control points across the image plane.
</p>
<p>
NOTE: While coreg uses a predefined autoreg parameter template, there are
a variety of pattern matching algorithms and parameter settings that can
be used to optimize the success and accuracy of the co-registration
- attempt with the control point measures. It is recommended that you review the
- <a href="../../../../documents/PatternMatch/PatternMatch.html">Pattern
- Matching</a> page from the "Related Objects and Documents" section below.
- It is essential for using this application to understand how to create a
- "registration template" file and how to size your search and pattern
- chips. We will continue with the discussion of functionality of this
- program assuming the reader has a fundamental knowledge of Automatic
+ attempt with the control point measures. It is recommended that you review the
+ <a href="../../../../documents/PatternMatch/PatternMatch.html">Pattern
+ Matching</a> page from the "Related Objects and Documents" section below.
+ It is essential for using this application to understand how to create a
+ "registration template" file and how to size your search and pattern
+ chips. We will continue with the discussion of functionality of this
+ program assuming the reader has a fundamental knowledge of Automatic
Registration. The user can also refer to the autoregtemplate application
that offers a gui interface for creating an autoreg template file.
Below we give an example of an autoreg parameter template file (DEFFILE):
@@ -71,27 +71,27 @@
EndObject
</pre>
- <p>
- For further discussion of the parameters used in this DEFFILE, see the
- <a href="../../../../documents/PatternMatch/PatternMatch.html">Pattern
- Matching</a> document. Briefly, the example DEFFILE will allow a
- successful registration only where the MaximumCorrelation
- algorithm's goodness-of-fit result is >=0.7, pixel value is >1400, and at
- least 75% of the pixels in both the PatternChip or the SearchChip are
+ <p>
+ For further discussion of the parameters used in this DEFFILE, see the
+ <a href="../../../../documents/PatternMatch/PatternMatch.html">Pattern
+ Matching</a> document. Briefly, the example DEFFILE will allow a
+ successful registration only where the MaximumCorrelation
+ algorithm's goodness-of-fit result is >=0.7, pixel value is >1400, and at
+ least 75% of the pixels in both the PatternChip or the SearchChip are
valid pixels.
</p>
-
+
<p>
This program requires two input cubes, one which will be translated (FROM)
and the other is held fixed (MATCH). The images must have the same
number of samples and lines and can have only one band (use cube
- attributes to extract a single band if necessary). A grid will be defined
- across the held image using either the user parameters, ROWS and COLUMNS, or
- calculated based on the image size and the search chip size as follows:
- COLUMNS = (image samples - 1) / search chip samples + 1, and similarly for
- ROWS. Conceptually, the sparse grid defined by ROWS and COLUMNS will be
- laid on top of both images with even spacing between the rows (or columns)
- and but no row will touch the top or bottom of the image. That is, the
+ attributes to extract a single band if necessary). A grid will be defined
+ across the held image using either the user parameters, ROWS and COLUMNS, or
+ calculated based on the image size and the search chip size as follows:
+ COLUMNS = (image samples - 1) / search chip samples + 1, and similarly for
+ ROWS. Conceptually, the sparse grid defined by ROWS and COLUMNS will be
+ laid on top of both images with even spacing between the rows (or columns)
+ and but no row will touch the top or bottom of the image. That is, the
grid is internal to the image.
</p>
@@ -102,35 +102,35 @@
intersection for the held image (MATCH). The pattern chip is walked
through the search chip to find the best registration (if any). Again,
see the <a href="../../../../documents/PatternMatch/PatternMatch.html">
- Pattern Matching</a> document for further details. The local translation is
- recorded at all grid intersections that had a successful registration.
- The results are written to a control network and/or flat-file if requested.
+ Pattern Matching</a> document for further details. The local translation is
+ recorded at all grid intersections that had a successful registration.
+ The results are written to a control network and/or flat-file if requested.
The average of the local translations is then used to compute an overall sub-pixel
translation which can be applied to the FROM image and written as the output image (TO).
</p>
<p>
- Some tips to improve odds of a successful registration are provided. In
- general a small pattern chip size makes registration more difficult.
- Depending on your dataset, 20x20 is probably a good starting point. The
- larger the translation, the larger the search chip size will need to be;
- if your translation is only a couple of pixels, you should make the search
- chip only slightly larger than the pattern (e.g., 25x25 vs 20x20).
- However if the translation is large you will need to expand the search
- area. For example, if the translation is roughly 45 pixels and your
+ Some tips to improve odds of a successful registration are provided. In
+ general a small pattern chip size makes registration more difficult.
+ Depending on your dataset, 20x20 is probably a good starting point. The
+ larger the translation, the larger the search chip size will need to be;
+ if your translation is only a couple of pixels, you should make the search
+ chip only slightly larger than the pattern (e.g., 25x25 vs 20x20).
+ However if the translation is large you will need to expand the search
+ area. For example, if the translation is roughly 45 pixels and your
pattern is 20x20 the search area should be, roughly, 20+2*45 or 110x110.
</p>
<p>
The output control point network file (ONET) can be visually overlayed on the
- the displayed input images using the qview-MatchTool. The qview image display
- application will allow you to evaluate and interactively edit the network within the
+ the displayed input images using the qview-MatchTool. The qview image display
+ application will allow you to evaluate and interactively edit the network within the
MatchTool.
</p>
</description>
<category>
<categoryItem>Registration and Pattern Matching</categoryItem>
- </category>
+ </category>
<oldName>
<item>coreg2</item>
@@ -146,7 +146,7 @@
</applications>
<documents>
<document>
- <title>Pattern Matching in ISIS 3</title>
+ <title>Pattern Matching in ISIS</title>
<source>
<filename>PatternMatch.html</filename>
<path>../../../../documents/PatternMatch/</path>
@@ -236,7 +236,7 @@
Replaced the spaces in the point ID with underscores. References #1551.
</change>
<change name="Jeannie Backer" date="2016-04-22">
- Modified to use the FROM cube labels to set target instead of the TargetName.
+ Modified to use the FROM cube labels to set target instead of the TargetName.
Updated the truth data for the cnet test. Added notarget test. References #3892
</change>
</history>
@@ -266,7 +266,7 @@
<description>
This cube will be held as the reference and the FROM cube will be translated to match this cube.
The sample/line measurements recorded from this image are basically the defined output coordinates
- that the FROM image will be mapped to.
+ that the FROM image will be mapped to.
</description>
<filter>
*.cub
@@ -283,7 +283,7 @@
The parameter template to use for the Autoregistration functionality. The default template
calls the Maximum Correlation pattern matching algorithm with predefined parameter values.
There are other templates available in the system autoreg/template directory. Also, the user
- can use the 'autoregtemplate' application to create a new template file.
+ can use the 'autoregtemplate' application to create a new template file.
</description>
<helpers>
<helper name="H1">
@@ -324,7 +324,7 @@
</brief>
<description>
The tranformation type to use on the output file. The options are TRANSLATE or WARP.
- If WARP is selected, the ONET and DEGREE parameters are required.
+ If WARP is selected, the ONET and DEGREE parameters are required.
Defaults to TRANSLATE.
</description>
<default><item>TRANSLATE</item></default>
@@ -356,7 +356,7 @@
Degree for Warp Transformation
</brief>
<description>
- The degree to be used in the warp transformation for the linear regression
+ The degree to be used in the warp transformation for the linear regression
model. Defaults to 1.
</description>
<default><item>1</item></default>
@@ -368,7 +368,7 @@
Interpolation used for transformation
</brief>
<description>
- This will be the interpolation type used to generate the output file in either the
+ This will be the interpolation type used to generate the output file in either the
translate or warp application. Defaults to NEARESTNEIGHBOR.
</description>
<default><item>CUBICCONVOLUTION</item></default>
@@ -402,7 +402,7 @@
</option>
</list>
</parameter>
-
+
</group>
<group name= "ControlNetOptions">
@@ -414,10 +414,10 @@
</brief>
<description>
This file will contain the Control Point network results of coreg in a binary
- format. This is required if the WARP option is selected for the output file.
+ format. This is required if the WARP option is selected for the output file.
The resulting control points in this file can be viewed using the qview-MatchTool.
- If the coregistration fails between any measures, the points and measures remain
- in this output file with a flag called Ignore=True.
+ If the coregistration fails between any measures, the points and measures remain
+ in this output file with a flag called Ignore=True.
</description>
<internalDefault>None</internalDefault>
<filter>
@@ -432,19 +432,19 @@
Text file of coreg data
</brief>
<description>
- This file will contain the Control Point network results of coreg in a readable format.
- The control point information will be comma separated and contain the sample, line positions
+ This file will contain the Control Point network results of coreg in a readable format.
+ The control point information will be comma separated and contain the sample, line positions
in the first input (FROM) cube, the sample, line position found in the search (MATCH)
reference cube, and the sample difference and line difference between the two.
This output file will only contain the points and measures that resulted in a successful
- registration.
+ registration.
</description>
<internalDefault>None</internalDefault>
<filter>
*.txt *.lis *.lst
</filter>
</parameter>
-
+
<parameter name= "ROWS">
<type>integer</type>
<brief>
diff --git a/isis/src/control/apps/deltack/deltack.xml b/isis/src/control/apps/deltack/deltack.xml
index 25f78dd1d4..c1a1b76b23 100644
--- a/isis/src/control/apps/deltack/deltack.xml
+++ b/isis/src/control/apps/deltack/deltack.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<application name="deltack" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
+<application name="deltack" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
@@ -8,115 +8,115 @@
<description>
<p>
- <b>deltack</b> can be used to correct most instances of problems with
- camera attitude. It adjusts camera orientation in the labels of a single
- Isis 3 cube (resection). In order for <b>deltack</b> to work properly, the
- input cube must have been initialized with <b>spiceinit</b> using
- ATTACH="YES".
+ <b>deltack</b> can be used to correct most instances of problems with
+ camera attitude. It adjusts camera orientation in the labels of a single
+ Isis cube (resection). In order for <b>deltack</b> to work properly, the
+ input cube must have been initialized with <b>spiceinit</b> using
+ ATTACH="YES".
</p>
<h3>BUNDLE Method</h3>
<p>
- Like <b>jigsaw</b>, <b>deltack</b> works on both framing cameras and line
- scanners using the BUNDLE method. The user must supply a
- latitude/longitude for at least one sample/line coordinate in the image.
- Angles 1 and 2 of the camera orientation stored in the cube labels will be
- adjusted to align the coordinate with the entered latitude/longitude. To
- solve for all three camera angles, select the TWIST option. A second
- coordinate point and desired latitude/longitude must be entered if the
- <b>TWIST</b> option is used. <b>deltack</b> will adjust the camera
- orientation to align both points with their corresponding
+ Like <b>jigsaw</b>, <b>deltack</b> works on both framing cameras and line
+ scanners using the BUNDLE method. The user must supply a
+ latitude/longitude for at least one sample/line coordinate in the image.
+ Angles 1 and 2 of the camera orientation stored in the cube labels will be
+ adjusted to align the coordinate with the entered latitude/longitude. To
+ solve for all three camera angles, select the TWIST option. A second
+ coordinate point and desired latitude/longitude must be entered if the
+ <b>TWIST</b> option is used. <b>deltack</b> will adjust the camera
+ orientation to align both points with their corresponding
latitudes/longitudes with minimal residuals in sample and line.
</p>
<p>
- The camera pointing is updated using an iterative least-squares bundle
- adjustment. The number of iterations (<b>MAXIT</b>)and tolerance
- (<b>SIGMA0</b>) for convergence are input parameters to <b>deltack</b>.
- Solving for two angles only is similar to a translation of the image in
- sample and line. Solving for the twist as well will result in both a
+ The camera pointing is updated using an iterative least-squares bundle
+ adjustment. The number of iterations (<b>MAXIT</b>)and tolerance
+ (<b>SIGMA0</b>) for convergence are input parameters to <b>deltack</b>.
+ Solving for two angles only is similar to a translation of the image in
+ sample and line. Solving for the twist as well will result in both a
translation and a rotation.
</p>
<p>
- <b>deltack</b> creates a set of two output files for analyzing the
- results. <b>BUNDLEOUT.TXT</b> provides an overall summary of the
- resection. It lists the user input parameters selected and tables of
- statistics for both the image and the point(s). <b>RESIDUALS.CSV</b>
- provides a table of the measured image coordinates and the final sample,
+ <b>deltack</b> creates a set of two output files for analyzing the
+ results. <b>BUNDLEOUT.TXT</b> provides an overall summary of the
+ resection. It lists the user input parameters selected and tables of
+ statistics for both the image and the point(s). <b>RESIDUALS.CSV</b>
+ provides a table of the measured image coordinates and the final sample,
line, and overall residuals in both millimeters and pixels.
</p>
<h3>DIRECT Method</h3>
<p>
- The DIRECT method can be applied to cameras/instruments that are not
- supported by <b>jigsaw</b> or the viewing geometry conditions are not
- supported in BUNDLE. The DIRECT method is particularly useful for the
- Cassini VIMS (and other (spot) spectrometer type instruments) and for
- cases where the geometry is partially or completely off the target body.
- The DIRECT method primarily differs from the BUNDLE method in that it
- computes a rotation matrix directly from the SAMP1/LINE1 to the LAT1/LON1
- surface intercept vectors from the spacecraft position reference in the
- J2000 coordinate system. Essentially, these are the look direction
- vectors from those camera coordinates in J2000 which eliminates any
- peculiarities within the camera coordinate system. And, most importantly,
- it does not require all sample/line coordinates to map to valid geometric
- coordinates. It does not, however, support the TWIST option or the
+ The DIRECT method can be applied to cameras/instruments that are not
+ supported by <b>jigsaw</b> or the viewing geometry conditions are not
+ supported in BUNDLE. The DIRECT method is particularly useful for the
+ Cassini VIMS (and other (spot) spectrometer type instruments) and for
+ cases where the geometry is partially or completely off the target body.
+ The DIRECT method primarily differs from the BUNDLE method in that it
+ computes a rotation matrix directly from the SAMP1/LINE1 to the LAT1/LON1
+ surface intercept vectors from the spacecraft position reference in the
+ J2000 coordinate system. Essentially, these are the look direction
+ vectors from those camera coordinates in J2000 which eliminates any
+ peculiarities within the camera coordinate system. And, most importantly,
+ it does not require all sample/line coordinates to map to valid geometric
+ coordinates. It does not, however, support the TWIST option or the
two-point scenario as does the BUNDLE method.
</p>
<p>
- This approach works in variable acquistion time instrument systems, such
- as line scan, pushbroom, pushframe and (spot) spectrometers (as well as
- framing camera instruments) because the rotation matrix is determined
- independent of spacecraft position. It also works for situations where
- the geometry is off the target body because the look vector is always
- properly set in the ISIS camera model even if it does not intersect the
- surface. Note, however, in the later case, the LAT1/LON1 position must
- intersect the target body to obtain a valid sample/line coordinate.
+ This approach works in variable acquistion time instrument systems, such
+ as line scan, pushbroom, pushframe and (spot) spectrometers (as well as
+ framing camera instruments) because the rotation matrix is determined
+ independent of spacecraft position. It also works for situations where
+ the geometry is off the target body because the look vector is always
+ properly set in the ISIS camera model even if it does not intersect the
+ surface. Note, however, in the later case, the LAT1/LON1 position must
+ intersect the target body to obtain a valid sample/line coordinate.
</p>
<p>
- The DIRECT method was designed to correct the pointing for the Cassini
- VIMS spectrometer but it is designed to be generally applicable to all
- cameras supported in the ISIS system. The BUNDLE method does not work on
- the VIMS instrument and likely many other complex camera systems with
- peculiar geometric configurations, such as (spot) spectrometers. The
- recommended procedure to determine an update to VIMS pointing is to first
- determine the geometric coordinate of a commmon feature in a reference
- image, such as a Cassini ISS observation for example, where the same
- latitude/longitude coordinate maps to a line/sample in the VIMS image.
- The VIMS geometric coordinate is expected not match the feature in the
- ISS image but <b>qview</b> and/or <b>campt</b> must report a valid
- line/sample coordinate from the latitude/longitude coordinate. The next
- step is to choose the best sample/line coordinate in the VIMS image that
- best matches the feature in the ISS image. To correctly update the
- pointing in the VIMS image, provide the latitude/longitude coordinate
- from the ISS image in the LAT1/LON1 parameters and the line/sample
- coordinate of the feature in the VIMS image in the SAMP1/LINE1 parameters
- to <b>deltack</b>. You may make a copy of the original image prior to
+ The DIRECT method was designed to correct the pointing for the Cassini
+ VIMS spectrometer but it is designed to be generally applicable to all
+ cameras supported in the ISIS system. The BUNDLE method does not work on
+ the VIMS instrument and likely many other complex camera systems with
+ peculiar geometric configurations, such as (spot) spectrometers. The
+ recommended procedure to determine an update to VIMS pointing is to first
+ determine the geometric coordinate of a commmon feature in a reference
+ image, such as a Cassini ISS observation for example, where the same
+ latitude/longitude coordinate maps to a line/sample in the VIMS image.
+ The VIMS geometric coordinate is expected not match the feature in the
+ ISS image but <b>qview</b> and/or <b>campt</b> must report a valid
+ line/sample coordinate from the latitude/longitude coordinate. The next
+ step is to choose the best sample/line coordinate in the VIMS image that
+ best matches the feature in the ISS image. To correctly update the
+ pointing in the VIMS image, provide the latitude/longitude coordinate
+ from the ISS image in the LAT1/LON1 parameters and the line/sample
+ coordinate of the feature in the VIMS image in the SAMP1/LINE1 parameters
+ to <b>deltack</b>. You may make a copy of the original image prior to
running <b>deltack</b> if desired.
- </p>
+ </p>
<p>
- A similar procedure to the one described for VIMS will also work to
- update the pointing of an image where the SPICE ephemeris data does not
- provide a valid latitude/longitude on the target body. The distinction is
- that the SAMP1/LINE1 coordinate need not intersect the body. Indeed, this
- is a common problem encountered typically with older data sets and
- generally with flyby images where the target is partially or fully in the
- field of view of the camera. There is an alternative technique for flyby
- images of this type that does not require a second reference image. The
- case where this technique is most effective is typically used for framing
- cameras where the center of the target body is in view and there is at
- least 1 pixel in the image that maps to the surface where geometric data
- can be computed. Using <b>campt</b>, provide the sample/line coordinate
- of any valid geometric point in the image - it does not have to visibly
- intersect the target body - any sample/line coordinate will suffice.
- <b>campt</b> reports the sub-spacecraft latitude/longitude coordinate for
- every valid geometric coordinate - it will always be the same coordinate
- for framing cameras. If the full disk of the target body is viewable and
- the image is relative free of noise/artifacts, the <b>center</b> program
- computes the centroid sample/line coordinate of the target body. If this
- condition is not met, use <b>qview</b> to manually approximate the center
- pixel coordinate of the body. Provide the centroid sample/line in the
- SAMP1/LINE1 coordinate and the
- SubSpacecraftLatitude/SubSpacecraftLongitude values computed by
- <b>campt</b> in the LAT1/LON1 parameter to <b>deltack</b>.
+ A similar procedure to the one described for VIMS will also work to
+ update the pointing of an image where the SPICE ephemeris data does not
+ provide a valid latitude/longitude on the target body. The distinction is
+ that the SAMP1/LINE1 coordinate need not intersect the body. Indeed, this
+ is a common problem encountered typically with older data sets and
+ generally with flyby images where the target is partially or fully in the
+ field of view of the camera. There is an alternative technique for flyby
+ images of this type that does not require a second reference image. The
+ case where this technique is most effective is typically used for framing
+ cameras where the center of the target body is in view and there is at
+ least 1 pixel in the image that maps to the surface where geometric data
+ can be computed. Using <b>campt</b>, provide the sample/line coordinate
+ of any valid geometric point in the image - it does not have to visibly
+ intersect the target body - any sample/line coordinate will suffice.
+ <b>campt</b> reports the sub-spacecraft latitude/longitude coordinate for
+ every valid geometric coordinate - it will always be the same coordinate
+ for framing cameras. If the full disk of the target body is viewable and
+ the image is relative free of noise/artifacts, the <b>center</b> program
+ computes the centroid sample/line coordinate of the target body. If this
+ condition is not met, use <b>qview</b> to manually approximate the center
+ pixel coordinate of the body. Provide the centroid sample/line in the
+ SAMP1/LINE1 coordinate and the
+ SubSpacecraftLatitude/SubSpacecraftLongitude values computed by
+ <b>campt</b> in the LAT1/LON1 parameter to <b>deltack</b>.
</p>
</description>
@@ -135,7 +135,7 @@
Original version
</change>
<change name="Tracie Sucharski" date="2007-05-02">
- Added inclusion of TWIST to SAMP2,LINE2,LAT2,LON2,RAD2.
+ Added inclusion of TWIST to SAMP2,LINE2,LAT2,LON2,RAD2.
Without this inclusion, the AML was requiring these parameters
even if TWIST was false.
</change>
@@ -158,14 +158,14 @@
Updated documentation, mostly to indicate units.
</change>
<change name="Debbie A. Cook" date="2011-10-04">
- Added documentation for output files and removed creation of
+ Added documentation for output files and removed creation of
output csv tables because the tables are not useful for
only one or two points. The information is already listed
in bundleout.txt.
</change>
<change name="Kimberly Oyama" date="2014-03-28">
- Added check for history group in input cube. If it's there, add a new
- entry. If not, add a new history group. Added an app test. Fixes #1350.
+ Added check for history group in input cube. If it's there, add a new
+ entry. If not, add a new history group. Added an app test. Fixes #1350.
</change>
<change name="Jeannie Backer" date="2014-07-23">
Modified to create a bundle settings object for the bundle adjustment.
@@ -174,27 +174,27 @@
Changed code to accommodate changes in Sensor and Camera relationships.
</change>
<change name="Jeannie Backer" date="2016-04-22">
- Modified to use the FROM cube labels to set output control net's 'target'
- instead of the TargetName. Removed check for TargetName since this happens
- when the ControlNet target is set. References #3892
+ Modified to use the FROM cube labels to set output control net's 'target'
+ instead of the TargetName. Removed check for TargetName since this happens
+ when the ControlNet target is set. References #3892
</change>
<change name="Jeannie Backer" date="2016-08-18">
- Removed deprecated parameter from call to BundleSettings::setSolveOptions.
- References #4162.
+ Removed deprecated parameter from call to BundleSettings::setSolveOptions.
+ References #4162.
</change>
<change name="Kris Becker" date="2017-08-01">
- Added new DIRECT method to update the pointing for instrument with special
- conditions. The DIRECT method is intended for use with instrument camera
- models that do not work in jigsaw (more specifically, BundleAdjust) such
- as Cassini VIMS. Added the METHOD parameter to allow user to select which
- method to apply. The default is METHOD=BUNDLE which chooses pre-existing
- behavor. Updated documentation to reflect these new changes. Fixes #4868.
+ Added new DIRECT method to update the pointing for instrument with special
+ conditions. The DIRECT method is intended for use with instrument camera
+ models that do not work in jigsaw (more specifically, BundleAdjust) such
+ as Cassini VIMS. Added the METHOD parameter to allow user to select which
+ method to apply. The default is METHOD=BUNDLE which chooses pre-existing
+ behavor. Updated documentation to reflect these new changes. Fixes #4868.
</change>
<change name="Ken Edmundson" date="2018-05-23">
Modifed call to bundleAdjustment->solveCholeskyBR() to return a raw pointer to a
BundleSolutionInfo object. Am also deleting this pointer because jigsaw.cpp takes
ownership from BundleAdjust.
- </change>
+ </change>
</history>
<groups>
@@ -206,8 +206,8 @@
Input camera cube
</brief>
<description>
- The file specification for the input cube. The cube will have its
- camera pointing updated.
+ The file specification for the input cube. The cube will have its
+ camera pointing updated.
</description>
<filter>
*.cub
@@ -232,22 +232,22 @@
Use jigsaw bundle adjustment method
</brief>
<description>
- The BUNDLE method uses jigsaw photogrammetric techniques to
- adjust the pointing differences from a point to a
- latitude/longitude coordinate. BUNDLE is also more flexible
- in that it can also correct for TWIST by providing a second
+ The BUNDLE method uses jigsaw photogrammetric techniques to
+ adjust the pointing differences from a point to a
+ latitude/longitude coordinate. BUNDLE is also more flexible
+ in that it can also correct for TWIST by providing a second
set of SAMP2/LINE2 and LAT2/LON2 parameters.
</description>
</option>
<option value="DIRECT">
<brief>
- Use direct adjustment method
+ Use direct adjustment method
</brief>
<description>
- The DIRECT method computes the pointing differences in look
- directions of the SAMP1/LINE1 point and LAT1/LON1 coordinate.
- All entries in the InstrumentPointing table object are
- adjusted by a constant linear rotation. This method does not
+ The DIRECT method computes the pointing differences in look
+ directions of the SAMP1/LINE1 point and LAT1/LON1 coordinate.
+ All entries in the InstrumentPointing table object are
+ adjusted by a constant linear rotation. This method does not
currently support the TWIST option.
</description>
<exclusions>
@@ -270,7 +270,7 @@
<parameter name="SIGMA0">
<brief>Standard deviation of unit weight</brief>
<description>
- Convergence is reached when the solution parameters change by less
+ Convergence is reached when the solution parameters change by less
than Sigma0. Units: unitless.
</description>
<type>double</type>
@@ -288,8 +288,8 @@
<brief>Solve for camera twist</brief>
<default><item>False</item></default>
<description>
- In addition to angle1 and angle2, if this parameter is set the program
- will solve for the camera twist. This requires input of a second
+ In addition to angle1 and angle2, if this parameter is set the program
+ will solve for the camera twist. This requires input of a second
fixed coordinate (SAMP2,LINE2) and (LAT2,LON2)
</description>
<inclusions>
@@ -346,7 +346,7 @@
<brief>Radius, point #1</brief>
<internalDefault>Computed</internalDefault>
<description>
- Desired radius at the image coordinate (SAMP1,LINE1). It
+ Desired radius at the image coordinate (SAMP1,LINE1). It
will be automatically computed using the shape model that was
entered in the "spiceinit" application. Units: meters.
</description>
@@ -407,8 +407,8 @@
<brief>Radius, point #2</brief>
<internalDefault>Computed</internalDefault>
<description>
- Radius at the image coordinate (SAMP2,LINE2). It will be automatically
- computed using the shape model that was initialized in the "spiceinit"
+ Radius at the image coordinate (SAMP2,LINE2). It will be automatically
+ computed using the shape model that was initialized in the "spiceinit"
application. Units: meters.
</description>
<minimum inclusive="no">0.0</minimum>
diff --git a/isis/src/control/apps/jigsaw/jigsaw.xml b/isis/src/control/apps/jigsaw/jigsaw.xml
index d0bdd715b1..a3bdb4520e 100644
--- a/isis/src/control/apps/jigsaw/jigsaw.xml
+++ b/isis/src/control/apps/jigsaw/jigsaw.xml
@@ -6,7 +6,7 @@
<description>
<p>
- The <b>jigsaw</b> application performs a bundle adjustment on a group of overlapping Isis 3,
+ The <b>jigsaw</b> application performs a bundle adjustment on a group of overlapping Isis,
level 1, <def>cube</def>s from framing and/or line-scan cameras. The adjustment
simultaneously defines the selected image geometry information (camera pointing, spacecraft
position) and <def>control point</def> coordinates (x,y,z or lat,lon,radius) to reduce
@@ -25,7 +25,7 @@
<p>
The <b>jigsaw</b> application assumes <b>spiceinit</b> has been run on the input <def>cube</def>s so that
- <def>SPICE</def> is included in the Isis 3 <def>cube</def> labels in the Kernels group. In order to
+ <def>SPICE</def> is included in the Isis <def>cube</def> labels in the Kernels group. In order to
run the program, the user must provide a list of input <def>cube</def>s, an input <def>control
net</def>, the name of an output <def>control net</def>, and the adjustment parameters.
<b>jigsaw</b> outputs a new <def>control net</def> that includes the initial state of the
diff --git a/isis/src/control/apps/mat2cnet/main.cpp b/isis/src/control/apps/mat2cnet/main.cpp
index 0c0240e0fa..519cef17fe 100644
--- a/isis/src/control/apps/mat2cnet/main.cpp
+++ b/isis/src/control/apps/mat2cnet/main.cpp
@@ -39,23 +39,23 @@ void IsisMain() {
// Prepare the ISIS2 list of file names
FileList list2(ui.GetFileName("LIST2"));
- // Prepare the ISIS3 SNs, pass the progress object to SerialNumberList
+ // Prepare the ISIS SNs, pass the progress object to SerialNumberList
SerialNumberList snl(ui.GetFileName("LIST3"), true, &progress);
progress.CheckStatus();
if (list2.size() != snl.size()) {
QString msg = "Invalid input file number of lines. The ISIS2 file list [";
msg += ui.GetAsString("LIST2") + "] must contain the same number of lines ";
- msg += "as the ISIS3 file list [" + ui.GetAsString("LIST3") + "]";
+ msg += "as the ISIS file list [" + ui.GetAsString("LIST3") + "]";
throw IException(IException::User, msg, _FILEINFO_);
}
- progress.SetText("Mapping ISIS2 fsc numbers to ISIS3 serial numbers.");
+ progress.SetText("Mapping ISIS2 fsc numbers to ISIS serial numbers.");
progress.SetMaximumSteps(list2.size());
- // Setup a map between ISIS2 image number (fsc) and ISIS3 sn
+ // Setup a map between ISIS2 image number (fsc) and ISIS sn
// **NOTE:
- // The order of the ISIS2 and ISIS3 lists MUST correspond so that we can map
- // each ISIS2 FSC to the proper ISIS3 Serial Number.
+ // The order of the ISIS2 and ISIS lists MUST correspond so that we can map
+ // each ISIS2 FSC to the proper ISIS Serial Number.
// Otherwise, we would be required to write a separate routine for each
// mission to determine the corresponding serial number for a given FSC.
// Jeannie Backer 2011-06-30
diff --git a/isis/src/control/apps/mat2cnet/mat2cnet.xml b/isis/src/control/apps/mat2cnet/mat2cnet.xml
index 7035a02301..07c61f0a39 100644
--- a/isis/src/control/apps/mat2cnet/mat2cnet.xml
+++ b/isis/src/control/apps/mat2cnet/mat2cnet.xml
@@ -2,19 +2,19 @@
<application name="mat2cnet" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Converts an ISIS2 match point file to an ISIS3 control network file.
+ Converts an ISIS2 match point file to an ISIS control network file.
</brief>
<description>
<p>
- This program converts an ISIS2 match point file to an ISIS3 control
+ This program converts an ISIS2 match point file to an ISIS control
network file. It requires a list file of ISIS2 cubes and corresponding
- list file of ISIS3 cubes.
- <strong>Note: </strong> In order to identify which ISIS3 cube
+ list file of ISIS cubes.
+ <strong>Note: </strong> In order to identify which ISIS cube
corresponds to a particular ISIS2 cube, these lists must be the same
length and ordering. That is, if the first cube of the ISIS2 list was
imported from a particular raw image (observation), then the first cube
- of the ISIS3 list must be imported from the same image (observation),
+ of the ISIS list must be imported from the same image (observation),
and so on for each cube listed.
</p>
<p>
@@ -33,7 +33,7 @@
the RAND PPP file for these points will be copied to the RAND PPP log.
</p>
<p>
- The following indicates how the ISIS2 Class is translated to an ISIS3 MeasureType
+ The following indicates how the ISIS2 Class is translated to an ISIS MeasureType
<ul>
<li> "T" (Truth) is translated to Reference</li>
<li> "S" (SubPixel) is tranlated to RegisteredSubPixel</li>
@@ -132,7 +132,7 @@
A text file containing one column of ISIS2 cube file names. Every
file used in the match point file should be represented in this list.
<strong>Note: </strong> The cubes must be available for the program
- to open and must be in the same order as the ISIS3 cubes in LIST3.
+ to open and must be in the same order as the ISIS cubes in LIST3.
An error will be thrown if the number of files in this list does not
match the number of files in LIST2, or if the IMAGE_ID and
IMAGE_NUMBER keywords are not found in any ISIS2 cube.
@@ -150,7 +150,7 @@
</brief>
<description>
Use this parameter to specify the ISIS2 match point file to be
- converted to an ISIS3 control network file. This file must contain a
+ converted to an ISIS control network file. This file must contain a
two line header. The first line of the header must have the
"Matchpoint Total" keyword and a value for the number of measures in
the match point file. The second line of the header should be text
@@ -265,11 +265,11 @@
file will be locked. That is, if this parameter is set to true,
then each ControPoint in the output ControlNet that exists in the
RAND PPP file will have the keyword EditLock set to true. This
- prevents any editing by most ISIS3 programs (with the exception of
+ prevents any editing by most ISIS programs (with the exception of
jigsaw) to the latitude, longitude, and radius values associated to
the points in the RAND PPP file. Furthermore, the reference measures
of each of these points will be treated as if they are locked,
- preventing any editing by ISIS3 programs to the sample and line
+ preventing any editing by ISIS programs to the sample and line
values found in the match point file. This parameter defaults to TRUE
and can only be used if the INPUTPPP parameter is set to true.
</description>
@@ -301,10 +301,10 @@
<type>filename</type>
<fileMode>input</fileMode>
<brief>
- List of ISIS3 input cubes in the match point file.
+ List of ISIS input cubes in the match point file.
</brief>
<description>
- A text file containing one column of ISIS3 cube file names. Every
+ A text file containing one column of ISIS cube file names. Every
file used in the match point file should be represented in this list.
<strong>Note: </strong> The cubes must be available for the program to
open and must be in the same order as the ISIS2 cubes in LIST2. An
@@ -320,7 +320,7 @@
<type>filename</type>
<fileMode>output</fileMode>
<brief>
- ISIS3 output control network file
+ ISIS output control network file
</brief>
<description>
Use this parameter to specify the file name of the output ISIS3
@@ -409,7 +409,7 @@
<description>
Run the <strong>mat2cnet</strong> application to create a ControlNet
file from a match point file with corresponding ISIS2 cubelist and
- ISIS3 cubelist
+ ISIS cubelist
</description>
</terminalInterface>
<guiInterfaces>
diff --git a/isis/src/control/apps/mat2cnet/tsts/errors/Makefile b/isis/src/control/apps/mat2cnet/tsts/errors/Makefile
index 89934167a4..ff00ceeb2c 100644
--- a/isis/src/control/apps/mat2cnet/tsts/errors/Makefile
+++ b/isis/src/control/apps/mat2cnet/tsts/errors/Makefile
@@ -13,7 +13,7 @@ commands:
match=$(INPUT)/match.mat \
list3=$(OUTPUT)/cub3.lis \
onet=$(OUTPUT)/out.net \
- description="Isis2 list has different number of lines from Isis3 list" \
+ description="Isis2 list has different number of lines from Isis list" \
networkid=TestNet01 \
target=Titan 2> $(OUTPUT)/error1.txt > /dev/null;
ls $(INPUT)/Isis2_cube*.cub >& $(OUTPUT)/cub2.lis;
diff --git a/isis/src/control/apps/pointreg/pointreg.xml b/isis/src/control/apps/pointreg/pointreg.xml
index 6a544e322d..728d1f85bb 100644
--- a/isis/src/control/apps/pointreg/pointreg.xml
+++ b/isis/src/control/apps/pointreg/pointreg.xml
@@ -11,7 +11,7 @@
algorithm (DEFFILE) to subpixel (or, less commonly, whole pixel) register
individual <def>control point</def> coordinates (<def link="Control
Measure">measures</def>) that have been collected between images and
- stored within an input <def>control network</def>.
+ stored within an input <def>control network</def>.
</p>
<p>
@@ -22,17 +22,17 @@
<p>
Most often the input control point network (CNET) contains
- <def>A priori</def> <def>sample</def> and <def>line</def> positions based
- on the original <def>SPICE</def> of the images. For creating an initial
- control network, refer to applications such as "autoseed", "seedgrid"
- and/or "qnet".
+ <def>A priori</def> <def>sample</def> and <def>line</def> positions based
+ on the original <def>SPICE</def> of the images. For creating an initial
+ control network, refer to applications such as "autoseed", "seedgrid"
+ and/or "qnet".
</p>
<p>
Due to many factors, often including inaccuracies with the camera
pointing, the control point's initial measure coordinates between images
are not registered to one another with subpixel -- or even whole pixel --
- accuracy.
+ accuracy.
</p>
<p>
@@ -40,17 +40,17 @@
"pointreg" (POINTS, MEASURES) in order to know whether or not to work on a
control point and the associated measures. "Pointreg" in turn adds or
updates fields in the output control network that reflect the successes
- and failures of the pattern matching for each measure.
+ and failures of the pattern matching for each measure.
</p>
<p>
- For every control point within the input network, there are control measures.
- For each control point there is always one and only one associated
- <def link="Reference Measure">reference measure</def>, either set explicitly
- or chosen at runtime implicitly. Explicit references are chosen and defined
- as such either manually by users ("qnet") or automatically with an interest
- operator ("cnetref"). Implicit references are determined when no explicit
- reference is set for a point. In such a case, the control point will provide
+ For every control point within the input network, there are control measures.
+ For each control point there is always one and only one associated
+ <def link="Reference Measure">reference measure</def>, either set explicitly
+ or chosen at runtime implicitly. Explicit references are chosen and defined
+ as such either manually by users ("qnet") or automatically with an interest
+ operator ("cnetref"). Implicit references are determined when no explicit
+ reference is set for a point. In such a case, the control point will provide
its first valid (Ignore=False) measure to act as the reference.
</p>
@@ -63,14 +63,14 @@ every other measure in the point to that reference location. An
<p>
With every successful subpixel registration for each control measure, the
- sample and line values within the output control network
- are updated with the resulting subpixel coordinates. Note that the reference
+ sample and line values within the output control network
+ are updated with the resulting subpixel coordinates. Note that the reference
measure coordinates are "fixed" while the coordinates of the remaining measures
- are adjusted based on the pattern matching output. The a priori sample and
- line fields are assigned the original starting input pixel coordinates.
- Applications such as "qnet", will report the sample and line shift as a result
- of "pointreg". "Pointreg" will also update the control network with the
- pattern match coefficient results such as minimum and maximum "pixel z-score"
+ are adjusted based on the pattern matching output. The a priori sample and
+ line fields are assigned the original starting input pixel coordinates.
+ Applications such as "qnet", will report the sample and line shift as a result
+ of "pointreg". "Pointreg" will also update the control network with the
+ pattern match coefficient results such as minimum and maximum "pixel z-score"
and "goodness of fit".
</p>
@@ -84,7 +84,7 @@ every other measure in the point to that reference location. An
<category>
<categoryItem>Control Networks</categoryItem>
- </category>
+ </category>
<seeAlso>
<applications>
@@ -95,7 +95,7 @@ every other measure in the point to that reference location. An
</applications>
<documents>
<document>
- <title>Pattern Matching in ISIS 3</title>
+ <title>Pattern Matching in ISIS</title>
<source>
<filename>PatternMatch.html</filename>
<path>../../../../documents/PatternMatch/</path>
@@ -105,11 +105,11 @@ every other measure in the point to that reference location. An
</seeAlso>
<history>
- <change name="Jacob Danton" date="2006-01-11">
+ <change name="Jacob Danton" date="2006-01-11">
Original Version
</change>
<change name="Brendan George" date="2006-10-02">
- Modified call to get current time to use Time class, instead of
+ Modified call to get current time to use Time class, instead of
Application class
</change>
<change name="Steven Lambright" date="2007-07-23">
@@ -120,48 +120,48 @@ every other measure in the point to that reference location. An
</change>
<change name="Steven Koechle" date="2008-11-13">
Added option to process ignored points (new parameters PROCESSIGNORED and
- PROCESSVALID), Added FlatFile output parameter. Renamed IGNORED
- parameter to OUTPUTIGNORED Renamed UNMEASURED parameter to
+ PROCESSVALID), Added FlatFile output parameter. Renamed IGNORED
+ parameter to OUTPUTIGNORED Renamed UNMEASURED parameter to
OUTPUTUNMEASURED.
</change>
<change name="Steven Koechle" date="2008-11-13">
Fixed pointreg to modify ChooserName and DateTime of measures it alters
</change>
- <change name="Jeannie Walldren" date="2008-11-14">
- Changed PROCESSIGNORED parameter name to REGISTERIGNOREDONLY. Removed
- PROCESSVALID parameter since "valid" points are only processed if
- REGISTERIGNOREDONLY is false. Changed extension filters for CNET,
- TEMPLATE and TO from (*.txt *.lis *.lst) to *.net, *.def, and *.net,
+ <change name="Jeannie Walldren" date="2008-11-14">
+ Changed PROCESSIGNORED parameter name to REGISTERIGNOREDONLY. Removed
+ PROCESSVALID parameter since "valid" points are only processed if
+ REGISTERIGNOREDONLY is false. Changed extension filters for CNET,
+ TEMPLATE and TO from (*.txt *.lis *.lst) to *.net, *.def, and *.net,
respectively. Fixed bug in program so ignored control points only are
included in the output when the OUTPUTIGNORED parameter is selected. And
- valid points are always included in the output.
+ valid points are always included in the output.
</change>
<change name="Jeannie Walldren" date="2008-11-17">
- Added examples to xml file. Fixed bug so that, when registering ignored
- points, any unmeasured ControlMeasure is omitted if OUTPUTUNMEASURED=no.
+ Added examples to xml file. Fixed bug so that, when registering ignored
+ points, any unmeasured ControlMeasure is omitted if OUTPUTUNMEASURED=no.
Added appTest cases for new parameters.
</change>
<change name="Steven Koechle" date="2008-11-18">
Added PointId to the FlatFile output
</change>
<change name="Jeff Anderson" date="2008-12-04">
- Modified to allow control points to have measures which can't be
+ Modified to allow control points to have measures which can't be
registered to not be ignored. The point is not ignored so long as at
- least two measures can be registered.
+ least two measures can be registered.
</change>
<change name="Jeannie Walldren" date="2008-12-22">
- Modified to set successfully registered measures to Ignore=False and
- Ignore=True otherwise.
+ Modified to set successfully registered measures to Ignore=False and
+ Ignore=True otherwise.
</change>
<change name="Jeannie Walldren" date="2008-12-23">
- Modified code that sets point's "Ignore" Keyword to "True" only if it is
- neither a ground point nor a held point. Modified app test truth files to
+ Modified code that sets point's "Ignore" Keyword to "True" only if it is
+ neither a ground point nor a held point. Modified app test truth files to
reflect changes.
</change>
<change name="Jeannie Walldren" date="2008-12-24">
- Modified flatfile parameter to output the lines and samples of the
- original and registered measurements, rather than the original and
- reference measurements. Modified app test truth files to
+ Modified flatfile parameter to output the lines and samples of the
+ original and registered measurements, rather than the original and
+ reference measurements. Modified app test truth files to
reflect changes.
</change>
<change name="Steven Lambright" date="2009-02-13">
@@ -174,23 +174,23 @@ every other measure in the point to that reference location. An
Auto registration parameters are now placed into the print file.
</change>
<change name="Jeannie Walldren" date="2010-03-18">
- Added REGISTERNEWONLY parameter to allow user to choose to keep
- previously registered points unchanged. If checked, this will only
- process new points that do not have ChooserName = "Application
+ Added REGISTERNEWONLY parameter to allow user to choose to keep
+ previously registered points unchanged. If checked, this will only
+ process new points that do not have ChooserName = "Application
pointreg".
</change>
<change name="Travis Addair" date="2010-04-13">
- Template now defaults to a def file containing all keywords with their
+ Template now defaults to a def file containing all keywords with their
default values (except for ValidMinimum and ValidMaximum).
</change>
<change name="Travis Addair" date="2010-04-23">
- Parameter REGISTERNEWONLY will now only process new points that have
- MeasureType = Estimated
+ Parameter REGISTERNEWONLY will now only process new points that have
+ MeasureType = Estimated
</change>
<change name="Travis Addair" date="2010-04-29">
- Groups PointsToRegister and MeasuresToRegister have been condensed into
- WhatToRegister with radio buttons allowing the user to specify whether
- to process non-ignored, ignored, or all Control Points, and estimated or
+ Groups PointsToRegister and MeasuresToRegister have been condensed into
+ WhatToRegister with radio buttons allowing the user to specify whether
+ to process non-ignored, ignored, or all Control Points, and estimated or
all Control Measures.
</change>
<change name="Travis Addair" date="2010-05-25">
@@ -263,7 +263,7 @@ every other measure in the point to that reference location. An
registered.
</description>
<filter>
- *.net
+ *.net
</filter>
</parameter>
@@ -324,11 +324,11 @@ every other measure in the point to that reference location. An
</brief>
<description>
This file will contain data collected from the pointreg application.
- The data will be comma-separated and contain a line for each
- measurement of all non-ignored points in the output control net.
+ The data will be comma-separated and contain a line for each
+ measurement of all non-ignored points in the output control net.
This will include the point id, orignal sample position, original
line position, new sample position, new line position, sample
- difference, line difference, minimum z-score, maximum z-score, and
+ difference, line difference, minimum z-score, maximum z-score, and
goodness of fit.
</description>
<internalDefault>None</internalDefault>
@@ -364,7 +364,7 @@ every other measure in the point to that reference location. An
run of "pointreg" will remain in the output control network.
</description>
<default><item>True</item></default>
- </parameter>
+ </parameter>
</group>
<group name="WhatToRegister">
@@ -374,14 +374,14 @@ every other measure in the point to that reference location. An
How to handle "ignored" points
</brief>
<description>
- If this parameter is set to IGNORED, ignored points will be
- reprocessed. It may set them to "valid" if they are acceptable in a
- new tolerance range. If this parameter is set to the default value of
- NOTIGNORED, only the "valid" or "non-ignored" points will be
- registered. Otherwise, if it is set to ALL, every point will be
- registered. Note that if certain Control Points will not be
- processed, it implies that all their measures will not be
- processed as well.
+ If this parameter is set to IGNORED, ignored points will be
+ reprocessed. It may set them to "valid" if they are acceptable in a
+ new tolerance range. If this parameter is set to the default value of
+ NOTIGNORED, only the "valid" or "non-ignored" points will be
+ registered. Otherwise, if it is set to ALL, every point will be
+ registered. Note that if certain Control Points will not be
+ processed, it implies that all their measures will not be
+ processed as well.
</description>
<default><item>NONIGNORED</item></default>
<list>
@@ -392,7 +392,7 @@ every other measure in the point to that reference location. An
<description>
This option will result in all Control Points being processed
regardless of "Ignored" status.
- </description>
+ </description>
</option>
<option value="NONIGNORED">
<brief>
@@ -431,7 +431,7 @@ every other measure in the point to that reference location. An
selected -- will be processed. A measure is considered a "candidate"
if it has never been run through "pointreg" before, or if it was
unsuccessfully registed in a previous run.
- </description>
+ </description>
<default><item>ALL</item></default>
<list>
<option value="ALL">
@@ -452,11 +452,11 @@ every other measure in the point to that reference location. An
successfully registered before ("candidates") being processed.
</description>
</option>
- </list>
+ </list>
</parameter>
- </group>
+ </group>
- <group name="Validation">
+ <group name="Validation">
<parameter name="VALIDATE">
<type>string</type>
<brief>
@@ -628,25 +628,25 @@ every other measure in the point to that reference location. An
<examples>
<example>
<brief>
- Default registration settings include ignored and unmeasured points in
+ Default registration settings include ignored and unmeasured points in
the output control net.
</brief>
<description>
In this example, the pointreg application is used to register valid, i.e.
- "non-ignored", points from two images and output a new control network
+ "non-ignored", points from two images and output a new control network
that includes ignored control points and unmeasured control measures.
</description>
<terminalInterface>
<commandLine>
- files=../IN/fileList.lis cnet=../IN/controlNet.net
- template=../IN/autoRegTemplate.def
- to=../OUT/outputIgnoredAndUnmeasured.net
+ files=../IN/fileList.lis cnet=../IN/controlNet.net
+ template=../IN/autoRegTemplate.def
+ to=../OUT/outputIgnoredAndUnmeasured.net
flatfile=../OUT/outputIgnoredAndUnmeasured.txt
</commandLine>
<description>
- This example shows the use of pointreg with the OUTPUTIGNORED and
- OUTPUTUNMEASURED parameters left with the default values of "True" and
- REGISTERIGNOREDONLY with the default value of "False". This implies
+ This example shows the use of pointreg with the OUTPUTIGNORED and
+ OUTPUTUNMEASURED parameters left with the default values of "True" and
+ REGISTERIGNOREDONLY with the default value of "False". This implies
that only "non-ignored" points will be registered but all control
points and control measures will be included in the output.
</description>
@@ -657,10 +657,10 @@ every other measure in the point to that reference location. An
<brief>
Example GUI
</brief>
- <description>
- Screen shot of GUI with parameters filled in to perform point
- registration that includes ignored control points and unmeasured
- control measures in the output but does not register the ignore
+ <description>
+ Screen shot of GUI with parameters filled in to perform point
+ registration that includes ignored control points and unmeasured
+ control measures in the output but does not register the ignore
points.
</description>
<thumbnail src="assets/thumbs/outputIgnoredAndUnmeasuredGuiThumb.jpg" width="200" height="169" caption="pointreg GUI" />
@@ -673,8 +673,8 @@ every other measure in the point to that reference location. An
View Input File List
</brief>
<description>
- Input text file containing a list of all files in the control
- network. All cubes in this list should be located in the same
+ Input text file containing a list of all files in the control
+ network. All cubes in this list should be located in the same
directory that the application is run in.
</description>
<parameterName>
@@ -686,8 +686,8 @@ every other measure in the point to that reference location. An
View Entire Input ControlNet
</brief>
<description>
- Input text file containing the initial control network. There are
- 10 control points, one is passed in as an ignored point and two
+ Input text file containing the initial control network. There are
+ 10 control points, one is passed in as an ignored point and two
are unmeasured.
</description>
<parameterName>
@@ -699,8 +699,8 @@ every other measure in the point to that reference location. An
View Auto Registration Template
</brief>
<description>
- Input auto registration template file in PVL format containing the
- registration algorithm information to be used to register the
+ Input auto registration template file in PVL format containing the
+ registration algorithm information to be used to register the
points.
</description>
<parameterName>
@@ -712,8 +712,8 @@ every other measure in the point to that reference location. An
View resulting ControlNet
</brief>
<description>
- Output control network file containing the registered information.
- Notice that all ignored points and unmeasured control measures are
+ Output control network file containing the registered information.
+ Notice that all ignored points and unmeasured control measures are
kept in this network.
</description>
<parameterName>
@@ -725,8 +725,8 @@ every other measure in the point to that reference location. An
View resulting flat file
</brief>
<description>
- Output flat file containing the data collected from the pointreg
- application.
+ Output flat file containing the data collected from the pointreg
+ application.
</description>
<parameterName>
TO
@@ -737,7 +737,7 @@ every other measure in the point to that reference location. An
View resulting application log.
</brief>
<description>
- This log is output to the screeen and contains a count of the
+ This log is output to the screeen and contains a count of the
following: "ignore" points upon completion; validated, registered,
unregistered and unmeasured ControlMeasures; successful and failed
registrations; PatternChip and SurfaceModel statistics.
@@ -751,21 +751,21 @@ every other measure in the point to that reference location. An
unmeasured points in the output control net.
</brief>
<description>
- In this example, the pointreg application is used to register "ignore"
- points from two images and output a new control network that includes
+ In this example, the pointreg application is used to register "ignore"
+ points from two images and output a new control network that includes
valid and ignored points and unmeasured control measures.
</description>
<terminalInterface>
<commandLine>
- files=../IN/fileList.lis cnet=../IN/controlNet.net
- template=../IN/autoRegTemplate.def
- to=../OUT/outputIgnoredAndUnmeasuredRegIgnored.net
- flatfile=../OUT/outputIgnoredAndUnmeasuredRegIgnored.txt
+ files=../IN/fileList.lis cnet=../IN/controlNet.net
+ template=../IN/autoRegTemplate.def
+ to=../OUT/outputIgnoredAndUnmeasuredRegIgnored.net
+ flatfile=../OUT/outputIgnoredAndUnmeasuredRegIgnored.txt
registerignoredonly=yes
</commandLine>
<description>
- This example shows the use of pointreg with the OUTPUTIGNORED,
- OUTPUTUNMEASURED and REGISTERIGNOREDONLY parameters as "True". This
+ This example shows the use of pointreg with the OUTPUTIGNORED,
+ OUTPUTUNMEASURED and REGISTERIGNOREDONLY parameters as "True". This
implies that only "ignored" points will be registered but all control
points and control measures will be included in the output.
</description>
@@ -776,10 +776,10 @@ every other measure in the point to that reference location. An
<brief>
Example GUI
</brief>
- <description>
+ <description>
Screen shot of GUI with parameters filled in to perform ignored
- point registration that includes ignored control points and
- unmeasured control measures in the output but does not register
+ point registration that includes ignored control points and
+ unmeasured control measures in the output but does not register
the "valid" points.
</description>
<thumbnail src="assets/thumbs/outputIgnoredAndUnmeasuredRegIgnoreGuiThumb.jpg" width="200" height="169" caption="pointreg GUI" />
@@ -792,8 +792,8 @@ every other measure in the point to that reference location. An
View Input File List
</brief>
<description>
- Input text file containing a list of all files in the control
- network. All cubes in this list should be located in the same
+ Input text file containing a list of all files in the control
+ network. All cubes in this list should be located in the same
directory that the application is run in.
</description>
<parameterName>
@@ -805,8 +805,8 @@ every other measure in the point to that reference location. An
View Entire Input ControlNet
</brief>
<description>
- Input text file containing the initial control network. There are
- 10 control points, one is passed in as an ignored point and two
+ Input text file containing the initial control network. There are
+ 10 control points, one is passed in as an ignored point and two
are unmeasured.
</description>
<parameterName>
@@ -818,8 +818,8 @@ every other measure in the point to that reference location. An
View Auto Registration Template
</brief>
<description>
- Input auto registration template file in PVL format containing the
- registration algorithm information to be used to register the
+ Input auto registration template file in PVL format containing the
+ registration algorithm information to be used to register the
points.
</description>
<parameterName>
@@ -831,8 +831,8 @@ every other measure in the point to that reference location. An
View resulting ControlNet
</brief>
<description>
- Output control network file containing the registered information.
- Notice that all ignored points and unmeasured control measures are
+ Output control network file containing the registered information.
+ Notice that all ignored points and unmeasured control measures are
kept in this network.
</description>
<parameterName>
@@ -844,8 +844,8 @@ every other measure in the point to that reference location. An
View resulting flat file
</brief>
<description>
- Output flat file containing the data collected from the pointreg
- application.
+ Output flat file containing the data collected from the pointreg
+ application.
</description>
<parameterName>
TO
@@ -856,36 +856,36 @@ every other measure in the point to that reference location. An
View resulting application log.
</brief>
<description>
- This log is output to the screeen and contains a count of the
+ This log is output to the screeen and contains a count of the
following: "ignore" points upon completion; validated, registered,
unregistered and unmeasured ControlMeasures; successful and failed
registrations; PatternChip and SurfaceModel statistics.
</description>
</dataFile>
</dataFiles>
- </example>
+ </example>
<example>
<brief>
Register "valid" points in a control network and omit ignored points and
unmeasured measures from the output control net.
</brief>
<description>
- In this example, the pointreg application is used to register "valid"
- points from two images and output a new control network that omits
+ In this example, the pointreg application is used to register "valid"
+ points from two images and output a new control network that omits
ignored control points and unmeasured control measures.
</description>
<terminalInterface>
<commandLine>
- files=../IN/fileList.lis cnet=../IN/controlNet.net
- template=../IN/autoRegTemplate.def
- to=../OUT/discardIgnoredAndUnmeasured.net
- flatfile=../OUT/discardIgnoredAndUnmeasured.txt
+ files=../IN/fileList.lis cnet=../IN/controlNet.net
+ template=../IN/autoRegTemplate.def
+ to=../OUT/discardIgnoredAndUnmeasured.net
+ flatfile=../OUT/discardIgnoredAndUnmeasured.txt
outputignored=no outputunmeasured=no
</commandLine>
<description>
- This example shows the use of pointreg with the OUTPUTIGNORED,
- OUTPUTUNMEASURED and REGISTERIGNOREDONLY parameters set to "False".
- This implies that only "valid" points will be registered and
+ This example shows the use of pointreg with the OUTPUTIGNORED,
+ OUTPUTUNMEASURED and REGISTERIGNOREDONLY parameters set to "False".
+ This implies that only "valid" points will be registered and
included inthe output control network.
</description>
</terminalInterface>
@@ -895,9 +895,9 @@ every other measure in the point to that reference location. An
<brief>
Example GUI
</brief>
- <description>
- Screen shot of GUI with parameters filled in to perform point
- registration that omits ignored control points and unmeasured
+ <description>
+ Screen shot of GUI with parameters filled in to perform point
+ registration that omits ignored control points and unmeasured
control measures from the output.
</description>
<thumbnail src="assets/thumbs/discardIgnoredAndUnmeasuredGuiThumb.jpg" width="200" height="169" caption="pointreg GUI" />
@@ -910,8 +910,8 @@ every other measure in the point to that reference location. An
View Input File List
</brief>
<description>
- Input text file containing a list of all files in the control
- network. All cubes in this list should be located in the same
+ Input text file containing a list of all files in the control
+ network. All cubes in this list should be located in the same
directory that the application is run in.
</description>
<parameterName>
@@ -923,8 +923,8 @@ every other measure in the point to that reference location. An
View Entire Input ControlNet
</brief>
<description>
- Input text file containing the initial control network. There are
- 10 control points, one is passed in as an ignored point and two
+ Input text file containing the initial control network. There are
+ 10 control points, one is passed in as an ignored point and two
are unmeasured.
</description>
<parameterName>
@@ -936,8 +936,8 @@ every other measure in the point to that reference location. An
View Auto Registration Template
</brief>
<description>
- Input auto registration template file in PVL format containing the
- registration algorithm information to be used to register the
+ Input auto registration template file in PVL format containing the
+ registration algorithm information to be used to register the
points.
</description>
<parameterName>
@@ -949,8 +949,8 @@ every other measure in the point to that reference location. An
View resulting ControlNet
</brief>
<description>
- Output control network file containing the registered information.
- Notice that all ignored points and unmeasured control measures are
+ Output control network file containing the registered information.
+ Notice that all ignored points and unmeasured control measures are
omitted from this network.
</description>
<parameterName>
@@ -962,8 +962,8 @@ every other measure in the point to that reference location. An
View resulting flat file
</brief>
<description>
- Output flat file containing the data collected from the pointreg
- application.
+ Output flat file containing the data collected from the pointreg
+ application.
</description>
<parameterName>
TO
@@ -974,37 +974,37 @@ every other measure in the point to that reference location. An
View resulting application log.
</brief>
<description>
- This log is output to the screeen and contains a count of the
+ This log is output to the screeen and contains a count of the
following: "ignore" points upon completion; validated, registered,
unregistered and unmeasured ControlMeasures; successful and failed
registrations; PatternChip and SurfaceModel statistics.
</description>
</dataFile>
</dataFiles>
- </example>
+ </example>
<example>
<brief>
Register "ignored" points in a control network and omit ignored and
unmeasured points in the output control net.
</brief>
<description>
- In this example, the pointreg application is used to register "ignore"
- points from two images and output a new control network that omits
+ In this example, the pointreg application is used to register "ignore"
+ points from two images and output a new control network that omits
ignored control points and unmeasured control measures.
</description>
<terminalInterface>
<commandLine>
- files=../IN/fileList.lis cnet=../IN/controlNet.net
- template=../IN/autoRegTemplate.def
- to=../OUT/discardIgnoredAndUnmeasuredRegIgnored.net
- flatfile=../OUT/discardIgnoredAndUnmeasuredRegIgnored.txt
+ files=../IN/fileList.lis cnet=../IN/controlNet.net
+ template=../IN/autoRegTemplate.def
+ to=../OUT/discardIgnoredAndUnmeasuredRegIgnored.net
+ flatfile=../OUT/discardIgnoredAndUnmeasuredRegIgnored.txt
outputignored=no outputunmeasured=no registerignoredonly=yes
</commandLine>
<description>
- This example shows the use of pointreg with the OUTPUTIGNORED and
- OUTPUTUNMEASURED parameters set to "False" and REGISTERIGNOREDONLY
- set to "True". This implies that only "ignored" points will be
- registered while ignored control points and unmeasured control
+ This example shows the use of pointreg with the OUTPUTIGNORED and
+ OUTPUTUNMEASURED parameters set to "False" and REGISTERIGNOREDONLY
+ set to "True". This implies that only "ignored" points will be
+ registered while ignored control points and unmeasured control
measures are omitted from the output.
</description>
</terminalInterface>
@@ -1014,9 +1014,9 @@ every other measure in the point to that reference location. An
<brief>
Example GUI
</brief>
- <description>
+ <description>
Screen shot of GUI with parameters filled in to perform ignored
- point registration that omits ignored control points and
+ point registration that omits ignored control points and
unmeasured control measures from the output.
</description>
<thumbnail src="assets/thumbs/discardIgnoredAndUnmeasuredRegIgnoreGuiThumb.jpg" width="200" height="169" caption="pointreg GUI" />
@@ -1029,8 +1029,8 @@ every other measure in the point to that reference location. An
View Input File List
</brief>
<description>
- Input text file containing a list of all files in the control
- network. All cubes in this list should be located in the same
+ Input text file containing a list of all files in the control
+ network. All cubes in this list should be located in the same
directory that the application is run in.
</description>
<parameterName>
@@ -1042,8 +1042,8 @@ every other measure in the point to that reference location. An
View Entire Input ControlNet
</brief>
<description>
- Input text file containing the initial control network. There are
- 10 control points, one is passed in as an ignored point and two
+ Input text file containing the initial control network. There are
+ 10 control points, one is passed in as an ignored point and two
are unmeasured.
</description>
<parameterName>
@@ -1055,8 +1055,8 @@ every other measure in the point to that reference location. An
View Auto Registration Template
</brief>
<description>
- Input auto registration template file in PVL format containing the
- registration algorithm information to be used to register the
+ Input auto registration template file in PVL format containing the
+ registration algorithm information to be used to register the
points.
</description>
<parameterName>
@@ -1068,8 +1068,8 @@ every other measure in the point to that reference location. An
View resulting ControlNet
</brief>
<description>
- Output control network file containing the registered information.
- Notice that all ignored points and unmeasured control measures are
+ Output control network file containing the registered information.
+ Notice that all ignored points and unmeasured control measures are
omitted from this network.
</description>
<parameterName>
@@ -1081,8 +1081,8 @@ every other measure in the point to that reference location. An
View resulting flat file
</brief>
<description>
- Output flat file containing the data collected from the pointreg
- application.
+ Output flat file containing the data collected from the pointreg
+ application.
</description>
<parameterName>
TO
@@ -1093,36 +1093,36 @@ every other measure in the point to that reference location. An
View resulting application log.
</brief>
<description>
- This log is output to the screeen and contains a count of the
+ This log is output to the screeen and contains a count of the
following: "ignore" points upon completion; validated, registered,
unregistered and unmeasured ControlMeasures; successful and failed
registrations; PatternChip and SurfaceModel statistics.
</description>
</dataFile>
</dataFiles>
- </example>
+ </example>
<example>
<brief>
- Register "new" measures in a control network only and leave previously
+ Register "new" measures in a control network only and leave previously
processed as they are in the output control net.
</brief>
<description>
- In this example, the pointreg application is used to register only "new"
- measures that have been added to the control net after a prior run in
+ In this example, the pointreg application is used to register only "new"
+ measures that have been added to the control net after a prior run in
pointreg.
</description>
<terminalInterface>
<commandLine>
- files=../IN/fileList.lis cnet=../IN/controlNet.net
- template=../IN/autoRegTemplate.def
- to=../OUT/registerNewOnly.net
- flatfile=../OUT/registerNewOnly.txt
+ files=../IN/fileList.lis cnet=../IN/controlNet.net
+ template=../IN/autoRegTemplate.def
+ to=../OUT/registerNewOnly.net
+ flatfile=../OUT/registerNewOnly.txt
registernewonly=yes
</commandLine>
<description>
- This example shows the use of pointreg with the REGISTERNEWONLY set
- to "True". This implies that only "new" measurements will be
- registered while measures that have been previously registered are
+ This example shows the use of pointreg with the REGISTERNEWONLY set
+ to "True". This implies that only "new" measurements will be
+ registered while measures that have been previously registered are
not reprocessed.
</description>
</terminalInterface>
@@ -1132,8 +1132,8 @@ every other measure in the point to that reference location. An
<brief>
Example GUI
</brief>
- <description>
- Screen shot of GUI with parameters filled in to perform new
+ <description>
+ Screen shot of GUI with parameters filled in to perform new
measure registration only.
</description>
<thumbnail src="assets/thumbs/registerNewOnlyThumb.jpg" width="200" height="151" caption="pointreg GUI" />
@@ -1146,8 +1146,8 @@ every other measure in the point to that reference location. An
View Input File List
</brief>
<description>
- Input text file containing a list of all files in the control
- network. All cubes in this list should be located in the same
+ Input text file containing a list of all files in the control
+ network. All cubes in this list should be located in the same
directory that the application is run in.
</description>
<parameterName>
@@ -1159,9 +1159,9 @@ every other measure in the point to that reference location. An
View Entire Input ControlNet
</brief>
<description>
- Input text file containing the initial control network. There are
- 10 control points, each with the first as reference, the second
- previously run through pointreg, and the third added with
+ Input text file containing the initial control network. There are
+ 10 control points, each with the first as reference, the second
+ previously run through pointreg, and the third added with
cnetadd.
</description>
<parameterName>
@@ -1173,8 +1173,8 @@ every other measure in the point to that reference location. An
View Auto Registration Template
</brief>
<description>
- Input auto registration template file in PVL format containing the
- registration algorithm information to be used to register the
+ Input auto registration template file in PVL format containing the
+ registration algorithm information to be used to register the
points.
</description>
<parameterName>
@@ -1186,8 +1186,8 @@ every other measure in the point to that reference location. An
View resulting ControlNet
</brief>
<description>
- Output control network file containing the registered information.
- Notice that all middle points have not been changed, but the third
+ Output control network file containing the registered information.
+ Notice that all middle points have not been changed, but the third
points have now been registered by pointreg.
</description>
<parameterName>
@@ -1199,8 +1199,8 @@ every other measure in the point to that reference location. An
View resulting flat file
</brief>
<description>
- Output flat file containing the data collected from the pointreg
- application.
+ Output flat file containing the data collected from the pointreg
+ application.
</description>
<parameterName>
TO
@@ -1211,13 +1211,13 @@ every other measure in the point to that reference location. An
View resulting application log.
</brief>
<description>
- This log is output to the screeen and contains a count of the
+ This log is output to the screeen and contains a count of the
following: "ignore" points upon completion; validated, registered,
unregistered and unmeasured ControlMeasures; successful and failed
registrations; PatternChip and SurfaceModel statistics.
</description>
</dataFile>
</dataFiles>
- </example>
+ </example>
</examples>
</application>
diff --git a/isis/src/control/objs/BundleAdjust/BundleAdjust.h b/isis/src/control/objs/BundleAdjust/BundleAdjust.h
index 2f57e09557..bdb9afbaa9 100644
--- a/isis/src/control/objs/BundleAdjust/BundleAdjust.h
+++ b/isis/src/control/objs/BundleAdjust/BundleAdjust.h
@@ -63,7 +63,7 @@ namespace Isis {
/**
* @brief An image bundle adjustment object.
*
- * BundleAdjust is used to perform a bundle adjustment on overlapping ISIS 3 cubes.
+ * BundleAdjust is used to perform a bundle adjustment on overlapping ISIS cubes.
* Using the collineariy condition, BundleAdjust can construct a system of normal equations
* and then using the CHOLMOD library, solve that system.
*
@@ -324,10 +324,10 @@ namespace Isis {
* point for converting point sigmas to/from radians from/to meters.
* References #4649 and #501.
* @history 2019-05-15 Debbie A. Cook - The call to CameraGroundMap::GetXY in method
- * ComputePartials was modified to not check for points on the back side
+ * ComputePartials was modified to not check for points on the back side
* of the planet when computing instrument coordinates during the bundle
- * adjustment. In the future a control net diagnostic program might be
- * useful to detect any points not visible on an image based on the exterior
+ * adjustment. In the future a control net diagnostic program might be
+ * useful to detect any points not visible on an image based on the exterior
* orientation of the image. References #2591.
*/
class BundleAdjust : public QObject {
diff --git a/isis/src/control/objs/ControlNetVersioner/ControlNetFileHeaderV0002.proto b/isis/src/control/objs/ControlNetVersioner/ControlNetFileHeaderV0002.proto
index 935a450620..594f9c10d7 100644
--- a/isis/src/control/objs/ControlNetVersioner/ControlNetFileHeaderV0002.proto
+++ b/isis/src/control/objs/ControlNetVersioner/ControlNetFileHeaderV0002.proto
@@ -1,4 +1,4 @@
-// Protocol buffer header descriptor for Isis3 Control Networks
+// Protocol buffer header descriptor for Isis Control Networks
//
// 2017-12-11 Kristin Berry - Separated header and point into separate files.
// 2018-06-13 Jesse Mapel - Added flag to indicate it is a protobuf 2 file
diff --git a/isis/src/control/objs/ControlNetVersioner/ControlNetFileHeaderV0005.proto b/isis/src/control/objs/ControlNetVersioner/ControlNetFileHeaderV0005.proto
index 873eaea75c..b4f3b2b004 100644
--- a/isis/src/control/objs/ControlNetVersioner/ControlNetFileHeaderV0005.proto
+++ b/isis/src/control/objs/ControlNetVersioner/ControlNetFileHeaderV0005.proto
@@ -1,4 +1,4 @@
-// Protocol buffer header descriptor for Isis3 Control Networks
+// Protocol buffer header descriptor for Isis Control Networks
//
// 2018-06-13 Jesse Mapel - Added flag to indicate it is a protobuf 2 file
diff --git a/isis/src/control/objs/ControlNetVersioner/ControlNetFileProtoV0001.proto b/isis/src/control/objs/ControlNetVersioner/ControlNetFileProtoV0001.proto
index 1a5de0b431..413b4ad7b2 100644
--- a/isis/src/control/objs/ControlNetVersioner/ControlNetFileProtoV0001.proto
+++ b/isis/src/control/objs/ControlNetVersioner/ControlNetFileProtoV0001.proto
@@ -1,4 +1,4 @@
-// Protocol buffer descriptor for ISIS3 ControlNet class hierarchy
+// Protocol buffer descriptor for ISIS ControlNet class hierarchy
//
// 2017-12-11 Kristin Berry - Separated top-level messages into different files
// 2018-06-13 Jesse Mapel - Added flag to indicate it is a protobuf 2 file
diff --git a/isis/src/control/objs/ControlNetVersioner/ControlNetLogDataProtoV0001.proto b/isis/src/control/objs/ControlNetVersioner/ControlNetLogDataProtoV0001.proto
index 57bce985fe..e14bc75ca0 100644
--- a/isis/src/control/objs/ControlNetVersioner/ControlNetLogDataProtoV0001.proto
+++ b/isis/src/control/objs/ControlNetVersioner/ControlNetLogDataProtoV0001.proto
@@ -1,4 +1,4 @@
-// Protocol buffer descriptor for ISIS3 ControlNet class hierarchy
+// Protocol buffer descriptor for ISIS ControlNet class hierarchy
//
// 2017-12-11 Kristin Berry - Separated top-level messages into different files
// 2018-06-13 Jesse Mapel - Added flag to indicate it is a protobuf 2 file
diff --git a/isis/src/control/objs/ControlNetVersioner/ControlPointFileEntryV0002.proto b/isis/src/control/objs/ControlNetVersioner/ControlPointFileEntryV0002.proto
index 7f2b7ac6ff..4759df5800 100644
--- a/isis/src/control/objs/ControlNetVersioner/ControlPointFileEntryV0002.proto
+++ b/isis/src/control/objs/ControlNetVersioner/ControlPointFileEntryV0002.proto
@@ -1,4 +1,4 @@
-// Protocol buffer control point descriptor for Isis3 Control Networks
+// Protocol buffer control point descriptor for Isis Control Networks
//
// 2011-06-07 Tracie Sucharski/Debbie Cook - Changed PointType
// Ground ----> Fixed
diff --git a/isis/src/control/objs/ControlNetVersioner/ControlPointFileEntryV0005.proto b/isis/src/control/objs/ControlNetVersioner/ControlPointFileEntryV0005.proto
index 5a2078118c..cc4278f87f 100644
--- a/isis/src/control/objs/ControlNetVersioner/ControlPointFileEntryV0005.proto
+++ b/isis/src/control/objs/ControlNetVersioner/ControlPointFileEntryV0005.proto
@@ -1,4 +1,4 @@
-// Protocol buffer control point descriptor for Isis3 Control Networks
+// Protocol buffer control point descriptor for Isis Control Networks
//
// 2018-06-13 Jesse Mapel - Added flag to indicate it is a protobuf 2 file
diff --git a/isis/src/dev/apps/camdev/camdev.xml b/isis/src/dev/apps/camdev/camdev.xml
index bd3dcbf34a..52ded45b13 100644
--- a/isis/src/dev/apps/camdev/camdev.xml
+++ b/isis/src/dev/apps/camdev/camdev.xml
@@ -25,14 +25,14 @@
<ul>
<li>Evaluate the individual bands in order to establish subsequent
image processing steps</li>
- <li>Specify as input to other ISIS3 programs such as fx and photomet</li>
+ <li>Specify as input to other ISIS programs such as fx and photomet</li>
<li>Demonstrate the result of each selected option</li>
<li>Determine how the images are mosaicked together after the
Level2 images are created from the Level1 images with backplanes </li>
</ul>
</p>
<p>
- All ISIS3 applications default to the following geometric reference if a camera model exists:
+ All ISIS applications default to the following geometric reference if a camera model exists:
<ul>
<li>Longitude Domain = 360, longitude range reported from 0 to 360</li>
<li>Latitude System = Ocentric</li>
@@ -59,13 +59,13 @@
</p>
<p>
The parameters "morphology" and "albedo" are specifically designed to be used
- by the ISIS3 mosaic programs. A mosaic program will automatically compare
+ by the ISIS mosaic programs. A mosaic program will automatically compare
two pixel values to determine how each pixel is mosaicked into an output
file, which depends on whether a morphology-based or an albedo-based
product is desired. The program computes a
<def link="Digital Number">DN</def> value for every input pixel based on
the formulas listed below and outputs the value to a backplane band.
- These backplane bands are used by the ISIS3 mosaic programs. The following are
+ These backplane bands are used by the ISIS mosaic programs. The following are
equations for "morphology" and "albedo" options:
<blockquote>
<dl>
diff --git a/isis/src/docsys/Application/build/TOCindex.xsl b/isis/src/docsys/Application/build/TOCindex.xsl
index 438e234947..acc1839b30 100644
--- a/isis/src/docsys/Application/build/TOCindex.xsl
+++ b/isis/src/docsys/Application/build/TOCindex.xsl
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
exclude-result-prefixes="xmlns fo">
<!--
@@ -15,8 +15,8 @@ Deborah Lee Soltesz
-->
- <xsl:output
- media-type="text/html"
+ <xsl:output
+ media-type="text/html"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
doctype-system="http://www.w3.org/TR/html4/loose.dtd"
indent="yes"
@@ -72,7 +72,7 @@ Deborah Lee Soltesz
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(usgsAnalytics, s);
}
- })();
+ })();
]]></xsl:comment>
<xsl:text>
</xsl:text>
</script>
@@ -92,7 +92,7 @@ Deborah Lee Soltesz
<p style="margin-top:10px; margin-bottom:0px;">
- ISIS 3 Application Documentation</p>
+ ISIS Application Documentation</p>
<hr/>
@@ -293,4 +293,3 @@ Deborah Lee Soltesz
</xsl:template>
</xsl:stylesheet>
-
diff --git a/isis/src/docsys/Application/build/TOCindex_alpha.xsl b/isis/src/docsys/Application/build/TOCindex_alpha.xsl
index 43a39a6b04..c254f81048 100644
--- a/isis/src/docsys/Application/build/TOCindex_alpha.xsl
+++ b/isis/src/docsys/Application/build/TOCindex_alpha.xsl
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
exclude-result-prefixes="xmlns fo">
<!--
@@ -15,8 +15,8 @@ Deborah Lee Soltesz
-->
- <xsl:output
- media-type="text/html"
+ <xsl:output
+ media-type="text/html"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
doctype-system="http://www.w3.org/TR/html4/loose.dtd"
indent="yes"
@@ -71,7 +71,7 @@ Deborah Lee Soltesz
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(usgsAnalytics, s);
}
- })();
+ })();
]]></xsl:comment>
<xsl:text>
</xsl:text>
</script>
@@ -91,7 +91,7 @@ Deborah Lee Soltesz
<p style="margin-top:10px; margin-bottom:0px;">
- ISIS 3 Application Documentation</p>
+ ISIS Application Documentation</p>
<hr/>
@@ -153,4 +153,3 @@ Deborah Lee Soltesz
</xsl:template>
</xsl:stylesheet>
-
diff --git a/isis/src/docsys/Application/build/TOCindex_category.xsl b/isis/src/docsys/Application/build/TOCindex_category.xsl
index 2c709fdea9..11de1fc512 100644
--- a/isis/src/docsys/Application/build/TOCindex_category.xsl
+++ b/isis/src/docsys/Application/build/TOCindex_category.xsl
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
exclude-result-prefixes="xmlns fo">
<!--
@@ -15,8 +15,8 @@ Deborah Lee Soltesz
-->
- <xsl:output
- media-type="text/html"
+ <xsl:output
+ media-type="text/html"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
doctype-system="http://www.w3.org/TR/html4/loose.dtd"
indent="yes"
@@ -70,7 +70,7 @@ Deborah Lee Soltesz
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(usgsAnalytics, s);
}
- })();
+ })();
]]></xsl:comment>
<xsl:text>
</xsl:text>
</script>
@@ -89,7 +89,7 @@ Deborah Lee Soltesz
<p style="margin-top:10px; margin-bottom:0px;">
- ISIS 3 Application Documentation</p>
+ ISIS Application Documentation</p>
<hr/>
@@ -217,4 +217,3 @@ Deborah Lee Soltesz
</xsl:template>
</xsl:stylesheet>
-
diff --git a/isis/src/docsys/Application/build/TOCindex_oldvnew.xsl b/isis/src/docsys/Application/build/TOCindex_oldvnew.xsl
index f36076ddb4..d454f92a9f 100644
--- a/isis/src/docsys/Application/build/TOCindex_oldvnew.xsl
+++ b/isis/src/docsys/Application/build/TOCindex_oldvnew.xsl
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
exclude-result-prefixes="xmlns fo">
<!--
@@ -14,8 +14,8 @@ Deborah Lee Soltesz
-->
- <xsl:output
- media-type="text/html"
+ <xsl:output
+ media-type="text/html"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
doctype-system="http://www.w3.org/TR/html4/loose.dtd"
indent="yes"
@@ -69,7 +69,7 @@ Deborah Lee Soltesz
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(usgsAnalytics, s);
}
- })();
+ })();
]]></xsl:comment>
<xsl:text>
</xsl:text>
</script>
@@ -88,7 +88,7 @@ Deborah Lee Soltesz
<p style="margin-top:10px; margin-bottom:0px;">
- Isis 3 Application Documentation</p>
+ Isis Application Documentation</p>
<hr/>
@@ -111,9 +111,9 @@ Deborah Lee Soltesz
<p>
-Several applications have been renamed or evolved into multiple applications in
-the newest version of ISIS. The following table cross-references the current
-application names in ISIS 3 to the names of applications in previous versions of ISIS.
+Several applications have been renamed or evolved into multiple applications in
+the newest version of ISIS. The following table cross-references the current
+application names in ISIS to the names of applications in previous versions of ISIS.
</p>
@@ -127,7 +127,7 @@ application names in ISIS 3 to the names of applications in previous versions of
Previous Versions
</th>
<th class="tableCellLevel1_th">
- ISIS 3
+ ISIS
</th>
</tr>
@@ -176,4 +176,3 @@ application names in ISIS 3 to the names of applications in previous versions of
</xsl:template>
</xsl:stylesheet>
-
diff --git a/isis/src/docsys/Application/presentation/PrinterFriendly/styles/IsisApplicationDocStyle.xsl b/isis/src/docsys/Application/presentation/PrinterFriendly/styles/IsisApplicationDocStyle.xsl
index 75b38cf06b..a779627122 100644
--- a/isis/src/docsys/Application/presentation/PrinterFriendly/styles/IsisApplicationDocStyle.xsl
+++ b/isis/src/docsys/Application/presentation/PrinterFriendly/styles/IsisApplicationDocStyle.xsl
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
exclude-result-prefixes="xmlns fo">
<!--
@@ -14,8 +14,8 @@ Deborah Lee Soltesz
-->
- <xsl:output
- media-type="text/html"
+ <xsl:output
+ media-type="text/html"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
doctype-system="http://www.w3.org/TR/html4/loose.dtd"
indent="yes"
@@ -86,7 +86,7 @@ Deborah Lee Soltesz
<p style="margin-top:10px; margin-bottom:0px;">
- ISIS 3 Application Documentation</p>
+ ISIS Application Documentation</p>
<hr/>
@@ -186,10 +186,10 @@ Deborah Lee Soltesz
This program replaces the following
<xsl:choose>
<xsl:when test="count(oldName/item) > 1">
- applications
+ applications
</xsl:when>
<xsl:otherwise>
- application
+ application
</xsl:otherwise>
</xsl:choose>
existing in previous versions of ISIS:
@@ -955,7 +955,7 @@ document.write("<img src=\"]]><xsl:value-of select="normalize-space(thumbnail/@s
<xsl:variable name="text">
<xsl:choose>
<xsl:when test ="@link">
- <xsl:value-of select="normalize-space(@link)"/>
+ <xsl:value-of select="normalize-space(@link)"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="normalize-space(.)"/>
@@ -992,4 +992,3 @@ document.write("<img src=\"]]><xsl:value-of select="normalize-space(thumbnail/@s
</xsl:stylesheet>
-
diff --git a/isis/src/docsys/Application/presentation/ProgTester/IsisApplicationDocStyle.xsl b/isis/src/docsys/Application/presentation/ProgTester/IsisApplicationDocStyle.xsl
index f9324a3750..c537f294f5 100644
--- a/isis/src/docsys/Application/presentation/ProgTester/IsisApplicationDocStyle.xsl
+++ b/isis/src/docsys/Application/presentation/ProgTester/IsisApplicationDocStyle.xsl
@@ -474,12 +474,12 @@ Deborah Lee Soltesz
border-color: #68A ;
background-color: #9BD ;
}
-
+
/** Warning Class for displaying Warning messages. */
span.warning {
color: #ff0000;
font-weight: bold;
- }
+ }
</style>
<!-- Dynamic analytics insertion to prevent running on local URLs -->
<xsl:text>
</xsl:text>
@@ -494,7 +494,7 @@ Deborah Lee Soltesz
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(usgsAnalytics, s);
}
- })();
+ })();
]]></xsl:comment>
<xsl:text>
</xsl:text>
</script>
@@ -509,7 +509,7 @@ Deborah Lee Soltesz
<p style="margin-top:10px; margin-bottom:0px;">
- ISIS 3 Application Documentation</p>
+ ISIS Application Documentation</p>
<hr/>
@@ -598,10 +598,10 @@ Deborah Lee Soltesz
This program replaces the following
<xsl:choose>
<xsl:when test="count(oldName/item) > 1">
- applications
+ applications
</xsl:when>
<xsl:otherwise>
- application
+ application
</xsl:otherwise>
</xsl:choose>
existing in previous versions of ISIS:
@@ -1356,7 +1356,7 @@ document.write("<img src=\"]]><xsl:value-of select="normalize-space(thumbnail/@s
<xsl:variable name="text">
<xsl:choose>
<xsl:when test ="@link">
- <xsl:value-of select="normalize-space(@link)"/>
+ <xsl:value-of select="normalize-space(@link)"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="normalize-space(.)"/>
@@ -1392,4 +1392,3 @@ document.write("<img src=\"]]><xsl:value-of select="normalize-space(thumbnail/@s
</xsl:template>
</xsl:stylesheet>
-
diff --git a/isis/src/docsys/Application/presentation/Tabbed/styles/IsisApplicationDocStyle.xsl b/isis/src/docsys/Application/presentation/Tabbed/styles/IsisApplicationDocStyle.xsl
index a72d978962..96037958e1 100644
--- a/isis/src/docsys/Application/presentation/Tabbed/styles/IsisApplicationDocStyle.xsl
+++ b/isis/src/docsys/Application/presentation/Tabbed/styles/IsisApplicationDocStyle.xsl
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
exclude-result-prefixes="xmlns fo">
@@ -15,8 +15,8 @@ Deborah Lee Soltesz
-->
- <xsl:output
- media-type="text/html"
+ <xsl:output
+ media-type="text/html"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
doctype-system="http://www.w3.org/TR/html4/loose.dtd"
indent="yes"
@@ -211,7 +211,7 @@ Deborah Lee Soltesz
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(usgsAnalytics, s);
}
- })();
+ })();
]]></xsl:comment>
<xsl:text>
</xsl:text>
</script>
@@ -239,7 +239,7 @@ Deborah Lee Soltesz
<p style="margin-top:10px; margin-bottom:0px;">
- ISIS 3 Application Documentation</p>
+ ISIS Application Documentation</p>
<hr/>
@@ -342,10 +342,10 @@ Deborah Lee Soltesz
This program replaces the following
<xsl:choose>
<xsl:when test="count(oldName/item) > 1">
- applications
+ applications
</xsl:when>
<xsl:otherwise>
- application
+ application
</xsl:otherwise>
</xsl:choose>
existing in previous versions of ISIS:
@@ -1135,7 +1135,7 @@ document.write("<img src=\"]]><xsl:value-of select="normalize-space(thumbnail/@s
<xsl:variable name="text">
<xsl:choose>
<xsl:when test ="@link">
- <xsl:value-of select="normalize-space(@link)"/>
+ <xsl:value-of select="normalize-space(@link)"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="normalize-space(.)"/>
@@ -1172,4 +1172,3 @@ document.write("<img src=\"]]><xsl:value-of select="normalize-space(thumbnail/@s
</xsl:stylesheet>
-
diff --git a/isis/src/docsys/Object/build/Developer.conf b/isis/src/docsys/Object/build/Developer.conf
index 3b55100309..5e2edaa815 100644
--- a/isis/src/docsys/Object/build/Developer.conf
+++ b/isis/src/docsys/Object/build/Developer.conf
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places.
# The default value is: My Project.
-PROJECT_NAME = "Isis 3 Developer Reference"
+PROJECT_NAME = "Isis Developer Reference"
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version
@@ -1120,7 +1120,7 @@ HTML_FOOTER = build/IsisObjectFooter.html
# obsolete.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_STYLESHEET =
+HTML_STYLESHEET =
# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
# cascading style sheets that are included after the standard style sheets
@@ -1133,7 +1133,7 @@ HTML_STYLESHEET =
# list). For an example see the documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_EXTRA_STYLESHEET = ../assets/styles/IsisStyleCommon.css assets/styles/IsisObjectAPIDocStyle.css
+HTML_EXTRA_STYLESHEET = ../assets/styles/IsisStyleCommon.css assets/styles/IsisObjectAPIDocStyle.css
# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the HTML output directory. Note
diff --git a/isis/src/docsys/Object/build/isisDoxyDefs.doxydef b/isis/src/docsys/Object/build/isisDoxyDefs.doxydef
index a53e1ff425..11d3a08cfa 100644
--- a/isis/src/docsys/Object/build/isisDoxyDefs.doxydef
+++ b/isis/src/docsys/Object/build/isisDoxyDefs.doxydef
@@ -19,8 +19,8 @@
* Namespace containing standardized %Isis error messages
*
* IsisMessage is not a class. It only contains a namespace which consists of
- * all the standardized Isis error messages. These messages should be used
- * when applicable instead of constructing the message string inside the
+ * all the standardized Isis error messages. These messages should be used
+ * when applicable instead of constructing the message string inside the
* object or application.
*
*/
@@ -102,7 +102,7 @@
* @history 2017-01-19 Kristin Berry - Added the ExoMars Trace Gas Orbiter mission. References #4584
* @history 2017-06-26 Jesse Mapel - Added the Juno mission.
* @history 2018-03-27 Tyler Wilson - Added the Europa Clipper mission.
- *
+ *
* @todo Develop two different pages for API vs. Programmer
* documentation. 2004-11-03
* @todo Make "std" namespace invisible... probably not gonna happen
@@ -260,7 +260,7 @@
*
* @{
*/
-
+
// APOLLO
/**
* \defgroup Apollo Apollo
@@ -293,7 +293,7 @@
* USGS Astrogeology: http://astrogeology.usgs.gov/Missions/Cassini/
*
*/
-
+
// CHANDRAYAAN1
/**
* \defgroup Chandrayaan1 Chandrayaan 1
@@ -336,12 +336,12 @@
*
* Mission site: https://www.jpl.nasa.gov/missions/europa-clipper/
*
- */
+ */
// DAWN
/**
* \defgroup Dawn Dawn
*
- * These objects provide functionality for manipulating data from the 2007 Dawn
+ * These objects provide functionality for manipulating data from the 2007 Dawn
* mission to the celestial bodies Vesta and Ceres.
*
* Mission site: http://dawn.jpl.nasa.gov/
@@ -356,7 +356,7 @@
*
* These objects provide functionality for manipulating data from the
* ExoMars Trace Gas Orbiter mission to Mars which launched on March 14, 2016.
- *
+ *
* Mission site: http://exploration.esa.int/mars/46475-trace-gas-orbiter/
*
*/
@@ -382,24 +382,24 @@
*
* USGS Astrogeology: http://astrogeology.usgs.gov/Missions/Galileo/
*/
-
+
// HAYABUSA
/**
* \defgroup Hayabusa Hayabusa
*
- * These objects provide functionality for manipulating data from the 2003 Hayabusa
+ * These objects provide functionality for manipulating data from the 2003 Hayabusa
* mission to the small asteroid Itokawa.
*
* Mission site: http://www.isas.jaxa.jp/e/enterp/missions/hayabusa/
*
*/
-
+
// HAYABUSA2
/**
* \defgroup Hayabusa2 Hayabusa2
*
- * These objects provide functionality for manipulating data from the 2014 Hayabusa2
- * mission to the asteroid Ryugu. The purpose of this mission is to study the origin
+ * These objects provide functionality for manipulating data from the 2014 Hayabusa2
+ * mission to the asteroid Ryugu. The purpose of this mission is to study the origin
* and evolution of the solar system as well as materials for life by leveraging the
* experience acquired from the Hayabusa mission.
*
@@ -413,30 +413,30 @@
*
* These objects provide functionality for manipulating data from the
* Juno mission to Jupiter.
- *
+ *
* Mission site: https://www.nasa.gov/mission_pages/juno/main/index.html
*
*/
-
+
// KAGUYA
/**
* \defgroup Kaguya Kaguya
*
* These objects provide functionality for manipulating data from the 2007
- * Kaguya mission to the moon.
+ * Kaguya mission to the moon.
*
* Mission site: http://www.isas.jaxa.jp/e/enterp/missions/kaguya/
*
*/
-
- // LUNAR ORBITER
+
+ // LUNAR ORBITER
/**
- * \defgroup LunarOrbiter Lunar Orbiter
+ * \defgroup LunarOrbiter Lunar Orbiter
*
* These objects provide functionality for manipulating data from the
* Lunar Orbiter missions of the 1960's.
*
- * Mission summary: http://www.lpi.usra.edu/expmoon/orbiter/orbiter.html
+ * Mission summary: http://www.lpi.usra.edu/expmoon/orbiter/orbiter.html
*
* USGS Astrogeology: http://astrogeology.usgs.gov/Missions/LunarOrbiter/
*
@@ -449,7 +449,7 @@
* These objects provide functionality for manipulating data from the
* Lunar Reconnaissance Orbiter (2008).
*
- * Mission site: http://lunar.gsfc.nasa.gov/
+ * Mission site: http://lunar.gsfc.nasa.gov/
*
*/
@@ -485,7 +485,7 @@
* USGS Astrogeology: http://astrogeology.usgs.gov/Missions/Rovers/
*
*/
-
+
// MARS EXPRESS
/**
* \defgroup MarsExpress Mars Express
@@ -575,8 +575,8 @@
* \defgroup NearEarthAsteroidRendezvousShoemaker Near Earth Asteroid Rendezvous - Shoemaker
*
* These objects provide functionality for manipulating data from the
- * Near Earth Asteroid Rendezvous - Shoemaker mission. Near Earth
- * Asteroid Rendezvous, launched in 1996, flew by Earth, Eros, and
+ * Near Earth Asteroid Rendezvous - Shoemaker mission. Near Earth
+ * Asteroid Rendezvous, launched in 1996, flew by Earth, Eros, and
* Mathilde, orbited Eros, then landed on Eros.
*
* Mission site: http://nssdc.gsfc.nasa.gov/nmc/masterCatalog.do?sc=1996-008A
@@ -590,39 +590,39 @@
* These objects provide functionality for manipulating data from the
* New Horizons mission. New Horizons is part of NASA's New Frontiers
* Program.
- * New Horizons launched January 19, 2006 and is expected to spend five months studying
+ * New Horizons launched January 19, 2006 and is expected to spend five months studying
* Pluto durring the summer of 2015.
*
* Mission site: http://www.nasa.gov/mission_pages/newhorizons/main/#.VA4QY8NuH4I
*
*/
-
+
// OSIRIS-REx
/**
* \defgroup OSIRIS-REx OSIRIS-REx
*
- * These objects provide functionality for manipulating data from the
+ * These objects provide functionality for manipulating data from the
* OSIRIS-REx asteroid sample return mission. The 2016 OSIRIS-REx mission's
* key objectives include mapping out the asteroid Bennu's surface, analyzing
- * a sample of Bennu's regolith, documenting the sample site, calculating Bennu's
+ * a sample of Bennu's regolith, documenting the sample site, calculating Bennu's
* orbit deviation, and comparing observations made at the asteroid to observations
* made on Earth.
*
* Mission site: http://www.asteroidmission.org/
*
*/
-
+
// ROBOTIC LUNAR OBSERVATORY
/**
* \defgroup RoboticLunarObservatory Robotic Lunar Observatory
*
- * These objects provide functionality for manipulating data from the Robotic Lunar
+ * These objects provide functionality for manipulating data from the Robotic Lunar
* Observatory at the United States Geological Survey in Flagstaff, Arizona.
*
* Mission site: http://www.moon-cal.org/
*
*/
-
+
// ROSETTA
/**
* \defgroup Rosetta Rosetta
@@ -633,7 +633,7 @@
* Mission site: http://rosetta.esa.int/
*
*/
-
+
// SMALL MISSIONS FOR ADVANCED RESEARCH AND TECHNOLOGY 1
/**
* \defgroup SmallMissionsForAdvancedResearchAndTechnology1 Small Missions for Advanced Research and Technology 1
@@ -645,7 +645,7 @@
* Mission site: http://sci.esa.int/smart-1/
*
*/
-
+
// VIKING
/**
* \defgroup Viking Viking
@@ -684,7 +684,7 @@
/* @} end of Missions group */
-// MAIN PAGE - content of the table-of-contents page for the %Isis 3 Object Documentation
+// MAIN PAGE - content of the table-of-contents page for the %Isis Object Documentation
// TODO: look at using doxy conditional processing to have different main page for
// API vs. Programmer Docs
diff --git a/isis/src/docsys/build/ApiChanges.xsl b/isis/src/docsys/build/ApiChanges.xsl
index 22cd520aa2..992c68c6a1 100644
--- a/isis/src/docsys/build/ApiChanges.xsl
+++ b/isis/src/docsys/build/ApiChanges.xsl
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
exclude-result-prefixes="xmlns fo">
<xsl:param name="dirParam"/>
@@ -113,8 +113,8 @@
<bibliography>
<title>API Changes</title>
- <brief>Changes since the last Isis 3 release</brief>
- <description>Listing of the classes that have changed in Isis 3 since the last major release.</description>
+ <brief>Changes since the last ISIS release</brief>
+ <description>Listing of the classes that have changed in Isis since the last major release.</description>
<author>Steven Lambright</author>
<date>2011-12-27</date>
</bibliography>
diff --git a/isis/src/docsys/build/General.xsl b/isis/src/docsys/build/General.xsl
index 8f64ab24a3..c99fd064fb 100644
--- a/isis/src/docsys/build/General.xsl
+++ b/isis/src/docsys/build/General.xsl
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
exclude-result-prefixes="xmlns fo">
<!--
@@ -15,8 +15,8 @@ Deborah Lee Soltesz
-->
- <xsl:output
- media-type="text/html"
+ <xsl:output
+ media-type="text/html"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
doctype-system="http://www.w3.org/TR/html4/loose.dtd"
indent="yes"
@@ -69,7 +69,7 @@ Deborah Lee Soltesz
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(usgsAnalytics, s);
}
- })();
+ })();
]]></xsl:comment>
<xsl:text>
</xsl:text>
</script>
@@ -88,7 +88,7 @@ Deborah Lee Soltesz
<p style="margin-top:10px; padding-bottom:0px;">
- ISIS 3 Documentation</p>
+ ISIS Documentation</p>
<hr/>
@@ -289,4 +289,3 @@ Deborah Lee Soltesz
</xsl:template>
</xsl:stylesheet>
-
diff --git a/isis/src/docsys/build/Guides.xsl b/isis/src/docsys/build/Guides.xsl
index 9d05c05d8b..e3971b5d9d 100644
--- a/isis/src/docsys/build/Guides.xsl
+++ b/isis/src/docsys/build/Guides.xsl
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
exclude-result-prefixes="xmlns fo">
<!--
@@ -15,8 +15,8 @@ Deborah Lee Soltesz
-->
- <xsl:output
- media-type="text/html"
+ <xsl:output
+ media-type="text/html"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
doctype-system="http://www.w3.org/TR/html4/loose.dtd"
indent="yes"
@@ -69,7 +69,7 @@ Deborah Lee Soltesz
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(usgsAnalytics, s);
}
- })();
+ })();
]]></xsl:comment>
<xsl:text>
</xsl:text>
</script>
@@ -88,7 +88,7 @@ Deborah Lee Soltesz
<p style="margin-top:10px; padding-bottom:0px;">
- ISIS 3 Documentation</p>
+ ISIS Documentation</p>
<hr/>
@@ -116,7 +116,7 @@ Deborah Lee Soltesz
Coming Soon! ISIS Workshop!</strong>
This section has been temporarily removed.
We will soon be unveiling the new ISIS Workshop
-which will feature tutorials on using Isis 3
+which will feature tutorials on using Isis
for everyone from beginners to advanced users!
</p>
@@ -329,4 +329,3 @@ for everyone from beginners to advanced users!
</xsl:stylesheet>
-
diff --git a/isis/src/docsys/build/IsisPrimaryPageBuild.xsl b/isis/src/docsys/build/IsisPrimaryPageBuild.xsl
index b5c7bf8805..88c1e72c4d 100644
--- a/isis/src/docsys/build/IsisPrimaryPageBuild.xsl
+++ b/isis/src/docsys/build/IsisPrimaryPageBuild.xsl
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
exclude-result-prefixes="xmlns fo">
<!--
@@ -17,13 +17,13 @@ Deborah Lee Soltesz
-->
<xsl:include href="menu.xsl"/>
-
-
+
+
<xsl:param name="filenameParam"/>
-
-
- <xsl:output
- media-type="text/html"
+
+
+ <xsl:output
+ media-type="text/html"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
doctype-system="http://www.w3.org/TR/html4/loose.dtd"
indent="yes"
@@ -82,7 +82,7 @@ Deborah Lee Soltesz
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(usgsAnalytics, s);
}
- })();
+ })();
]]></xsl:comment>
<xsl:text>
</xsl:text>
</script>
@@ -103,7 +103,7 @@ Deborah Lee Soltesz
ISIS 2 Documentation
</xsl:when>
<xsl:otherwise>
- ISIS 3 Documentation
+ ISIS Documentation
</xsl:otherwise>
</xsl:choose>
</p>
@@ -304,4 +304,3 @@ Deborah Lee Soltesz
</xsl:template>
</xsl:stylesheet>
-
diff --git a/isis/src/docsys/build/IsisSubPageBuild.xsl b/isis/src/docsys/build/IsisSubPageBuild.xsl
index 8d8db2fdfa..23daf4b429 100644
--- a/isis/src/docsys/build/IsisSubPageBuild.xsl
+++ b/isis/src/docsys/build/IsisSubPageBuild.xsl
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
exclude-result-prefixes="xmlns fo">
<!--
@@ -19,8 +19,8 @@ Deborah Lee Soltesz
- <xsl:output
- media-type="text/html"
+ <xsl:output
+ media-type="text/html"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
doctype-system="http://www.w3.org/TR/html4/loose.dtd"
indent="yes"
@@ -28,12 +28,12 @@ Deborah Lee Soltesz
omit-xml-declaration="yes"/>
<xsl:include href="menu.xsl"/>
-
+
<xsl:param name="filenameParam"/>
<xsl:output
- media-type="text/html"
+ media-type="text/html"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
doctype-system="http://www.w3.org/TR/html4/loose.dtd"
indent="yes"
@@ -91,7 +91,7 @@ Deborah Lee Soltesz
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(usgsAnalytics, s);
}
- })();
+ })();
]]></xsl:comment>
<xsl:text>
</xsl:text>
</script>
@@ -112,7 +112,7 @@ Deborah Lee Soltesz
ISIS 2 Documentation
</xsl:when>
<xsl:otherwise>
- ISIS 3 Documentation
+ ISIS Documentation
</xsl:otherwise>
</xsl:choose>
</p>
@@ -316,4 +316,3 @@ Deborah Lee Soltesz
</xsl:template>
</xsl:stylesheet>
-
diff --git a/isis/src/docsys/build/ParameterChanges.xsl b/isis/src/docsys/build/ParameterChanges.xsl
index dce010facf..aa30ed2048 100644
--- a/isis/src/docsys/build/ParameterChanges.xsl
+++ b/isis/src/docsys/build/ParameterChanges.xsl
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
exclude-result-prefixes="xmlns fo">
<xsl:param name="dirParam"/>
@@ -152,8 +152,8 @@
<bibliography>
<title>Application Parameter Changes</title>
- <brief>Changes since the last ISIS 3 release</brief>
- <description>Listing of the parameters that have changed in ISIS 3 since the last major release.</description>
+ <brief>Changes since the last ISIS release</brief>
+ <description>Listing of the parameters that have changed in ISIS since the last major release.</description>
<author>Steven Lambright</author>
<date>2011-10-05</date>
</bibliography>
diff --git a/isis/src/docsys/build/TechnicalInfo.xsl b/isis/src/docsys/build/TechnicalInfo.xsl
index 15f7404290..6858a2f9a4 100644
--- a/isis/src/docsys/build/TechnicalInfo.xsl
+++ b/isis/src/docsys/build/TechnicalInfo.xsl
@@ -88,7 +88,7 @@ Deborah Lee Soltesz
<p style="margin-top:10px; padding-bottom:0px;">
- ISIS 3 Documentation</p>
+ ISIS Documentation</p>
<hr/>
@@ -179,7 +179,7 @@ Deborah Lee Soltesz
<a href="https://github.com/USGS-Astrogeology/ISIS3#installation">Installing ISIS</a>
</th>
<td>
- Downloading and installing ISIS3
+ Downloading and installing ISIS
<br/>
</td>
</tr>
@@ -219,8 +219,8 @@ Deborah Lee Soltesz
</p>
<p>
<a href="../documents/CodingStandards/CodingStandards.html" target="_blank">
- ISIS 3 Coding Standards and Style Guide</a><br/>
- Coding standards for ISIS 3 developers
+ ISIS Coding Standards and Style Guide</a><br/>
+ Coding standards for ISIS developers
</p>
diff --git a/isis/src/docsys/build/UserDocs.xsl b/isis/src/docsys/build/UserDocs.xsl
index 243485b417..30802b16af 100644
--- a/isis/src/docsys/build/UserDocs.xsl
+++ b/isis/src/docsys/build/UserDocs.xsl
@@ -88,7 +88,7 @@ Deborah Lee Soltesz
<p style="margin-top:10px; padding-bottom:0px;">
- ISIS 3 Documentation</p>
+ ISIS Documentation</p>
<hr/>
@@ -221,7 +221,7 @@ Deborah Lee Soltesz
Old vs. New Program Names</a>
</th>
<td>
- A useful table cross-referencing the current application names in ISIS 3 to the names of applications in previous versions of ISIS.
+ A useful table cross-referencing the current application names in ISIS to the names of applications in previous versions of ISIS.
</td>
</tr>
diff --git a/isis/src/docsys/build/menu.xsl b/isis/src/docsys/build/menu.xsl
index 77b9d0fea3..ebb68d6ec1 100644
--- a/isis/src/docsys/build/menu.xsl
+++ b/isis/src/docsys/build/menu.xsl
@@ -40,7 +40,7 @@ Deborah Lee Soltesz
<hr/>
<h2>
- ISIS 3
+ ISIS
</h2>
<div>
diff --git a/isis/src/docsys/documents/CodingStandards/CodingStandards.xml b/isis/src/docsys/documents/CodingStandards/CodingStandards.xml
index 54074a3c5b..16c285db31 100644
--- a/isis/src/docsys/documents/CodingStandards/CodingStandards.xml
+++ b/isis/src/docsys/documents/CodingStandards/CodingStandards.xml
@@ -95,8 +95,8 @@
<h2> <a name="intro">Introduction</a> </h2>
<p>
This document will describe the coding standards for maintaining <strong>
- ISIS 3</strong> source code. It was created to ensure that the <strong>
- ISIS 3</strong> package is programmed for consistency, readability and ease
+ ISIS</strong> source code. It was created to ensure that the <strong>
+ ISIS</strong> package is programmed for consistency, readability and ease
of future maintenance. This document does not attempt to address every
possible issue. However, the guidelines that have been outlined should not
be deviated from, except under special situations.
@@ -105,7 +105,7 @@
<h2> <a name="formatting">Formatting</a> </h2>
<h3> <a name="indenting">Indenting</a> </h3>
<p>
- The general indenting scheme for <strong>ISIS 3</strong> is 2 spaces (no
+ The general indenting scheme for <strong>ISIS</strong> is 2 spaces (no
tabs). Wrapped lines of code should be indented a minimum of 4 spaces
from the beginning line of the command. Programmers may choose to indent
more than 4 spaces to make the code more readable. For example, it is
@@ -312,7 +312,7 @@
<p>
When declaring a vector or list data type, no space between the keyword
and the opening angle bracket should be used. This is merely an aesthetic
- preference for consistency throughout <strong>ISIS 3</strong>.
+ preference for consistency throughout <strong>ISIS</strong>.
</p>
<p>
For example:
@@ -420,7 +420,7 @@
<h3> <a name="logicalOperators">Logical Operators</a> </h3>
<p>
- The use of aliases for logical operators is prohibited in <strong>ISIS 3
+ The use of aliases for logical operators is prohibited in <strong>ISIS
</strong>. For example, a program must not contain the following aliases:
<table border="1">
<tr>
@@ -484,42 +484,42 @@
<h3> <a name="sourceCodeDocs">Source Code Documentation</a> </h3>
<h4> <a name="doxygenComments"></a> Doxygen </h4>
<p>
- Isis 3 uses the <a href="http://www.doxygen.org ">Doxygen</a> documentation
- extraction software. Doxygen has extended the tag set of the
- <a href="http://java.sun.com/j2se/javadoc">javadoc documentation style</a>,
- a systematic in-code documentation style that allows pertinent documentation to
- be extracted easily. Doxygen is just one of many software packages that are
- able to extract and use javadoc documentation for a variety of purposes,
- allowing us to take advantage of a wealth of documentation extractors, IDEs,
+ ISIS uses the <a href="http://www.doxygen.org ">Doxygen</a> documentation
+ extraction software. Doxygen has extended the tag set of the
+ <a href="http://java.sun.com/j2se/javadoc">javadoc documentation style</a>,
+ a systematic in-code documentation style that allows pertinent documentation to
+ be extracted easily. Doxygen is just one of many software packages that are
+ able to extract and use javadoc documentation for a variety of purposes,
+ allowing us to take advantage of a wealth of documentation extractors, IDEs,
and other tools on the market that make our lives simpler and more productive.
</p>
<ul>
<li>
- Documentation should be provided for each entity (class, method, struct,
- variable, etc.) in the source code <em>where the primary or most commonly
- used definition of that entity resides</em>. Generally, this means the
+ Documentation should be provided for each entity (class, method, struct,
+ variable, etc.) in the source code <em>where the primary or most commonly
+ used definition of that entity resides</em>. Generally, this means the
following files contain documentation for the listed entities:
<ul>
<li>
- <b>Header (.h)</b>: classes, inline functions, enums, typedefs, unions,
+ <b>Header (.h)</b>: classes, inline functions, enums, typedefs, unions,
structs, and variables declared in the header file
</li>
<li>
- <b>Implementation (.cpp)</b>: member function implementations and any
+ <b>Implementation (.cpp)</b>: member function implementations and any
entities declared or defined in the implementation file
</li>
</ul>
</li>
-
+
<li>
- To allow Doxygen to generate external documentation specialized commenting styles
- must be used. The comments are typically before each entity but single line
+ To allow Doxygen to generate external documentation specialized commenting styles
+ must be used. The comments are typically before each entity but single line
comments on the same line can be added after the entity. For example:
<ul>
<li>
<b>Single line of documentation (<em>documentation line</em>)</b>
<ul>
- <li>start documentation with string <b>//!</b> before or <b>//!<</b> after
+ <li>start documentation with string <b>//!</b> before or <b>//!<</b> after
the code
</li>
<li>Before the entity
@@ -528,7 +528,7 @@
int myInteger ;
</div>
</li>
-
+
<li>After the entity
<div class="code">
int myInteger ; //!< my integer<br/>
@@ -536,7 +536,7 @@
</li>
</ul>
</li>
-
+
<li>
<b>Multi-lined documentation (<em>documentation block</em>)</b>
<ul>
@@ -563,16 +563,16 @@ void setGlobalB() {
Return to Table of Contents
</font></a></p>
- <h4> <a name="usingHTML"></a> Using HTML </h4>
+ <h4> <a name="usingHTML"></a> Using HTML </h4>
<p>
HTML can be used anywhere in your documentation.
- Keep it simple. Doxygen will "interpret" your HTML, so you may not get the
- desired effect. Best advice, avoid attempting special effects by just using
- the basic HTML formatting tags - bold, underline, pre, code, table (caption,
- tr, td, th), etc. and only when really necessary. Better yet, consider using
- the formatting tags in the Other Useful Tags section instead of HTML. Your
- plain old text will be pretty nicely rendered into paragraphs with automatically
- linked items and other bells and whistles. Keep your source readable: minimize
+ Keep it simple. Doxygen will "interpret" your HTML, so you may not get the
+ desired effect. Best advice, avoid attempting special effects by just using
+ the basic HTML formatting tags - bold, underline, pre, code, table (caption,
+ tr, td, th), etc. and only when really necessary. Better yet, consider using
+ the formatting tags in the Other Useful Tags section instead of HTML. Your
+ plain old text will be pretty nicely rendered into paragraphs with automatically
+ linked items and other bells and whistles. Keep your source readable: minimize
formatting.
</p>
<p align="right"><a href="#top"><font size="1">
@@ -581,15 +581,15 @@ void setGlobalB() {
<h4> <a name="autolinking"></a> Autolinking </h4>
<p>
- Class, method, variable, and other entity names will be automatically linked
- in the documentation. To prevent this for a specific occurence of a name,
- use a percent sign (%) in front of the name. For example, if you have a
- class name "Histogram" and you want to prevent the linking of the word
- "Histogram" in your description because it is not referring to the class but
+ Class, method, variable, and other entity names will be automatically linked
+ in the documentation. To prevent this for a specific occurence of a name,
+ use a percent sign (%) in front of the name. For example, if you have a
+ class name "Histogram" and you want to prevent the linking of the word
+ "Histogram" in your description because it is not referring to the class but
to an actual histogram, use "%Histogram" to prevent the word from being linked.
</p>
<p>
- E-mail addresses and web addresses are also automatically linked. If a web
+ E-mail addresses and web addresses are also automatically linked. If a web
address is particularly long, put it on its own line.
</p>
<p align="right"><a href="#top"><font size="1">
@@ -623,13 +623,13 @@ void setGlobalB() {
letter. As a general rule, class names should be nouns.
</p>
<p>
- <strong>**Note:</strong> There are 3 existing classes in <strong>ISIS 3
+ <strong>**Note:</strong> There are 3 existing classes in <strong>ISIS
</strong> that do not follow this convention. The <strong>iString
</strong> and <strong>iTime</strong> classes needed a prefix to
distinguish them from the C++ system string and time classes. While
these classes will not be changed at this time, in the event that
similar classes are created, a capital letter <i>I</i> prefix should
- be used to remain consistent with the rest of <strong>ISIS 3</strong>.
+ be used to remain consistent with the rest of <strong>ISIS</strong>.
</p>
<p>
For example:
@@ -648,7 +648,7 @@ void setGlobalB() {
Member functions should be lower camel case, when possible. That is, the
first letter should be lower case and, if the class is a multi-word
phrase, spaces are eliminated and each subsequent word should begin with a
- capital letter. This should remain consistent throughout <strong>ISIS 3
+ capital letter. This should remain consistent throughout <strong>ISIS
</strong> except in two cases. Constructor and destructor methods must be
upper camel case to match the class name. The other case in which this
convention may not be followed is when a method overrides or overloads an
@@ -703,10 +703,10 @@ void setGlobalB() {
<h3> <a name="dataMemberNames">Data Member Names</a> </h3>
<p>
- <strong>ISIS 3</strong> currently uses three types of data members: <i>
+ <strong>ISIS</strong> currently uses three types of data members: <i>
global</i>, <i>protected</i>, and <i>private</i>. Note that global and
protected data members should be avoided and public member data in
- classes is not permitted in <strong>ISIS 3</strong>.
+ classes is not permitted in <strong>ISIS</strong>.
</p>
<p>
Global variables should have the prefix <i>g_</i> followed by a lower
@@ -889,7 +889,7 @@ void setGlobalB() {
<h3> <a name="orderingLibraryIncludes">Ordering Library Includes</a> </h3>
<p>
No code should exist before <font color="olive"><b>#include</b></font>
- statements in <strong>ISIS 3</strong> files. These <font color="olive"><b>
+ statements in <strong>ISIS</strong> files. These <font color="olive"><b>
#include</b></font> statements should be separated into groups of
libraries by a single blank line and each group should be ordered
alphabetically. All <font color="olive"><b>#include</b></font> statements
@@ -1035,7 +1035,7 @@ void setGlobalB() {
<h2> <a name="documentation">Documentation</a> </h2>
<p>
- Documentation for <strong>ISIS 3</strong> is done using Doxygen.
+ Documentation for <strong>ISIS</strong> is done using Doxygen.
</p>
<p align="right"><a href="#top"><font size="1">
Return to Table of Contents
@@ -1055,7 +1055,7 @@ void setGlobalB() {
<p>
All history entries should be below an internal tag and indented 2 spaces
from the start of the internal tag. Doxygen history entries in <strong>
- ISIS 3</strong> should begin with the date of the form YYYY-MM-DD, followed
+ ISIS</strong> should begin with the date of the form YYYY-MM-DD, followed
by the name of the programmer(s) responsible for the changes. This is
followed by a dash, padded by a space on each side before the comment.
When wrapping a Doxygen history entry, the subsequent lines should begin 4
@@ -1130,12 +1130,12 @@ void setGlobalB() {
<h3> <a name="structures">Structures</a> </h3>
<p>
The <font color="purple"><b>struct</b></font> keyword is not all together
- disallowed in <strong>ISIS 3</strong>, however there are restrictions on
+ disallowed in <strong>ISIS</strong>, however there are restrictions on
its use. The use of a structure is prohibited from the public API in
- <strong>ISIS 3</strong>, this would include global definitions in a header
+ <strong>ISIS</strong>, this would include global definitions in a header
file. That is, any structures in a class must be private or protected.
Structures can also be used in applications. A structure that contains
- only data is acceptable in ISIS 3. Structures in <strong>ISIS 3
+ only data is acceptable in ISIS. Structures in <strong>ISIS
</strong> cannot have methods.
</p>
<p align="right"><a href="#top"><font size="1">
@@ -1360,8 +1360,8 @@ void setGlobalB() {
<h2><a name="todo">TO DO</a></h2>
<ul>
- <li>
- Improve examples - possibly a reference to a single canonical file in
+ <li>
+ Improve examples - possibly a reference to a single canonical file in
the source tree
</li>
<li> Binary Operators - Determine padding. </li>
@@ -1426,12 +1426,12 @@ void setGlobalB() {
</audience>
<bibliography>
- <title>ISIS 3 Coding Standards and Style Guide</title>
- <brief>Coding standards for ISIS 3 developers (effective February 1, 2012).</brief>
+ <title>ISIS Coding Standards and Style Guide</title>
+ <brief>Coding standards for ISIS developers (effective February 1, 2012).</brief>
<description>
This document will describe the coding standards for maintaining <strong>
- ISIS 3</strong> source code. It was created to ensure that the <strong>
- ISIS 3</strong> package is programmed for consistency, readability and ease
+ ISIS</strong> source code. It was created to ensure that the <strong>
+ ISIS</strong> package is programmed for consistency, readability and ease
of future maintenance. This document does not attempt to address every
possible issue. However, the guidelines that have been outlined should not
be deviated from, except under special situations.
@@ -1466,4 +1466,3 @@ void setGlobalB() {
</history>
</documentation>
-
diff --git a/isis/src/docsys/documents/ControlNetworks/ControlNetworks.xml b/isis/src/docsys/documents/ControlNetworks/ControlNetworks.xml
index 5f0cd5ac5b..c9aa5b379c 100644
--- a/isis/src/docsys/documents/ControlNetworks/ControlNetworks.xml
+++ b/isis/src/docsys/documents/ControlNetworks/ControlNetworks.xml
@@ -26,7 +26,7 @@ you must <em>not</em> upgrade the ISIS Data Files!!!
<h2>Introduction</h2>
<h3>Control Network</h3>
- <p>A Control Network in ISIS3 is a structure which holds a network of image correspondances, also known as tie points or control points, which identify common ground points across multiple images of the same body. A Control Network is made up of Control Points (the common tie point) and a Control Point has one or more Control Measures (measurements in image space of the common point in a particular image). There are two file formats for Control Networks in ISIS3 -- a binary google protocol buffer format and a human-readable pvl format. Both contain the same contents and information. This document describes the keywords present in the PVL format for convenience.</p>
+ <p>A Control Network in ISIS is a structure which holds a network of image correspondances, also known as tie points or control points, which identify common ground points across multiple images of the same body. A Control Network is made up of Control Points (the common tie point) and a Control Point has one or more Control Measures (measurements in image space of the common point in a particular image). There are two file formats for Control Networks in ISIS -- a binary google protocol buffer format and a human-readable pvl format. Both contain the same contents and information. This document describes the keywords present in the PVL format for convenience.</p>
<h2>Control Network</h2>
<p>This section describes the keywords associated with the main Control Network object.</p>
@@ -471,13 +471,13 @@ The difference between the ''estimated'' line measurement (as determined at the
<tr><td><b> MinimumPixelZScore</b></td>
<td> No</td>
<td> None</td>
- <td> Control measures store z-scores in pairs. A pair contains the z-scores of the minimum and maximum pixels in the pattern chip generated for the given measure during point registration. Each z-score indicates how many standard deviations the given pixel value is above or below the mean DN. This is used when using area-based-matching in ISIS3.
+ <td> Control measures store z-scores in pairs. A pair contains the z-scores of the minimum and maximum pixels in the pattern chip generated for the given measure during point registration. Each z-score indicates how many standard deviations the given pixel value is above or below the mean DN. This is used when using area-based-matching in ISIS.
</td>
</tr>
<tr><td><b> MaximumPixelZScore</b></td>
<td> No</td>
<td> None</td>
- <td> Control measures store z-scores in pairs. A pair contains the z-scores of the minimum and maximum pixels in the pattern chip generated for the given measure during point registration. Each z-score indicates how many standard deviations the given pixel value is above or below the mean DN. This is used when using area-based-matching in ISIS3.
+ <td> Control measures store z-scores in pairs. A pair contains the z-scores of the minimum and maximum pixels in the pattern chip generated for the given measure during point registration. Each z-score indicates how many standard deviations the given pixel value is above or below the mean DN. This is used when using area-based-matching in ISIS.
</td>
</tr>
<tr><td> <b>GoodnessOfFit</b></td>
@@ -525,10 +525,10 @@ The difference between the ''estimated'' line measurement (as determined at the
<bibliography>
<title>Control Networks</title>
- <brief>Control Network format and keyword definitions in ISIS 3</brief>
+ <brief>Control Network format and keyword definitions in ISIS </brief>
<description>
This document describes the format of and defines the keywords that are part of
- Control Networks in ISIS3.
+ Control Networks in ISIS.
</description>
<author>Kristin Berry</author>
<date>2018-01-26</date>
diff --git a/isis/src/docsys/documents/EnvironmentAndPreferencesSetup/EnvironmentAndPreferencesSetup.xml b/isis/src/docsys/documents/EnvironmentAndPreferencesSetup/EnvironmentAndPreferencesSetup.xml
index a5646471ca..70957840f5 100644
--- a/isis/src/docsys/documents/EnvironmentAndPreferencesSetup/EnvironmentAndPreferencesSetup.xml
+++ b/isis/src/docsys/documents/EnvironmentAndPreferencesSetup/EnvironmentAndPreferencesSetup.xml
@@ -15,7 +15,7 @@
<h2><a name="UnixSetup">Unix Setup</a></h2>
<p>
- Assuming ISIS 3 has been successful installed on your computer (see
+ Assuming ISIS has been successful installed on your computer (see
<a href="https://github.com/USGS-Astrogeology/ISIS3#installation">ISIS Download and Installation Guide</a>),
you will need to add a few commands to your startup file. For the
C-shell, add the following commands to the $HOME/.login file or the equivalent system-wide
diff --git a/isis/src/docsys/documents/InstallGuide/InstallGuide.xml b/isis/src/docsys/documents/InstallGuide/InstallGuide.xml
index c73152846e..e14a4fd30f 100644
--- a/isis/src/docsys/documents/InstallGuide/InstallGuide.xml
+++ b/isis/src/docsys/documents/InstallGuide/InstallGuide.xml
@@ -61,9 +61,9 @@ you must <em>not</em> upgrade the ISIS Data Files!!!
<bibliography>
<title>Installing ISIS</title>
- <brief>Downloading and installing ISIS3</brief>
+ <brief>Downloading and installing ISIS</brief>
<description>
- This document describes how to download and install ISIS3
+ This document describes how to download and install ISIS
</description>
<author>ASC Development Team</author>
<date>2018-08-28</date>
diff --git a/isis/src/docsys/documents/LabelDictionary/LabelDictionary.xml b/isis/src/docsys/documents/LabelDictionary/LabelDictionary.xml
index b7a60049a4..122437ffca 100644
--- a/isis/src/docsys/documents/LabelDictionary/LabelDictionary.xml
+++ b/isis/src/docsys/documents/LabelDictionary/LabelDictionary.xml
@@ -96,7 +96,7 @@ EndObject
</tr>
<tr><td>Format</td>
<td>String (Tile or BandSequential)</td>
- <td>This keyword indicates how the cube data is arranged. BandSequential indicates the pixels are stored first by sample, then by line, and finally by band. Tile indicates the pixels are stored in tiles which is the preferred storage mechanism in ISIS 3 as it facilities the fastest “universal access”. The tiles are stored in row major format. That is, all the tiles for band 1 ordered from left-to-right, then top-to-bottom, followed by all the tiles for band 2, etc.</td>
+ <td>This keyword indicates how the cube data is arranged. BandSequential indicates the pixels are stored first by sample, then by line, and finally by band. Tile indicates the pixels are stored in tiles which is the preferred storage mechanism in as it facilities the fastest “universal access”. The tiles are stored in row major format. That is, all the tiles for band 1 ordered from left-to-right, then top-to-bottom, followed by all the tiles for band 2, etc.</td>
</tr>
<tr><td>TileSamples, TileLines</td>
<td>Integer</td>
diff --git a/isis/src/docsys/documents/LegacyInstallGuide/LegacyInstallGuide.xml b/isis/src/docsys/documents/LegacyInstallGuide/LegacyInstallGuide.xml
index 47084016d4..5a3b71ac77 100644
--- a/isis/src/docsys/documents/LegacyInstallGuide/LegacyInstallGuide.xml
+++ b/isis/src/docsys/documents/LegacyInstallGuide/LegacyInstallGuide.xml
@@ -647,7 +647,7 @@ you must <em>not</em> upgrade the ISIS Data Files!!!
</history>
<bibliography>
- <title>Installing Legacy Versions of ISIS3</title>
+ <title>Installing Legacy Versions of ISIS</title>
<brief>Downloading and installing ISIS versions 3.5.2.0 and earlier</brief>
<description>
This document describes how to download and install a
diff --git a/isis/src/docsys/documents/PatternMatch/PatternMatch.xml b/isis/src/docsys/documents/PatternMatch/PatternMatch.xml
index bcd688b2cd..107b114bd1 100644
--- a/isis/src/docsys/documents/PatternMatch/PatternMatch.xml
+++ b/isis/src/docsys/documents/PatternMatch/PatternMatch.xml
@@ -72,7 +72,7 @@
<h2><a name="Introduction">Introduction</a></h2>
<p>
This document attempts to describe how automatic registration is
- accomplished in ISIS 3. In simple terms, automatic registration is
+ accomplished in ISIS. In simple terms, automatic registration is
the attempt to match a pattern in a cube. For example, given a reseau
template pattern, we would like to find positions in a cube which
match the reseau. Similarly, if we extract from a cube a ground
@@ -85,7 +85,7 @@
<p>
Automatic registration is a tricky subject. Algorithms and
parameters that successfully work for one pattern are likely not to
- work for other conditions. In ISIS 3, we do not want to restrict our
+ work for other conditions. In ISIS, we do not want to restrict our
registration programs (e.g., coreg, pointreg) to a single algorithm.
We would view this similar to map projections or camera models. That
is, if a particular registration algorithm meets our needs we can
@@ -102,8 +102,8 @@
<h2><a name="Chips">Chips</a></h2>
<p>
In the simplest terms, automatic registration attempts to find some
- sub-area of a cube (or "pattern" window) inside some subarea of another
- cube (or "search" window). In ISIS, these "generally" small sub-areas
+ sub-area of a cube (or "pattern" window) inside some subarea of another
+ cube (or "search" window). In ISIS, these "generally" small sub-areas
of a cube are called "chips". There are two chips used in automatic
registration, the "pattern" chip and the "search" chip, corresponding
to the two sub-areas discussed above. We will discuss each in more
@@ -208,7 +208,7 @@
find the "best" match within the search area.
</p>
<p>
- An objective of the ISIS 3 automatic registration design is to allow
+ An objective of the ISIS automatic registration design is to allow
for a variety of match algorithms. For example, an algorithm could
be developed that works best for matching MGS/MOC wide angle and
Odyssey Themis IR cameras. For this objective to be met we will
@@ -456,7 +456,7 @@
fit and Tolerance represent a one pixel accuracy level. The
MinimumDifference would use a test for "less than" Tolerance,
MaximumCorrelation would use "greater than" Tolerance, and GruenAdaptive
- would use "less than" Tolerance (the goodness of fit for Gruen is at
+ would use "less than" Tolerance (the goodness of fit for Gruen is at
a sub-pixel accuracy). This is represented in PVL in the following fashion:
<pre style="padding-left:4em;">
Object = AutoRegistration
@@ -518,11 +518,11 @@
Upon walking the pattern chip through the search chip we will have
created the fit chip. The highest (or lowest) goodness of fit value
generally represents the whole pixel position that best matched between the
- pattern and search area.
+ pattern and search area.
</p>
<p>
- The Subpixel Algorithm option is on by default (SubpixelAccuracy=True),
- it is possible to turn it off by using the SubpixelAccuracy keyword.
+ The Subpixel Algorithm option is on by default (SubpixelAccuracy=True),
+ it is possible to turn it off by using the SubpixelAccuracy keyword.
Example:
<pre style="padding-left:4em;">
Group = Algorithm
@@ -538,32 +538,32 @@
<p>
As of ISIS3.4.0, the subpixel algorithm was replaced with the algorithm
described under SurfaceModeling. To estimate the true registration postion,
- the previous algorithm used a least squares fit to generate a 2nd degree
+ the previous algorithm used a least squares fit to generate a 2nd degree
2-dimentional polynomial given an NxN window of points from the fit chip.
- This previous algorithm optionally applied two parameter tolerances that
+ This previous algorithm optionally applied two parameter tolerances that
are no longer needed and have been removed, Eccentricity Ratio and Residual Tolerance.
- If a PVL definition file includes these parameters when applying the new subpixel
+ If a PVL definition file includes these parameters when applying the new subpixel
algorithm, they will simply be ignored.
</p>
<h3><a name="SurfaceModeling">Surface Modeling</a></h3>
<p>
When enabled, the subpixel accuracy algorithm analyzes a window size
- (WindowSize x WindowSize) block containing fit chip pixel values centered
- at the whole pixel with the best registration (local extreme value of the fit chip;
- the highest or the lowest value).
+ (WindowSize x WindowSize) block containing fit chip pixel values centered
+ at the whole pixel with the best registration (local extreme value of the fit chip;
+ the highest or the lowest value).
</p>
<p>
The fit chip analysis is performed by using an adaptive flood fill and weighted average
algorithm as follows: (The figure below is based on a 5x5 WindowSize block of
- a fit chip returned by the Maximum Correlation algorithm). The best registration
- among the border pixels of the WindowSize block (light orange colored pixel cells)
+ a fit chip returned by the Maximum Correlation algorithm). The best registration
+ among the border pixels of the WindowSize block (light orange colored pixel cells)
is found (0.76 in the example below). A continuous flood fill is done selecting all
continuous pixels with registration values on the interval (0.76,1.0)-(the green
colored cells). An average of the selected cell coordinates is then computed
(weighting each coordinate by it's registration value) to reduce the selection
to a single location.
- </p>
+ </p>
<p>
<img src="assets/fitchip_windowsize.png" alt="WindowSize Block of a FIT Chip"/>
</p>
@@ -573,15 +573,15 @@
avoid false positive registrations on image edges.
</p>
<p>
- The dimensions of the WindowSize fit chip block must be an odd number in order
- to have a center pixel. Also, the dimensions of the WindowSize fit chip block cannot
- be less than 5, but can be as large as the original fit chip
- (though this is not recommended). Recommended dimensions for
- (MaximumCorrelation and MinimumDifference) range from 5, 7, 9, 11, to 15.
+ The dimensions of the WindowSize fit chip block must be an odd number in order
+ to have a center pixel. Also, the dimensions of the WindowSize fit chip block cannot
+ be less than 5, but can be as large as the original fit chip
+ (though this is not recommended). Recommended dimensions for
+ (MaximumCorrelation and MinimumDifference) range from 5, 7, 9, 11, to 15.
</p>
<p>
Optionally, the window size and tolerance may be supplied through PVL:
-
+
<pre style="padding-left:4em;">
Group = SurfaceModel
DistanceTolerance = 0.75
@@ -598,7 +598,7 @@
pixels (with sub-pixel granularity) the sub-pixel accuracy
computation can move the best fit before the registration is rejected
entirely. The distance tolerance in pixels must be greater than 0 and is
- defaulted to 1.0.
+ defaulted to 1.0.
</p>
<p>
For example:
@@ -611,10 +611,10 @@
Here a registration will be rejected if the new position is more than
3.5 pixels away from the original whole-pixel result.
- The recommended value is 0.5 or 0.75, this assumes that the orignal
+ The recommended value is 0.5 or 0.75, this assumes that the orignal
starting position at the whole pixel level is accurate.
This distance test is not a 2D check, but rather, two single dimension
- checks (line direction and sample direction).
+ checks (line direction and sample direction).
</p>
<h3><a name="WindowSize">Window Size</a></h3>
@@ -647,15 +647,15 @@
outside the user specified 'ValidMinimum/ValidMaximum' parameter values.
</p>
<p>
- The dimensions of the WindowSize fit chip block must be an odd number in order
- to have a center pixel. Also, the dimensions of the WindowSize fit chip block cannot
- be less than 5, but can be as large as the original fit chip (though this is not recommended).
- Recommended dimensions for (MaximumCorrelation and MinimumDifference) range
- from 5, 7, 9, 11, to 15.
+ The dimensions of the WindowSize fit chip block must be an odd number in order
+ to have a center pixel. Also, the dimensions of the WindowSize fit chip block cannot
+ be less than 5, but can be as large as the original fit chip (though this is not recommended).
+ Recommended dimensions for (MaximumCorrelation and MinimumDifference) range
+ from 5, 7, 9, 11, to 15.
</p>
<p>
- If an ideal goodness of fit is found (e.g. 0.0 for MinimumDifference or 1.0 for
- MaximumCorrelation), we have a perfect fit and, thus, know it is in the best position.
+ If an ideal goodness of fit is found (e.g. 0.0 for MinimumDifference or 1.0 for
+ MaximumCorrelation), we have a perfect fit and, thus, know it is in the best position.
In this case, the sub-pixel accuracy phase is omitted.
</p>
@@ -1234,7 +1234,7 @@
Added gradient filter section
</change>
<change name="Moses Millazo and Jeff Anderson" date="2011-10-05">
- Updates to Gruen documentation, the eccentricity ratio, and the gradient
+ Updates to Gruen documentation, the eccentricity ratio, and the gradient
filters.
</change>
<change name="Jai Rideout" date="2011-10-14">
diff --git a/isis/src/docsys/documents/PreferenceDictionary/PreferenceDictionary.xml b/isis/src/docsys/documents/PreferenceDictionary/PreferenceDictionary.xml
index 89858a90bd..0e3c2e1eba 100644
--- a/isis/src/docsys/documents/PreferenceDictionary/PreferenceDictionary.xml
+++ b/isis/src/docsys/documents/PreferenceDictionary/PreferenceDictionary.xml
@@ -11,12 +11,12 @@ This reference document describes the elements of the ISIS User Preference file.
<h2><a name="UserInterface">User Interface</a></h2>
<p>
The user interface group in the preference file allows you to customize the way your applications run, and how they look
-in graphical form. The user interface in either graphical or command line mode supplies a progress indicator to the user.
+in graphical form. The user interface in either graphical or command line mode supplies a progress indicator to the user.
The increment of the progress bar can be customized to increase the bar by 10%, 5%, 2%, or 1%. Additionally, in the
command line mode, the user can turn off the progress bar if desired. The GUI will always update the progress bar. The
style of the GUI can be customized to have a windows, cde, kde, etc. look to it. The browser fired up from the GUI can
also be specified, along with the size of the GUI, and its font type and size. By default, all history files are stored in the
-users home directory under .Isis/history. This can be customized to save the history files in the users current directory
+users home directory under .Isis/history. This can be customized to save the history files in the users current directory
(using '.') or any other directory. The history recording can also be turned off if the user does not wish to record any
history on the programs being run.
@@ -39,9 +39,9 @@ EndGroup
<h2><a name="">Error Facility</a></h2>
<p>
-Errors can be written in either standard (single line) or PVL format.
-Additionally, the source file and line number identifying where the error
-occurred can be suppressed. Stack traces can also be displayed when running ISIS
+Errors can be written in either standard (single line) or PVL format.
+Additionally, the source file and line number identifying where the error
+occurred can be suppressed. Stack traces can also be displayed when running ISIS
in debug mode.
<pre style="padding-left:4em;">
@@ -69,7 +69,7 @@ EndGroup
<h2><a name="ShapeModel">ShapeModel</a></h2>
<p>
-These parameters control which ray-tracing engine is used for working with shapemodels. To use the ISIS3 default, omit or comment-out the ShapeModel group.
+These parameters control which ray-tracing engine is used for working with shapemodels. To use the ISIS default, omit or comment-out the ShapeModel group.
The tolerance is to check the visibility or occlusion of a point and is in kilometers.
<pre style="padding-left:4em;">
Group = ShapeModel
diff --git a/isis/src/hayabusa/apps/amica2isis/HayabusaAmicaKernels.trn b/isis/src/hayabusa/apps/amica2isis/HayabusaAmicaKernels.trn
index 73b68c62d0..8a47ccbda9 100644
--- a/isis/src/hayabusa/apps/amica2isis/HayabusaAmicaKernels.trn
+++ b/isis/src/hayabusa/apps/amica2isis/HayabusaAmicaKernels.trn
@@ -1,4 +1,4 @@
-# This translation file is used to produce the ISIS 3 Kernels label group
+# This translation file is used to produce the ISIS Kernels label group
# for Hayabusa AMICA.
# Translation = (left,right) convert the input "right" to "left"
#
diff --git a/isis/src/hayabusa/apps/amica2isis/amica2isis.xml b/isis/src/hayabusa/apps/amica2isis/amica2isis.xml
index dd0fc9b752..7cc25c2ee0 100644
--- a/isis/src/hayabusa/apps/amica2isis/amica2isis.xml
+++ b/isis/src/hayabusa/apps/amica2isis/amica2isis.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<application name="amica2isis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
+<application name="amica2isis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<!-- $Id: amica2isis.xml 6226 2015-06-09 20:46:13Z jwbacker@GS.DOI.NET $ -->
<brief>Import PDS/FITS formatted Hayabusa image into ISIS cube</brief>
<description>
<p>
- This application will import and convert a Hayabusa Asteroid Multiband
- Imaging Camera (AMICA) PDS image to an ISIS cube. The application reads
- and translates eight AMICA filters. See chart in <i>AMICA Filters</i>
+ This application will import and convert a Hayabusa Asteroid Multiband
+ Imaging Camera (AMICA) PDS image to an ISIS cube. The application reads
+ and translates eight AMICA filters. See chart in <i>AMICA Filters</i>
below for details on the different filters.
</p>
<br/>
@@ -28,88 +28,88 @@
</li>
</ul>
<p>
- The input PDS formatted detached header file (.lbl) for the Hayabusa
- AMICA image must be used in the FROM parameter. This header contains a
- reference to a FITS formatted file ending in a .fit extension containing
- the image data. Both files must reside in the same directory or errors
+ The input PDS formatted detached header file (.lbl) for the Hayabusa
+ AMICA image must be used in the FROM parameter. This header contains a
+ reference to a FITS formatted file ending in a .fit extension containing
+ the image data. Both files must reside in the same directory or errors
will occur.
</p>
<h3>When TARGET Parameter Should Be Specified</h3>
<ul>
<li>
- When Hayabusa AMICA EDR labels contain an incorrect value for the
- TARGET_NAME keyword
+ When Hayabusa AMICA EDR labels contain an incorrect value for the
+ TARGET_NAME keyword
</li>
<li>
- Define TARGET = "SKY" to later project the data with
+ Define TARGET = "SKY" to later project the data with
<em>skymap</em>.
</li>
</ul>
<br/>
<h2>Mission Overview</h2>
<p>
- The Hayabusa spacecraft was launched on 9 May 2003. The AMICA
- instrument acquired more than 1,400 multispectral and high resolution
- images of the asteroid 25143 Itokawa beginning 12 September 2005 for
- three months. The primary goal of the mission was to land on the
- asteroid and return samples to Earth. The spacecraft safely landed on
- Itokawa in November 2005 and returned the samples to Earth in June 2010.
+ The Hayabusa spacecraft was launched on 9 May 2003. The AMICA
+ instrument acquired more than 1,400 multispectral and high resolution
+ images of the asteroid 25143 Itokawa beginning 12 September 2005 for
+ three months. The primary goal of the mission was to land on the
+ asteroid and return samples to Earth. The spacecraft safely landed on
+ Itokawa in November 2005 and returned the samples to Earth in June 2010.
Further information can be found in Ishiguro et al. (2010)
</p>
<p>
- During the rendezvous phase with Itokawa, Hayabusa was designed to find
- its position relative to the asteroid autonomously using optical
- navigation cameras (ONC) and range data based on light-detection and
- ranging (LIDAR) technology. The ONC-T, a refractive telescope camera head,
- is referred to as the AMICA when used for scientific observations. Prior
- to "touch-and-go sampling", Itokawa was mapped by AMICA to select
- sampling sites free of serious obstacles such as meter-sized boulders
+ During the rendezvous phase with Itokawa, Hayabusa was designed to find
+ its position relative to the asteroid autonomously using optical
+ navigation cameras (ONC) and range data based on light-detection and
+ ranging (LIDAR) technology. The ONC-T, a refractive telescope camera head,
+ is referred to as the AMICA when used for scientific observations. Prior
+ to "touch-and-go sampling", Itokawa was mapped by AMICA to select
+ sampling sites free of serious obstacles such as meter-sized boulders
and craters.
- </p>
+ </p>
<h2>Instrument Overview</h2>
<p>
- The AMICA instrument is a refracting telescope consisting of five lenses,
- each of which is cosmic-radiation-resistant and anti-reflection coated.
- A quartz optical parallel window is placed in front of the first lens for
- radiation protection. The SITe charge-coupled device (CCD) chip,
- developed and built by NEC TOSHIBA Space Systems, Ltd., is of the
- back-illuminated MPP (Multi-Pinned Phase) type. The CCD is kept below -10
- degrees C in ordinary in-flight condition. The CCD dimensions are 1024 x
- 1000 visible pixels (full dimensions are 1024 x 1024) and the camera
- field of view is 5.83 x 5.69 degrees. The 12 columns on either side of
- the 1024 x 1000 pixel array are dark due to an obscuring mask. DNs in
- these areas were found to be dependent on both incident flux and
- wavelength, suggesting that the masks are not perfectly impermeable to
- light. Therefore, these pixels cannot be used for dark current
- correction. The remaining unobscured region has the dimensions 1000 x
- 1000.
+ The AMICA instrument is a refracting telescope consisting of five lenses,
+ each of which is cosmic-radiation-resistant and anti-reflection coated.
+ A quartz optical parallel window is placed in front of the first lens for
+ radiation protection. The SITe charge-coupled device (CCD) chip,
+ developed and built by NEC TOSHIBA Space Systems, Ltd., is of the
+ back-illuminated MPP (Multi-Pinned Phase) type. The CCD is kept below -10
+ degrees C in ordinary in-flight condition. The CCD dimensions are 1024 x
+ 1000 visible pixels (full dimensions are 1024 x 1024) and the camera
+ field of view is 5.83 x 5.69 degrees. The 12 columns on either side of
+ the 1024 x 1000 pixel array are dark due to an obscuring mask. DNs in
+ these areas were found to be dependent on both incident flux and
+ wavelength, suggesting that the masks are not perfectly impermeable to
+ light. Therefore, these pixels cannot be used for dark current
+ correction. The remaining unobscured region has the dimensions 1000 x
+ 1000.
</p>
<p>
- AMICA is one of the ONCs comprised of three units: three CCD camera
- heads (ONC-T, ONC-W1, and ONC-W2), an analog signal processing unit
- (ONC-AE), and a digital signal processing unit (ONC-E). AMICA (ONC-T) and
- two wide-angle navigation cameras (ONC-W1 and ONC-W2) are controlled
- through ONC-E and ONC-AE, and the signals obtained are converted from
- analog to digital in ONC-AE. The digitized images are numerically
- processed by the ONC-E. The design of the AMICA camera head flight model
- is essentially the same as that of its prototype model. It is a CCD
- camera with a refractor telescope consisting of cosmic
- radiation-resistant and antireflection-coated lenses. The CCD device was
- configured in a frame-transfer architecture with an image area and a
- frame storage area. The depth of field (the distance between the camera
- and objects that are observed in focus) was designed to be 75 m to
- infinity.
+ AMICA is one of the ONCs comprised of three units: three CCD camera
+ heads (ONC-T, ONC-W1, and ONC-W2), an analog signal processing unit
+ (ONC-AE), and a digital signal processing unit (ONC-E). AMICA (ONC-T) and
+ two wide-angle navigation cameras (ONC-W1 and ONC-W2) are controlled
+ through ONC-E and ONC-AE, and the signals obtained are converted from
+ analog to digital in ONC-AE. The digitized images are numerically
+ processed by the ONC-E. The design of the AMICA camera head flight model
+ is essentially the same as that of its prototype model. It is a CCD
+ camera with a refractor telescope consisting of cosmic
+ radiation-resistant and antireflection-coated lenses. The CCD device was
+ configured in a frame-transfer architecture with an image area and a
+ frame storage area. The depth of field (the distance between the camera
+ and objects that are observed in focus) was designed to be 75 m to
+ infinity.
</p>
<p>
- AMICA has an eight position filter wheel, of which seven filters are nearly
- equivalent to the ECAS bands (Tedesco et al. 1982). Below is a table of
+ AMICA has an eight position filter wheel, of which seven filters are nearly
+ equivalent to the ECAS bands (Tedesco et al. 1982). Below is a table of
the filters and their specifications:
</p>
<br/>
<h2>AMICA Filters</h2>
<p>
- The following table provides the specifications for each of the eight
- AMICA filters.
+ The following table provides the specifications for each of the eight
+ AMICA filters.
</p>
<TABLE BORDER="1">
<CAPTION>
@@ -165,32 +165,32 @@
<br/>
<h2>Data Archive</h2>
<p>
- The Hayabusa AMICA data archive is located at several locations. The
+ The Hayabusa AMICA data archive is located at several locations. The
Japanese provide the data from the
<a href="http://darts.isas.jaxa.jp/pub/planet/pds3/hay-a-amica-3-hayamica-v1.0/">Japanese Hayabusa AMICA archive website</a>.
The data are also available from the
- <a href="http://sbn.psi.edu/pds/resource/hayamica.html">NASA PDS Small
+ <a href="http://sbn.psi.edu/pds/resource/hayamica.html">NASA PDS Small
Bodies Node</a> and is the recommended source.
</p>
<p>
- The file naming convention for ONC images is
- {T}{C}{nnnnnnnnnn}_{filter}.fits, where: {T} indicates the type of data
+ The file naming convention for ONC images is
+ {T}{C}{nnnnnnnnnn}_{filter}.fits, where: {T} indicates the type of data
("S" for scientific data or "N" for navigation data), {C}
- identifies the name of the instrument (T, W1, and W2 for ONC-T (i.e.
- AMICA), ONC-W1, and ONC-W2, respectively); {nnnnnnnnnn} is the mission
- elapsed time when the images is generated in ONC-E; {filter} is the name
- of the filter (ul, b, v, w, x, p, and zs, respectively).
+ identifies the name of the instrument (T, W1, and W2 for ONC-T (i.e.
+ AMICA), ONC-W1, and ONC-W2, respectively); {nnnnnnnnnn} is the mission
+ elapsed time when the images is generated in ONC-E; {filter} is the name
+ of the filter (ul, b, v, w, x, p, and zs, respectively).
</p>
<br/>
<h2>References</h2>
<cite>
- Ishiguro, Masateru, et al. "The Hayabusa Spacecraft Asteroid Multi-band
- Imaging Camera (AMICA)". Icarus 207.2 (2010): 714-731.
+ Ishiguro, Masateru, et al. "The Hayabusa Spacecraft Asteroid Multi-band
+ Imaging Camera (AMICA)". Icarus 207.2 (2010): 714-731.
</cite>
<br/>
<cite>
- Tedesco, E.F., D.J. Tholen, and B. Zellner. The eight-color asteroid
- survey: Standard stars. Astron. J. 87, 1587-1592, 1982.
+ Tedesco, E.F., D.J. Tholen, and B. Zellner. The eight-color asteroid
+ survey: Standard stars. Astron. J. 87, 1587-1592, 1982.
</cite>
</description>
@@ -200,20 +200,20 @@
Original version
</change>
<change name="Kris Becker" date="2014-04-03">
- Added support for subimage areas. This was done by using the AlphaCube
- (or crop) feature which provides necessary elements for the AMICA camera
+ Added support for subimage areas. This was done by using the AlphaCube
+ (or crop) feature which provides necessary elements for the AMICA camera
model to work properly. Fixes #2056.
</change>
<change name="Kris Becker" date="2015-02-26">
- Removed AlphaCube usage to favor more flexible implementation in the
+ Removed AlphaCube usage to favor more flexible implementation in the
AMICA camera model. Output of the image data is now in real format.
Fixes #2180 and #2193.
</change>
</history>
<category>
- <missionItem>Hayabusa</missionItem>
- </category>
+ <missionItem>Hayabusa</missionItem>
+ </category>
<groups>
<group name="Files">
@@ -224,23 +224,23 @@
Input PDS formatted detached header file for AMICA image
</brief>
<description>
- This file is the PDS label (ending in .lbl) to the image data. The
- image data are stored in FITS format with the detached .lbl file
- describing generic access to the data. The program,
- <em>amica2isis</em>, will also read the FITS file and extract
- the header contained therein. Some FITS label values are transferred
+ This file is the PDS label (ending in .lbl) to the image data. The
+ image data are stored in FITS format with the detached .lbl file
+ describing generic access to the data. The program,
+ <em>amica2isis</em>, will also read the FITS file and extract
+ the header contained therein. Some FITS label values are transferred
to the output ISIS files as well for completeness.
</description>
<filter>*.lbl *.LBL</filter>
</parameter>
-
+
<parameter name="TO">
<type>cube</type>
<pixelType>real</pixelType>
<fileMode>output</fileMode>
- <brief>Output ISIS3 cube filename</brief>
+ <brief>Output ISIS cube filename</brief>
<description>
- Use this parameter to select the output filename of the ISIS cube
+ Use this parameter to select the output filename of the ISIS cube
generated by this application.
</description>
<filter>*.cub</filter>
@@ -250,19 +250,19 @@
<group name="Parameters">
<parameter name="TARGET">
<type>string</type>
- <brief>Provide target name if absent or incorrect in input (FROM)
- label
+ <brief>Provide target name if absent or incorrect in input (FROM)
+ label
</brief>
<description>
<p>
- This parameter may be necessary as some AMICA EDR labels may
- not contain correct values for the TARGET_NAME keyword. This
- parameter can be used to provide the correct name of the target.
- It may also be used to specify SKY as the target to support
- projecting data to the celestial sphere.
+ This parameter may be necessary as some AMICA EDR labels may
+ not contain correct values for the TARGET_NAME keyword. This
+ parameter can be used to provide the correct name of the target.
+ It may also be used to specify SKY as the target to support
+ projecting data to the celestial sphere.
</p>
</description>
- <internalDefault>Label Value</internalDefault>
+ <internalDefault>Label Value</internalDefault>
</parameter>
</group>
</groups>
diff --git a/isis/src/hayabusa/apps/hyb1pds4gen/HayabusaAmicaPds4Export.trn b/isis/src/hayabusa/apps/hyb1pds4gen/HayabusaAmicaPds4Export.trn
index 1feced4563..85839db557 100644
--- a/isis/src/hayabusa/apps/hyb1pds4gen/HayabusaAmicaPds4Export.trn
+++ b/isis/src/hayabusa/apps/hyb1pds4gen/HayabusaAmicaPds4Export.trn
@@ -1,4 +1,4 @@
-# Translation for Hayabusa 1 export from ISIS3 cube to PDS4 product.
+# Translation for Hayabusa 1 export from ISIS cube to PDS4 product.
#
# Note these translations must be are ordered based on the required PDS4 order.
#
@@ -17,7 +17,7 @@ End_Group
Group = FirstSample
Auto
Optional
- InputKey = FirstSample
+ InputKey = FirstSample
InputPosition = (IsisCube, Instrument)
OutputName = img:first_sample
OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, img:Imaging, img:Subframe_Parameters)
@@ -27,7 +27,7 @@ End_Group
Group = FirstLine
Auto
Optional
- InputKey = FirstLine
+ InputKey = FirstLine
InputPosition = (IsisCube, Instrument)
OutputName = img:first_line
OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, img:Imaging, img:Subframe_Parameters)
@@ -37,7 +37,7 @@ End_Group
Group = PixelAveragingHeight
Auto
Optional
- InputKey = Binning
+ InputKey = Binning
InputPosition = (IsisCube, Instrument)
OutputName = img:pixel_averaging_height
OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, img:Imaging, img:Downsample_Parameters)
@@ -47,7 +47,7 @@ End_Group
Group = PixelAveragingWidth
Auto
Optional
- InputKey = Binning
+ InputKey = Binning
InputPosition = (IsisCube, Instrument)
OutputName = img:pixel_averaging_width
OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, img:Imaging, img:Downsample_Parameters)
diff --git a/isis/src/hayabusa/apps/hyb1pds4gen/HayabusaNirsPds4Export.trn b/isis/src/hayabusa/apps/hyb1pds4gen/HayabusaNirsPds4Export.trn
index f6bf2c1cc3..a34678f391 100644
--- a/isis/src/hayabusa/apps/hyb1pds4gen/HayabusaNirsPds4Export.trn
+++ b/isis/src/hayabusa/apps/hyb1pds4gen/HayabusaNirsPds4Export.trn
@@ -1,4 +1,4 @@
-# Translation for Hayabusa 1 export from ISIS3 cube to PDS4 product.
+# Translation for Hayabusa 1 export from ISIS cube to PDS4 product.
#
# Note these translations must be are ordered based on the required PDS4 order.
#
@@ -7,12 +7,10 @@
Group = ExposureDuration
Auto
Optional
- InputKey = TotalIntegrationTime
+ InputKey = TotalIntegrationTime
InputPosition = (IsisCube, Instrument)
OutputName = img:exposure_duration
OutputAttributes = unit|s
OutputPosition = (Product_Observational, Observation_Area, Discipline_Area, img:Imaging, img:Imaging_Instrument_Parameters)
Translation = (*, *)
End_Group
-
-
diff --git a/isis/src/hayabusa/apps/hyb1pds4gen/hyb1pds4gen.xml b/isis/src/hayabusa/apps/hyb1pds4gen/hyb1pds4gen.xml
index a5227aebf1..c8606852a1 100644
--- a/isis/src/hayabusa/apps/hyb1pds4gen/hyb1pds4gen.xml
+++ b/isis/src/hayabusa/apps/hyb1pds4gen/hyb1pds4gen.xml
@@ -3,48 +3,48 @@
<application name="hyb1pds4gen" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Convert Hayabusa1 image from from ISIS3 cube to PDS4 format
+ Convert Hayabusa1 image from from ISIS cube to PDS4 format
</brief>
<description>
- This programs exports an ISIS3 Haybusa cube to a PDS4 product.
- If available, Instrument and Mapping information will be written to the detached
+ This programs exports an ISIS Haybusa cube to a PDS4 product.
+ If available, Instrument and Mapping information will be written to the detached
output PDS4 formatted xml label file.
<p>
Note that not all require keyword values in the generated PDS4 labels can be determined automatically
- by ISIS3. Some must be updated by the user (by opening up the xml label output by this
- application and editing it with a text editor) for the generated label to be PDS4 compliant.
- The values UNK (unknown) and TBD (to be determined) are used as placeholders in
- the generated label.
- TBD are PDS4 required values and must be replaced by the user for the output label to be PDS4 compliant.
- Some of these TBDs can only be replaced with one of several specific enumerated values to meet compliancy.
- These possible values can be found in the
- <a href="https://pds.jpl.nasa.gov/pds4/doc/im/current/index_1900.html">PDS4 Information Model Specification</a>
- in the Value/Class column of the table for the associated tag or in the index at the end of the document.
- Searching this page for the name of the field you need to determine a value for is recommended.
+ by ISIS. Some must be updated by the user (by opening up the xml label output by this
+ application and editing it with a text editor) for the generated label to be PDS4 compliant.
+ The values UNK (unknown) and TBD (to be determined) are used as placeholders in
+ the generated label.
+ TBD are PDS4 required values and must be replaced by the user for the output label to be PDS4 compliant.
+ Some of these TBDs can only be replaced with one of several specific enumerated values to meet compliancy.
+ These possible values can be found in the
+ <a href="https://pds.jpl.nasa.gov/pds4/doc/im/current/index_1900.html">PDS4 Information Model Specification</a>
+ in the Value/Class column of the table for the associated tag or in the index at the end of the document.
+ Searching this page for the name of the field you need to determine a value for is recommended.
</p>
-
+
<p>
- For example: For a cube with map-projected data, ISIS3 will populate planar_coordinate
- encoding_method with a value on its own, but if it did not and instead had "TBD", we would find at
- <a href="https://pds.jpl.nasa.gov/pds4/doc/im/current/index_1900.html#attribute_cart_planar_coordinate_information_cart_planar_coordinate_encoding_method">planar_coordinate_coding_method</a>
+ For example: For a cube with map-projected data, ISIS will populate planar_coordinate
+ encoding_method with a value on its own, but if it did not and instead had "TBD", we would find at
+ <a href="https://pds.jpl.nasa.gov/pds4/doc/im/current/index_1900.html#attribute_cart_planar_coordinate_information_cart_planar_coordinate_encoding_method">planar_coordinate_coding_method</a>
that there are 3 possible values: 'Coordinate Pair', 'Distance and Bearing', 'Row and Column'.
</p>
-
+
<p>
- Not everything is in the
+ Not everything is in the
<a href="https://pds.jpl.nasa.gov/pds4/doc/im/current/index_1900.html">PDS4 Information Model Specification</a>
at this time, so if the information about a tag is not in there, it may be necessary to find
- the options in the appropriate schematron file (.sch) available at:
- <a href="https://pds.jpl.nasa.gov/pds4/schema/released/">PDS4 Released Schema</a>.
- For the previous example, the same information can be found in the
+ the options in the appropriate schematron file (.sch) available at:
+ <a href="https://pds.jpl.nasa.gov/pds4/schema/released/">PDS4 Released Schema</a>.
+ For the previous example, the same information can be found in the
<a href="https://pds.jpl.nasa.gov/pds4/cart/v1/PDS4_CART_1700.sch">PDS4 Cartography schematron file </a>.
</p>
-
+
<p>
- UNK is used as a placeholder if any value can be used and still be a valid PDS4-formatted
+ UNK is used as a placeholder if any value can be used and still be a valid PDS4-formatted
xml header. UNKs can, but are not required to be, replaced by the user with
- better information.
+ better information.
</p>
</description>
@@ -83,7 +83,7 @@
Output pds image
</brief>
<description>
- The resulting pds file. For PDS4, a detached label of the same name with the file extension .xml
+ The resulting pds file. For PDS4, a detached label of the same name with the file extension .xml
will be created in the same directory.
</description>
<filter>
@@ -100,7 +100,7 @@
</brief>
<description>
This value is used to set the required PDS4 value, logical_identifier. It should be a
- 6-part colon separated string of the form
+ 6-part colon separated string of the form
<b>urn:space_agency:archiving_agency:pds_approved_bundle_id:pds_approved_collection_id:product_id</b>.
Note that space_agency is generally "nasa" and archiving_agency is generally "pds".
</description>
diff --git a/isis/src/hayabusa/apps/nirs2isis/HayabusaNirsKernels.trn b/isis/src/hayabusa/apps/nirs2isis/HayabusaNirsKernels.trn
index cd012f2995..864cec4681 100644
--- a/isis/src/hayabusa/apps/nirs2isis/HayabusaNirsKernels.trn
+++ b/isis/src/hayabusa/apps/nirs2isis/HayabusaNirsKernels.trn
@@ -1,4 +1,4 @@
-# This translation file is used to produce the ISIS 3 Kernels label group
+# This translation file is used to produce the ISIS Kernels label group
# for Hayabusa NIRS.
# Translation = (left,right) convert the input "right" to "left"
#
diff --git a/isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncArchive.trn b/isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncArchive.trn
index 4374e5021a..a28b8dcd60 100644
--- a/isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncArchive.trn
+++ b/isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncArchive.trn
@@ -1,5 +1,5 @@
#
-# This translation file is used to produce the ISIS 3 Archive label group
+# This translation file is used to produce the ISIS Archive label group
# for the Hayabusa 2 ONC-W1, ONC-W2, and ONC-T cameras.
#
@@ -14,7 +14,7 @@ Group = ProducerId
End_Group
Group = L0FileName
- Auto
+ Auto
InputKey = P_L0NAME
InputKey = L0FILE
InputPosition = FitsLabels
@@ -67,7 +67,7 @@ Group = ImageType
Auto
Optional
InputKey = P_IMGTYP
- InputPosition = FitsExtras
+ InputPosition = FitsExtras
OutputName = ImageType
OutputPosition = (Object, IsisCube, Group, Archive)
Translation = (*, *)
@@ -104,4 +104,3 @@ Group = ImageNumber
End_Group
End
-
diff --git a/isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncBandBin.trn b/isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncBandBin.trn
index db170efedd..758972d1f4 100644
--- a/isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncBandBin.trn
+++ b/isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncBandBin.trn
@@ -1,5 +1,5 @@
#
-# This translation file is used to produce the ISIS 3 BandBin label group
+# This translation file is used to produce the ISIS BandBin label group
# for the Hayabusa 2 ONC-T camera.
# Translation = (left,right) convert the input "right" to "left"
#
diff --git a/isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncInstrument.trn b/isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncInstrument.trn
index 398f188109..8989fee193 100644
--- a/isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncInstrument.trn
+++ b/isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncInstrument.trn
@@ -1,5 +1,5 @@
#
-# This translation file is used to produce the ISIS 3 Instrument label group
+# This translation file is used to produce the ISIS Instrument label group
# for the Hayabusa 2 ONC-W1, ONC-W2, and ONC-T cameras.
# Translation = (left,right) convert the input "right" to the "left"
#
diff --git a/isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncKernels.trn b/isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncKernels.trn
index 4516171643..29522642ac 100644
--- a/isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncKernels.trn
+++ b/isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncKernels.trn
@@ -1,5 +1,5 @@
#
-# This translation file is used to produce the ISIS 3 Kernels label group
+# This translation file is used to produce the ISIS Kernels label group
# for the Hayabusa 2 ONC-W1, ONC-W2, and ONC-T cameras.
# Translation = (left,right) convert the input "right" to "left"
diff --git a/isis/src/hayabusa2/apps/hyb2onc2isis/hyb2onc2isis.xml b/isis/src/hayabusa2/apps/hyb2onc2isis/hyb2onc2isis.xml
index 787023abcc..258025ef53 100644
--- a/isis/src/hayabusa2/apps/hyb2onc2isis/hyb2onc2isis.xml
+++ b/isis/src/hayabusa2/apps/hyb2onc2isis/hyb2onc2isis.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<application name="hyb2onc2isis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
+<application name="hyb2onc2isis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<!-- $Id: hyb2onc2isis.xml 6226 2017-07-05 20:46:13Z kewilliams@usgs.gov $ -->
<brief>Import PDS/FITS formatted Hayabusa2 image into ISIS cube</brief>
@@ -7,7 +7,7 @@
<description>
<p>
This application will import and convert a Hayabusa2 Optical Navigation Camera (ONC) FITS image to an ISIS cube.
-
+
</p>
<br/>
<h3>Requirements</h3>
@@ -19,54 +19,54 @@
Output ISIS file name (.cub) (specified in <em>TO</em> label)
</li>
<li>
- Target name if target must be overridden (specified in <em>TARGET</em>).
+ Target name if target must be overridden (specified in <em>TARGET</em>).
</li>
</ul>
<p>
The input FITS formatted header file for the Hayabusa2
- image must be used in the FROM parameter.
+ image must be used in the FROM parameter.
</p>
<h3>When TARGET Parameter Should Be Specified</h3>
<ul>
<li>
- When Hayabusa2 EDR labels contain an incorrect value for the
- TARGET_NAME keyword
+ When Hayabusa2 EDR labels contain an incorrect value for the
+ TARGET_NAME keyword
</li>
<li>
- To define TARGET = "SKY" to later project the data with
+ To define TARGET = "SKY" to later project the data with
<em>skymap</em>.
</li>
</ul>
<br/>
<h2>Mission Overview</h2>
<p>
- The Hayabusa2 spacecraft was launched on 3 Dec 2014. The Optical Navigation Camera (ONC)
+ The Hayabusa2 spacecraft was launched on 3 Dec 2014. The Optical Navigation Camera (ONC)
package is positioned on the nadir-facing panel.
</p>
<p>
- The mission purpose is to rendezvous with (and provide a sample return from)
- the Apollo asteroid 162173 Ryugu, a Cg-type asteroid.
- </p>
+ The mission purpose is to rendezvous with (and provide a sample return from)
+ the Apollo asteroid 162173 Ryugu, a Cg-type asteroid.
+ </p>
<h2>Instrument Overview</h2>
<p>
- The ONC package consists of three cameras: the telescopic (ONC-T) camera and two wide-angle
- cameras (ONC-W1,ONC-W2).
+ The ONC package consists of three cameras: the telescopic (ONC-T) camera and two wide-angle
+ cameras (ONC-W1,ONC-W2).
</p>
<p>
- The wide-angle cameras each have a square 65.24 x 65.24 deg. field of view (FOV). The wide-angle
+ The wide-angle cameras each have a square 65.24 x 65.24 deg. field of view (FOV). The wide-angle
camera ONC-W1 and ONC-W2 have focal lengths of
- 10.35 mm and 10.44 mm, respectively. The telescope camera
- has a 6.35 x 6.35 deg. FOV. The telescopic camera ONC-T has a focal length of 121.1 mm.
+ 10.35 mm and 10.44 mm, respectively. The telescope camera
+ has a 6.35 x 6.35 deg. FOV. The telescopic camera ONC-T has a focal length of 121.1 mm.
</p>
<p>
- The ONC package has a set of eight bandpass filters. Below is a table of
+ The ONC package has a set of eight bandpass filters. Below is a table of
the filters and their specifications:
</p>
<br/>
<h2>ONC Filters</h2>
<p>
- The following table provides the specifications for each of the six
- ONC-T bandpass filters.
+ The following table provides the specifications for each of the six
+ ONC-T bandpass filters.
</p>
<TABLE BORDER="1">
<CAPTION>
@@ -124,12 +124,12 @@
<p>
???
</p>
-
+
<br/>
<h2>References</h2>
<br/>
<cite>
- Suzuki, H. et al. (2017) Initial Inflight Calibration for Hayabusa2 Optical Navigation Camera (ONC) for Scientific Observations of Asteroid Ryugu (in review for Icarus).
+ Suzuki, H. et al. (2017) Initial Inflight Calibration for Hayabusa2 Optical Navigation Camera (ONC) for Scientific Observations of Asteroid Ryugu (in review for Icarus).
</cite>
<br/>
<br/>
@@ -152,8 +152,8 @@
</history>
<category>
- <missionItem>Hayabusa2</missionItem>
- </category>
+ <missionItem>Hayabusa2</missionItem>
+ </category>
<groups>
<group name="Files">
@@ -164,23 +164,23 @@
Input PDS formatted detached header file for ONC image.
</brief>
<description>
- This file is the PDS label (ending in .lbl) to the image data. The
- image data are stored in FITS format with the detached .lbl file
- describing generic access to the data. The program,
- <em>hyb2onc2isis</em>, will also read the FITS file and extract
- the header contained therein. Some FITS label values are transferred
+ This file is the PDS label (ending in .lbl) to the image data. The
+ image data are stored in FITS format with the detached .lbl file
+ describing generic access to the data. The program,
+ <em>hyb2onc2isis</em>, will also read the FITS file and extract
+ the header contained therein. Some FITS label values are transferred
to the output ISIS files as well for completeness.
</description>
<filter>*.lbl *.LBL</filter>
</parameter>
-
+
<parameter name="TO">
<type>cube</type>
<pixelType>real</pixelType>
<fileMode>output</fileMode>
- <brief>Output ISIS3 cube filename</brief>
+ <brief>Output ISIS cube filename</brief>
<description>
- Use this parameter to select the output filename of the ISIS cube
+ Use this parameter to select the output filename of the ISIS cube
generated by this application.
</description>
<filter>*.cub</filter>
@@ -190,19 +190,19 @@
<group name="Parameters">
<parameter name="TARGET">
<type>string</type>
- <brief>Provide target name if absent or incorrect in input (FROM)
- label
+ <brief>Provide target name if absent or incorrect in input (FROM)
+ label
</brief>
<description>
<p>
- This parameter may be necessary as some ONC EDR labels may
- not contain correct values for the TARGET_NAME keyword. This
- parameter can be used to provide the correct name of the target.
- It may also be used to specify SKY as the target to support
- projecting data to the celestial sphere.
+ This parameter may be necessary as some ONC EDR labels may
+ not contain correct values for the TARGET_NAME keyword. This
+ parameter can be used to provide the correct name of the target.
+ It may also be used to specify SKY as the target to support
+ projecting data to the celestial sphere.
</p>
</description>
- <internalDefault>Label Value</internalDefault>
+ <internalDefault>Label Value</internalDefault>
</parameter>
</group>
</groups>
diff --git a/isis/src/juno/apps/junocam2isis/junocam2isis.xml b/isis/src/juno/apps/junocam2isis/junocam2isis.xml
index b984d970c3..5bd39670a6 100644
--- a/isis/src/juno/apps/junocam2isis/junocam2isis.xml
+++ b/isis/src/juno/apps/junocam2isis/junocam2isis.xml
@@ -3,18 +3,18 @@
<application name="junocam2isis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
- <brief>Import PDS formatted JunoCam images into ISIS3 cube format</brief>
+ <brief>Import PDS formatted JunoCam images into ISIS cube format</brief>
<description>
<p>
- This program converts a PDS formatted JunoCam image to an ISIS3
+ This program converts a PDS formatted JunoCam image to an ISIS
<def link="Cube">cube</def> format.
</p>
<p>
PDS-formatted JunoCam images contain several framelets and filters in the same image.
- For ease in processing with ISIS3, by default one input JunoCam image is converted to several output
- ISIS3 cubes and associated lists of cubes. There is one output cube for each framelet of the
+ For ease in processing with ISIS, by default one input JunoCam image is converted to several output
+ ISIS cubes and associated lists of cubes. There is one output cube for each framelet of the
PDS formatted JunoCam image, each of which is named with the prefix specified with the "TO"
user parameter, the filter name, and the 0-indexed framelet number. In the following example,
if the input image "JunoCamTest.IMG" had 2 framelets for each filter (Red, Blue, Green,
@@ -24,7 +24,7 @@ xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Applica
junocam2isis fr=JunoCamTest.LBL to=JunoCamTest.cub
</pre>
- This application will output eight ISIS3 cubes, each containing one framelet for one filter,
+ This application will output eight ISIS cubes, each containing one framelet for one filter,
<pre>
JunoCamTest_RED_0001.cub
JunoCamTest_RED_0002.cub
@@ -53,8 +53,8 @@ xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Applica
</pre>
<p>
- If the FULLCCD parameter is set to yes, instead of outputting one ISIS3 Cube per filter and
- framelet, junocam2isis will output one ISIS3 Cube for each original observation and will
+ If the FULLCCD parameter is set to yes, instead of outputting one ISIS Cube per filter and
+ framelet, junocam2isis will output one ISIS Cube for each original observation and will
contain all the filters that were part of that observation. If the above example was modified
changed to set the FULLCCD parameter to true,
</p>
@@ -89,7 +89,7 @@ xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Applica
Added missionItem under category to classify the program under Juno.
</change>
<change name="Kristin Berry" date="2018-03-27">
- Fixed problem with having too many open files. See #5232 for more information.
+ Fixed problem with having too many open files. See #5232 for more information.
</change>
</history>
diff --git a/isis/src/juno/apps/junocam2isis/main.cpp b/isis/src/juno/apps/junocam2isis/main.cpp
index 00b7eebe58..9dee039103 100644
--- a/isis/src/juno/apps/junocam2isis/main.cpp
+++ b/isis/src/juno/apps/junocam2isis/main.cpp
@@ -33,13 +33,13 @@ QList<Cube *> g_outputCubes;
QList<QString> g_outputCubeFileNames;
int g_frameletLines = 0;
QStringList g_filterList;
-QList<int> g_filterOffsetList;
+QList<int> g_filterOffsetList;
int g_fullFrameLines = 0;
void IsisMain() {
ProcessImportPds importPds;
g_outputCubes.clear();
-
+
UserInterface &ui = Application::GetUserInterface();
FileName inputFile = ui.GetFileName("FROM");
@@ -51,7 +51,7 @@ void IsisMain() {
translateLabel(inputLabel, outputLabel);
bool doFullCcd = ui.GetBoolean("FULLCCD");
- int spacecraftCode = -61500;
+ int spacecraftCode = -61500;
if (doFullCcd) {
PushFrameCameraCcdLayout ccdLayout(spacecraftCode);
@@ -76,7 +76,7 @@ void IsisMain() {
int blueLines = ccdLayout.getFrameInfo(-61501).m_lines;
int greenOffset = ccdLayout.getFrameInfo(-61502).m_startLine;
int greenLines = ccdLayout.getFrameInfo(-61502).m_lines;
- int redOffset = ccdLayout.getFrameInfo(-61503).m_startLine;
+ int redOffset = ccdLayout.getFrameInfo(-61503).m_startLine;
// Determine which filters are contained in the input label and set the fullFrameLines.
for (int i=0; i < g_filterList.size(); i++) {
@@ -98,8 +98,8 @@ void IsisMain() {
}
}
- int numFullFrames = importPds.Lines() / g_fullFrameLines;
-
+ int numFullFrames = importPds.Lines() / g_fullFrameLines;
+
// Allocate this number of total cubes of the correct size
FileName outputFileName(ui.GetFileName("TO"));
QString outputBaseName = outputFileName.removeExtension().expanded();
@@ -122,7 +122,7 @@ void IsisMain() {
QString fullFrameNumString = QString("%1").arg(i+1, 4, 10, QChar('0'));
fullFrameCube->setDimensions(ccdLayout.ccdSamples(), ccdLayout.ccdLines(), 1);
fullFrameCube->setPixelType(Isis::SignedWord);
- FileName fullFrameCubeFileName(outputBaseName
+ FileName fullFrameCubeFileName(outputBaseName
+ "_" + fullFrameNumString
+ ".cub");
fullFrameCube->create(fullFrameCubeFileName.expanded());
@@ -134,7 +134,7 @@ void IsisMain() {
progress.CheckStatus();
allCubesListFile.close();
- // Figure out where each framelet belongs as we go through and process them.
+ // Figure out where each framelet belongs as we go through and process them.
importPds.Progress()->SetText("Processing FullCCDFrame output cubes.");
importPds.StartProcess(processFullFrames);
importPds.EndProcess();
@@ -148,7 +148,7 @@ void IsisMain() {
if (!g_outputCubes[i]->isOpen()) {
g_outputCubes[i]->open(g_outputCubeFileNames[i], "rw");
}
- g_outputCubes[i]->putGroup(outputLabel.findObject("IsisCube").group(j));
+ g_outputCubes[i]->putGroup(outputLabel.findObject("IsisCube").group(j));
}
// Update the labels
Pvl *fullFrameLabel = g_outputCubes[i]->label();
@@ -158,7 +158,7 @@ void IsisMain() {
PvlGroup &bandBin = fullFrameLabel->findGroup("BandBin", PvlObject::Traverse);
bandBin.addKeyword(PvlKeyword("FilterName", "FULLCCD"),
PvlObject::Replace);
-
+
// Add filter-specific code to band bin Group
bandBin.addKeyword(PvlKeyword("NaifIkCode", toString(spacecraftCode)));
@@ -169,7 +169,7 @@ void IsisMain() {
}
progress.CheckStatus();
}
- else {
+ else {
// Process individual framelets: For now, keep processing the "old" way.
int numSubimages = importPds.Lines() / g_frameletLines;
int frameletsPerFilter = numSubimages / g_filterList.size();
@@ -199,16 +199,16 @@ void IsisMain() {
frameletCube->setDimensions(importPds.Samples(), g_frameletLines, 1);
frameletCube->setPixelType(Isis::SignedWord);
int filterIndex = i % g_filterList.size();
- FileName frameletCubeFileName(outputBaseName
- + "_" + g_filterList[filterIndex]
- + "_" + frameletNumString
+ FileName frameletCubeFileName(outputBaseName
+ + "_" + g_filterList[filterIndex]
+ + "_" + frameletNumString
+ ".cub");
frameletCube->create(frameletCubeFileName.expanded());
g_outputCubes.append(frameletCube);
frameletCube->close();
g_outputCubeFileNames.append(frameletCubeFileName.expanded());
-
+
QFile filterListFile(outputBaseName + "_" + g_filterList[filterIndex] + ".lis");
if ( (frameletNumber == 1 && !filterListFile.open(QFile::WriteOnly | QFile::Text))
|| (frameletNumber > 1 && !filterListFile.open(QFile::Append | QFile::Text)) ) {
@@ -235,9 +235,9 @@ void IsisMain() {
progress.SetMaximumSteps(numSubimages);
for (int i = 0; i < numSubimages; i++) {
// re-open cube
- QString cubeFileName = g_outputCubes[i]->fileName();
+ QString cubeFileName = g_outputCubes[i]->fileName();
if ( !g_outputCubes[i]->isOpen() ) {
- g_outputCubes[i]->open(g_outputCubeFileNames[i], "rw");
+ g_outputCubes[i]->open(g_outputCubeFileNames[i], "rw");
}
// fromeix labels
progress.CheckStatus();
@@ -254,7 +254,7 @@ void IsisMain() {
PvlGroup &bandBin = frameletLabel->findGroup("BandBin", PvlObject::Traverse);
bandBin.addKeyword(PvlKeyword("FilterName", filterName),
PvlObject::Replace);
-
+
if (filterName.compare("BLUE", Qt::CaseInsensitive) == 0) {
spacecraftCode = -61501;
}
@@ -283,11 +283,11 @@ void IsisMain() {
}
/**
- * Translate labels from PDS3 input to generic ISIS3 output. Note: Some values
- * will be updated for the individual output cubes.
- *
+ * Translate labels from PDS3 input to generic ISIS output. Note: Some values
+ * will be updated for the individual output cubes.
+ *
* @param inputLabel The input PDS3 label.
- * @param outputLabel A reference to the output ISIS3 label to be updated.
+ * @param outputLabel A reference to the output ISIS label to be updated.
*/
void translateLabel(Pvl &inputLabel, Pvl &outputLabel) {
// Get the directory where the Juno translation tables are
@@ -307,7 +307,7 @@ void translateLabel(Pvl &inputLabel, Pvl &outputLabel) {
if (spcName.compare("JUNO", Qt::CaseInsensitive) != 0
|| instId.compare("JNC", Qt::CaseInsensitive) != 0) {
- QString msg = "Unrecognized Spacecraft name ["
+ QString msg = "Unrecognized Spacecraft name ["
+ spcName
+ "] and instrument ID ["
+ instId
@@ -364,31 +364,31 @@ void translateLabel(Pvl &inputLabel, Pvl &outputLabel) {
}
/**
- * Opens cube from g_outputCubes at provided index, closes cube at index-1 (last cube)
+ * Opens cube from g_outputCubes at provided index, closes cube at index-1 (last cube)
*/
void openNextCube(int nextCubeIndex) {
if (nextCubeIndex >= 1) {
if (g_outputCubes[nextCubeIndex-1]->isOpen()) {
- g_outputCubes[nextCubeIndex - 1]->close();
+ g_outputCubes[nextCubeIndex - 1]->close();
}
}
if (!g_outputCubes[nextCubeIndex]->isOpen()) {
- g_outputCubes[nextCubeIndex]->open(g_outputCubeFileNames[nextCubeIndex], "rw");
+ g_outputCubes[nextCubeIndex]->open(g_outputCubeFileNames[nextCubeIndex], "rw");
}
}
/**
- * Separates each of the individual frames into their own file.
- *
- * @param in A reference to the input Buffer to process.
+ * Separates each of the individual frames into their own file.
+ *
+ * @param in A reference to the input Buffer to process.
*/
void processFramelets(Buffer &in) {
// get the index for the correct output cube
int outputCube = (in.Line() - 1) / g_frameletLines % g_outputCubes.size();
// When we move to a new framlet, close the old cube and open the next one to avoid
- // having too many cubes open and hitting the open file limit.
+ // having too many cubes open and hitting the open file limit.
if( ((in.Line() - 1) % g_frameletLines) == 0 ) {
openNextCube(outputCube);
}
@@ -406,21 +406,21 @@ void processFramelets(Buffer &in) {
/**
* Separates each into separate "fullframe" ccd images
- *
- * @param in A reference to the input Buffer to process.
+ *
+ * @param in A reference to the input Buffer to process.
*/
void processFullFrames(Buffer &in) {
// get the index for the correct output cube
int outputCube = (in.Line() - 1) / g_fullFrameLines % g_outputCubes.size();
// When we move to a new framlet, close the old cube and open the next one to avoid
- // having too many cubes open and hitting the open file limit.
+ // having too many cubes open and hitting the open file limit.
if( ((in.Line() - 1) % g_fullFrameLines) == 0 ) {
openNextCube(outputCube);
}
LineManager mgr(*g_outputCubes[outputCube]);
-
+
int outputCubeLineNumber = ((in.Line()-1) % g_fullFrameLines);
int filterIndex = (outputCubeLineNumber / g_frameletLines) % g_filterList.size();
outputCubeLineNumber += g_filterOffsetList[filterIndex];
@@ -432,4 +432,3 @@ void processFullFrames(Buffer &in) {
}
g_outputCubes[outputCube]->write(mgr);
}
-
diff --git a/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.xml b/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.xml
index bb0d739ae4..3b774f78b5 100644
--- a/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.xml
+++ b/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.xml
@@ -12,7 +12,7 @@
<p>
The user is given the option to specify incoming <def link="Special Pixels">special pixel</def>
values in the PDS file so that they can be assigned equivalent values for special pixels
- in ISIS3. The order of precedence for special pixels in ISIS3 from highest to
+ in ISIS. The order of precedence for special pixels in ISIS from highest to
lowest priority is the following:
<blockquote>
<ol>
@@ -32,7 +32,7 @@
example, if NULLMIN=0.0, NULLMAX=3.0, LISMIN=3.0, and LISMAX=5.0, the actual
raw value 3.0 can be assigned as a NULL or LIS, but is translated to NULL because
NULL has a higher priority than LIS. The conversion of images from ISIS2 to
- ISIS3 follows the same rules as PDS images, except that the label information
+ ISIS follows the same rules as PDS images, except that the label information
is propagated to the output file.
</p>
<p>
diff --git a/isis/src/kaguya/apps/kaguyatc2isis/KaguyaTcKernels.trn b/isis/src/kaguya/apps/kaguyatc2isis/KaguyaTcKernels.trn
index d569e993a8..35c34c19ec 100644
--- a/isis/src/kaguya/apps/kaguyatc2isis/KaguyaTcKernels.trn
+++ b/isis/src/kaguya/apps/kaguyatc2isis/KaguyaTcKernels.trn
@@ -1,4 +1,4 @@
-# This translation file is used to produce the ISIS 3 Kernels label group
+# This translation file is used to produce the ISIS Kernels label group
# for the Kaguya Terrain camera.
# Translation = (left,right) convert the input "right" to "left"
#
diff --git a/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.xml b/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.xml
index d924d98059..9e856c12dc 100644
--- a/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.xml
+++ b/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.xml
@@ -3,13 +3,13 @@
<application name="kaguyatc2isis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Import L2B0 or L2B2 Kaguya TC image to ISIS3 cube.
+ Import L2B0 or L2B2 Kaguya TC image to ISIS cube.
</brief>
<description>
- This program will import a "PDS-like" formatted Kaguya
+ This program will import a "PDS-like" formatted Kaguya
Terrain Camera (TC) level 2 image (including level 2B0 and 2B2)
- from the JAXA Kaguya archive to ISIS3.
+ from the JAXA Kaguya archive to ISIS.
Note that not all TC images may be supported by this program.
Supported input images include radiometrically corrected
unprojected images, TC maps, or TC Ortho maps.
@@ -33,10 +33,10 @@
Added check for TARGET_NAME keyword. Fixes #2036.
</change>
<change name="Jeannie Backer" date="2018-10-02">
- Added support for Kaguya L2B0 (TC1_Level2B and TC2_Level2B) files.
+ Added support for Kaguya L2B0 (TC1_Level2B and TC2_Level2B) files.
</change>
<change name="Stuart Sides" date="2019-04-25">
- Updated description provided by Lisa Gaddis.
+ Updated description provided by Lisa Gaddis.
</change>
</history>
@@ -54,7 +54,7 @@
</brief>
<description>
Use this parameter to select the Kaguya Terrain
- Camera filename. This file must contain the PDS
+ Camera filename. This file must contain the PDS
labels.
</description>
<filter>
@@ -134,14 +134,14 @@
<description>
If this option is set to "yes" or "true", a range of input raw pixels
defined by the HRSMIN and HRSMAX parameters are converted to HRS
- pixels. All other valid pixels that do not fall within the ranges
- specified for LIS, LRS, HIS, and NULL pixels are transferred to the output file
- unchanged. If the <def link="Bit Type">bit type</def> of the input
- file is changed, the NULL and HRS <def link="Special Pixels">special
- pixels</def> may be incorrectly set to valid pixel values. For example,
- if a raw 8-bit file is output to 16 or 32-bit, the pixel values "0"
- and "255" may be converted to actual values instead of retaining the
- special pixel property. If the output file remains as 8-bit, then "0"
+ pixels. All other valid pixels that do not fall within the ranges
+ specified for LIS, LRS, HIS, and NULL pixels are transferred to the output file
+ unchanged. If the <def link="Bit Type">bit type</def> of the input
+ file is changed, the NULL and HRS <def link="Special Pixels">special
+ pixels</def> may be incorrectly set to valid pixel values. For example,
+ if a raw 8-bit file is output to 16 or 32-bit, the pixel values "0"
+ and "255" may be converted to actual values instead of retaining the
+ special pixel property. If the output file remains as 8-bit, then "0"
stays as NULL and "255" stays as HRS.
</description>
<inclusions>
@@ -181,9 +181,9 @@
<description>
If this option is set to "yes" or "true", a range of input raw pixels
defined by the HISMIN and HISMAX parameters are converted to HIS
- pixels. All other valid pixels that do not fall within the ranges
- specified for LIS, LRS, HRS, and NULL pixels are transferred to the
- output file unchanged.
+ pixels. All other valid pixels that do not fall within the ranges
+ specified for LIS, LRS, HRS, and NULL pixels are transferred to the
+ output file unchanged.
</description>
<inclusions>
<item>HISMIN</item>
@@ -222,8 +222,8 @@
<description>
If this option is set to "yes" or "true", a range of input raw pixels
defined by the LRSMIN and LRSMAX parameters are converted to LRS
- pixels. All other valid pixels that do not fall within the ranges
- specified for LIS, HIS, HRS, and NULL pixels are transferred to the
+ pixels. All other valid pixels that do not fall within the ranges
+ specified for LIS, HIS, HRS, and NULL pixels are transferred to the
output file unchanged.
</description>
<inclusions>
@@ -263,8 +263,8 @@
<description>
If this option is set to "yes" or "true", a range of input raw pixels
defined by the LISMIN and LISMAX parameters are converted to LIS
- pixels. All other valid pixels that do not fall within the ranges
- specified for LRS, HIS, HRS, and NULL pixels are transferred to the
+ pixels. All other valid pixels that do not fall within the ranges
+ specified for LRS, HIS, HRS, and NULL pixels are transferred to the
output file unchanged.
</description>
<inclusions>
diff --git a/isis/src/kaguya/apps/mimap2isis/mimap2isis.xml b/isis/src/kaguya/apps/mimap2isis/mimap2isis.xml
index 79322f2a36..42c50c0097 100644
--- a/isis/src/kaguya/apps/mimap2isis/mimap2isis.xml
+++ b/isis/src/kaguya/apps/mimap2isis/mimap2isis.xml
@@ -2,11 +2,11 @@
<application name="mimap2isis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
- <brief>Import PDS formatted Kaguya MI MAP file to ISIS3 cube format</brief>
+ <brief>Import PDS formatted Kaguya MI MAP file to ISIS cube format</brief>
<description>
<p>
- This program converts PDS formatted Kaguya MI MAP files to ISIS3
+ This program converts PDS formatted Kaguya MI MAP files to ISIS
<def link="Cube">cube</def> format.
</p>
<p>
@@ -45,11 +45,11 @@
default values to obtain an image that meets specific requirements. The
program will apply a correction by changing the sign of the SAMPLE_PROJECTION_OFFSET
keyword value. The modified label is written to a temporary detached label file
- and then used to import the Kaguya MI MAP file into ISIS 3.
+ and then used to import the Kaguya MI MAP file into ISIS.
</p>
<p>
<b>Special Pixel Assignment:</b> The incoming special pixel values are assigned
- equivalent values for special pixels in ISIS 3. If any incoming pixel value falls
+ equivalent values for special pixels in ISIS. If any incoming pixel value falls
within two different special pixel types, the special pixel with the higher priority
is assigned. The precedence for special pixels in ISIS from highest to lowest is
1)<b>NULL</b>, 2)<b>HRS</b>, 3)<b>LRS</b>, 4)<b>HIS</b>, and 5)<b>LIS</b>.
@@ -92,7 +92,7 @@
default values and log them if so.
</change>
<change name="Christopher Combs" date ="2018-01-19">
- Changed call to SetPdsFile to reflect changes to PvlToPvlTranslationManager. Fixes #4345,
+ Changed call to SetPdsFile to reflect changes to PvlToPvlTranslationManager. Fixes #4345,
#4421.
</change>
</history>
diff --git a/isis/src/lo/apps/lo2isis/lo2isis.xml b/isis/src/lo/apps/lo2isis/lo2isis.xml
index c804969450..a13f83e9a9 100644
--- a/isis/src/lo/apps/lo2isis/lo2isis.xml
+++ b/isis/src/lo/apps/lo2isis/lo2isis.xml
@@ -3,11 +3,11 @@
<application name="lo2isis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Import an Isis 2 Lunar Orbiter image file into Isis 3.
+ Import an Isis 2 Lunar Orbiter image file into Isis.
</brief>
<description>
- This program will import a Lunar Orbiter PDS or Isis 2 Cube image file into
+ This program will import a Lunar Orbiter PDS or Isis 2 Cube image file into
an Isis cube.
</description>
@@ -80,7 +80,7 @@
Using lo2isis
</brief>
<description>
- The use of lo2isis to ingest Isis2 cubes and output Isis3 cubes with the correct labels.
+ The use of lo2isis to ingest Isis2 cubes and output Isis cubes with the correct labels.
</description>
<terminalInterface>
<commandLine>
@@ -88,10 +88,10 @@
to= 3133_h1.cub
</commandLine>
<description>
- This example shows the use of lo2isis to create an Isis3 cube from an Isis2 cube.
+ This example shows the use of lo2isis to create an Isis cube from an Isis2 cube.
</description>
</terminalInterface>
-
+
<guiInterfaces>
<guiInterface>
<image width="448" height="550" src="assets/images/lo2isisGUI.jpg">
diff --git a/isis/src/lo/apps/lopdsgen/lopdsgen.xml b/isis/src/lo/apps/lopdsgen/lopdsgen.xml
index b1f40e0cd6..db5fa837fb 100644
--- a/isis/src/lo/apps/lopdsgen/lopdsgen.xml
+++ b/isis/src/lo/apps/lopdsgen/lopdsgen.xml
@@ -3,11 +3,11 @@
<application name="lopdsgen" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Convert from Isis 3 Lunar Orbiter cubes to the PDS format
+ Convert from Isis Lunar Orbiter cubes to the PDS format
</brief>
<description>
- Program to convert Isis 3 cubes for Lunar Orbiter strips and level 1 products
+ Program to convert Isis cubes for Lunar Orbiter strips and level 1 products
to PDS image files.
</description>
@@ -24,7 +24,7 @@
Updated test and example for changes to PVL.
</change>
<change name="Travis Addair" date="2010-02-16">
- Added support for reexporting the cubes generated from PDS files produced
+ Added support for reexporting the cubes generated from PDS files produced
by this application.
</change>
</history>
@@ -38,7 +38,7 @@
Input cube to be converted
</brief>
<description>
- The LO strip or level 1 Isis 3 cube to be converted to PDS format.
+ The LO strip or level 1 Isis cube to be converted to PDS format.
</description>
<filter>
*.cub
@@ -120,7 +120,7 @@
<default><item>true</item></default>
<brief>Dedicates the minimum DN value for null pixels.</brief>
<description>
- If set to true, the minimum value of the raw output data will be
+ If set to true, the minimum value of the raw output data will be
reserved for null pixels. The actual value used for null pixels will
be denoted in the print.prt file as well as displayed onscreen.
</description>
@@ -305,7 +305,7 @@
</list>
</parameter>
</group>
-
+
<group name="Special Keyword">
<parameter name="NOTE">
<type>string</type>
@@ -314,13 +314,13 @@
Value for the output PDS keyword NOTE
</brief>
<description>
- This parameter allows the user to specify the value of the standard
+ This parameter allows the user to specify the value of the standard
PDS keyword NOTE within the output PDS label. This keyword
will be located in the Root of the PDS PVL label.
</description>
</parameter>
</group>
- </groups>
+ </groups>
<examples>
<example>
@@ -328,8 +328,8 @@
Export Level 1 cube to 32-bit PDS
</brief>
<description>
- This example shows a typical conversion of an Isis 3 Lunar
- Orbiter cube to a PDS format image. The default settings
+ This example shows a typical conversion of an Isis Lunar
+ Orbiter cube to a PDS format image. The default settings
produce 32-bit data with least significant byte first order.
</description>
<terminalInterface>
@@ -337,11 +337,11 @@
from=lev1.cub to=lev1.pds.img
</commandLine>
<description>
- In this example, lopdsgen will convert a cube to a pds
+ In this example, lopdsgen will convert a cube to a pds
format image with all settings left at their defaults.
</description>
</terminalInterface>
-
+
<guiInterfaces>
<guiInterface>
<image width="614" height="750" src="assets/images/baseGui.jpg">
@@ -349,21 +349,21 @@
Example GUI
</brief>
<description>
- Screenshot of GUI with parameters set to export a level1 LO
+ Screenshot of GUI with parameters set to export a level1 LO
cube to a PDS image.
</description>
<thumbnail width="164" height="200" caption="lopdsgen gui" src="assets/thumbs/baseGui.jpg" />
</image>
</guiInterface>
</guiInterfaces>
-
+
<inputImages>
<image src="assets/images/input_level1.jpg" width="500" height="500">
<brief>
Input cube for lopdsgen
</brief>
<description>
- This is an Isis 3 cube, specifically a level 1 LO product, that
+ This is an Isis cube, specifically a level 1 LO product, that
will be exported to a standard PDS format image.
</description>
<thumbnail caption="lev1.cub" src="assets/thumbs/input_level1.jpg" width="200" height="200" />
@@ -375,18 +375,18 @@
<dataFile path="assets/input_labels.pvl">
<brief>Click here for the labels of the input image</brief>
<description>
- This PVL contains the labels of the Isis 3, level 1 LO input
- image that will be exported to a PDS.
+ This PVL contains the labels of the Isis, level 1 LO input
+ image that will be exported to a PDS.
</description>
</dataFile>
<dataFile path="assets/output_labels.pvl">
<brief>Click here for the labels of the output image</brief>
<description>
- This PVL contains the labels of the PDS format image that has
- been generated from an Isis 3, level 1 LO cube.
+ This PVL contains the labels of the PDS format image that has
+ been generated from an Isis, level 1 LO cube.
</description>
</dataFile>
- </dataFiles>
+ </dataFiles>
<outputImages>
<image src="assets/images/output_level1.jpg" width="500" height="500">
@@ -394,12 +394,12 @@
Output pds image from lopdsgen
</brief>
<description>
- This is a PDS format image that has been produced by exporting the
- input Isis 3, level 1 LO cube with default settings.
+ This is a PDS format image that has been produced by exporting the
+ input Isis, level 1 LO cube with default settings.
</description>
<thumbnail caption="lev1.pds.img" src="assets/thumbs/output_level1.jpg" width="200" height="200" />
<parameterName>TO</parameterName>
- </image>
+ </image>
</outputImages>
</example>
</examples>
diff --git a/isis/src/lo/apps/lopdsgen/main.cpp b/isis/src/lo/apps/lopdsgen/main.cpp
index f5e6a37a5a..52f6864022 100644
--- a/isis/src/lo/apps/lopdsgen/main.cpp
+++ b/isis/src/lo/apps/lopdsgen/main.cpp
@@ -87,7 +87,7 @@ void IsisMain() {
// Transfer the instrument group to the output cube
QString transDir = "$ISISROOT/appdata/translations/";
- // Isis 3 cubes being exported for the first time
+ // Isis cubes being exported for the first time
if(!origLabel.hasKeyword("PRODUCT_TYPE", Pvl::Traverse)) {
PvlToPvlTranslationManager orig(origLabel, transDir + "LoOriginalExport.trn");
diff --git a/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.cpp b/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.cpp
index f713c9e8ee..b056053729 100644
--- a/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.cpp
+++ b/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.cpp
@@ -40,7 +40,7 @@ namespace Isis {
*
* @throws IException::User - "Unable to read fiducial mapping from cube
* labels - Input cube must be processed in Isis 2 through
- * lofixlabel and converted to Isis 3 with pds2isis"
+ * lofixlabel and converted to Isis with pds2isis"
*/
void LoCameraFiducialMap::ReadFiducials(PvlGroup &inst) {
@@ -62,7 +62,7 @@ namespace Isis {
catch(IException &e) {
string msg = "Unable to read fiducial mapping from cube labels - ";
msg += "Input cube must be processed in Isis 2 through lofixlabel ";
- msg += "and converted to Isis 3 with pds2isis";
+ msg += "and converted to Isis with pds2isis";
throw IException(e, IException::User, msg, _FILEINFO_);
}
}
diff --git a/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.h b/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.h
index 61cd69ee5b..43ade5f9ba 100644
--- a/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.h
+++ b/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.h
@@ -1,8 +1,8 @@
#ifndef LoCameraFiducialMap_h
#define LoCameraFiducialMap_h
/**
- * @file
- *
+ * @file
+ *
* Unless noted otherwise, the portions of Isis written by the USGS are public
* domain. See individual third-party library and package descriptions for
* intellectual property information,user agreements, and related information.
@@ -31,7 +31,7 @@ namespace Isis {
* either the Lunar Orbiter High Resolution Camera or the Lunar Orbiter Medium
* resolution camera for any of the last three Lunar Orbiter missions. The
* transformation map is an affine transformation defined by values written in
- * the Isis 3 Instrument group labels.
+ * the Isis Instrument group labels.
*
* This class will load the fiducial sample/line and x/y values from the labels,
* compute the coefficients of the affine transformation, and place the
diff --git a/isis/src/lro/apps/lromakeflat/lromakeflat.xml b/isis/src/lro/apps/lromakeflat/lromakeflat.xml
index 3dfdae87a8..29ce06e337 100644
--- a/isis/src/lro/apps/lromakeflat/lromakeflat.xml
+++ b/isis/src/lro/apps/lromakeflat/lromakeflat.xml
@@ -8,11 +8,11 @@
<description>
<p>
- This program creates flat-field images for line scan, push frame, and framing instruments.
+ This program creates flat-field images for line scan, push frame, and framing instruments.
All input cubes should have the same number of samples; any images in the list that do not
- have the same number of samples as the first image will not be used. The names of the cube
- files used to create the flat-field image must be entered using an ASCII file (FROMLIST) with
- one filename per line (any line beginning with a '#' or '//' is treated as a comment). The
+ have the same number of samples as the first image will not be used. The names of the cube
+ files used to create the flat-field image must be entered using an ASCII file (FROMLIST) with
+ one filename per line (any line beginning with a '#' or '//' is treated as a comment). The
specific equation for each camera type is below.
</p>
<ul>
@@ -23,14 +23,14 @@
<br />
Mean Calculation:
<br />
- Sum( Sum(FrameColumn) / Average(Frame) * ValidPixels(FrameColumn) ) /
+ Sum( Sum(FrameColumn) / Average(Frame) * ValidPixels(FrameColumn) ) /
TotalColumnValidPixels
<br />
Median Calculation:
<br />
Median(PixelColumn(ValidPixel / Average(Frame)))
</p>
-
+
<li>Push Frame</li>
<p>
Mean Calculation:
@@ -61,7 +61,7 @@
<history>
<change name="Victor Silva" date="2016-09-12">
- Original version, Adapted from Isis3 version of makeflat.
+ Original version, Adapted from Isis version of makeflat.
</change>
</history>
diff --git a/isis/src/mariner/apps/mar102isis/main.cpp b/isis/src/mariner/apps/mar102isis/main.cpp
index eb548723ff..531aa4e746 100644
--- a/isis/src/mariner/apps/mar102isis/main.cpp
+++ b/isis/src/mariner/apps/mar102isis/main.cpp
@@ -321,7 +321,7 @@ void UpdateLabels(Cube *cube, const QString &labels) {
cube->write(ol);
}
-// Translate Isis 2 labels into Isis 3 labels.
+// Translate Isis 2 labels into Isis labels.
void TranslateIsis2Labels(FileName &labelFile, Cube *oCube) {
// Transfer the instrument group to the output cube
QString transDir = "$ISISROOT/appdata/translations/";
diff --git a/isis/src/mariner/apps/mar10cal/mar10cal.xml b/isis/src/mariner/apps/mar10cal/mar10cal.xml
index 396ffc399c..d31bad9bb0 100644
--- a/isis/src/mariner/apps/mar10cal/mar10cal.xml
+++ b/isis/src/mariner/apps/mar10cal/mar10cal.xml
@@ -13,14 +13,14 @@
MAR10CAL performs a dark curent correction and linearization of
Mariner 10 images. Key documents to refer to:
-
+
MVM 73 TV Subsystem Calibration Report, M. Benesh and M. Morrill,
JPL 615-148, 1973.
Acquisition and Description of Mariner 10 Television Science Data
at Mercury, G.E. Danielson, K.P. Klaasen, J.L. Anderson, Jour.
- Geophys. Research, Vol. 80, No. 17, pp 2357-2393, 1975 (and other
+ Geophys. Research, Vol. 80, No. 17, pp 2357-2393, 1975 (and other
articles in this issue).
-
+
It should be noted that the flat field and sensitivity fluctuates as
a function of vidicon temperature (especially for camera A).
The camera heater was not functioning during encounters 2 and 3
@@ -32,11 +32,11 @@
the results are not reliable for any quantitative applications
such as albedo measurements (absolute or relative) or
photoclinometry.
-
+
The situation is not hopeless, much effort has gone into deriving a
fix for the 2nd and 3rd encounter frames and a future update of mar10cal
will incorporate this work.
-
+
</p>
</description>
@@ -45,7 +45,7 @@
Original version
</change>
<change name="Tracie Sucharski" date="2009-04-15">
- Converted to Isis3
+ Converted to Isis
Isis2 Change History:
Oct 25 1991 - Tammy Becker, USGS,Flagstaff, Converted
@@ -59,7 +59,7 @@
Apr 23 1996 TLS, Added user parameter of EXPOFF, also bomb
neatly if EXPOSURE on labels is 0.
Apr 29 1996 TLS, Added new RFFCOEF values.
- May 02 1996 TLS, Added user parameter ABSCOEF
+ May 02 1996 TLS, Added user parameter ABSCOEF
May 03 1996 TLS, Changed name of WAVECOEF to RFFCOEF(Relative
Filter Factor Coefficient)
May 16 1996 TLS, Get rid of Relative Filter Factor, corrected
@@ -67,7 +67,7 @@
May 17 1996 TLS, Add new dark current files.
May 28 1996 TLS, If input pixel - dark current is <, set
output pixel to NULL. Also add new coefficient
- file.
+ file.
</change>
<change name="Travis Addair" date="2010-09-03">
First commit, added exception handling, finished conversion.
@@ -132,18 +132,18 @@
In most cases the default should be used and the files
derived from the prelaunch calibration flat fields
will be used. These files are named -
-
+
$ISISMAR10DATA/mariner_10_"First 3 letters of FILTER_NAME"_
"INSTRUMENT_ID"_coef.cub.
-
+
See also
1) Robinson et al., Jour. Geophys. Res., 97, p.18265-18274,
1992.
2) Robinson and Lucey, Science, 275, p. 197-200, 1997.
3) Robinson et al., abstracts of Lunar Planetary Sci. Conf.
- XXVIII, p. 1187-1188, Lunar and Planetary Inst,
- Houston, TX, 1997.
- </p>
+ XXVIII, p. 1187-1188, Lunar and Planetary Inst,
+ Houston, TX, 1997.
+ </p>
</description>
</parameter>
<parameter name="DCCUBE">
@@ -159,7 +159,7 @@
current file. In most cases, the default should be used for
this parameter to indicate the derived dark current file is
to be used. The name of the derived dark current file is
- $ISISDATA/mariner10//mariner_10_"InstrumentId"_dc.cub. The
+ $ISISDATA/mariner10//mariner_10_"InstrumentId"_dc.cub. The
InstrumentId wil have a value of "A" or "B".
</description>
</parameter>
@@ -199,7 +199,7 @@
<description>
Approximation for iterative solution.
</description>
- </parameter>
+ </parameter>
<parameter name="ABSCOEF">
<type>double</type>
<internalDefault>Internal Default</internalDefault>
@@ -214,13 +214,13 @@
combination) are still being refined. The values are being
derived by forcing global mosaics (photometrically
corrected) to Earth based measurements.
-
- for futher explanation see;
-
+
+ for futher explanation see;
+
1) Robinson and Lucey, Science, 275, p. 197-200.
- 2) Robinson et al., abstract of Lunar Planetary Sci. Conf.
- XXVIII, p. 1187-1188, 1997.
-
+ 2) Robinson et al., abstract of Lunar Planetary Sci. Conf.
+ XXVIII, p. 1187-1188, 1997.
+
</p>
</description>
</parameter>
@@ -234,13 +234,13 @@
<p>
Offset to be added to Exposure time. If the default of
NULL is used the following values are added to the offset:
-
+
Camera A EXPOFF = 0.316 msecs
Camera B EXPOFF = 3.060 msecs
-
+
These values are taken directly from the Benesh and Morrill
JPL calibration document. They state that there are some
- unknowns with these values... Read the section on their
+ unknowns with these values... Read the section on their
page 38.
</p>
</description>
diff --git a/isis/src/mgs/apps/mocgap/mocgap.xml b/isis/src/mgs/apps/mocgap/mocgap.xml
index 235af2ee26..26e7b49a92 100644
--- a/isis/src/mgs/apps/mocgap/mocgap.xml
+++ b/isis/src/mgs/apps/mocgap/mocgap.xml
@@ -6,9 +6,9 @@
</brief>
<description>
- Fixes data gaps in MOC images that occur around detector 371. The program
- calculates the average and standard deviation of the 5 pixels on a line
- centered at detector 371 and
+ Fixes data gaps in MOC images that occur around detector 371. The program
+ calculates the average and standard deviation of the 5 pixels on a line
+ centered at detector 371 and
</description>
<category>
@@ -20,7 +20,7 @@
Original version
</change>
<change name="Brendan George" date="2005-11-21">
- Converted to Isis3
+ Converted to Isis
</change>
</history>
@@ -41,7 +41,7 @@
*.cub
</filter>
</parameter>
-
+
<parameter name="TO">
<type>cube</type>
<fileMode>output</fileMode>
diff --git a/isis/src/mro/apps/crism2isis/crism2isis.cpp b/isis/src/mro/apps/crism2isis/crism2isis.cpp
index 259e7d02bc..89e17c7aae 100644
--- a/isis/src/mro/apps/crism2isis/crism2isis.cpp
+++ b/isis/src/mro/apps/crism2isis/crism2isis.cpp
@@ -162,7 +162,7 @@ namespace Isis{
results.setName("Results");
results += PvlKeyword("Warning",
"When using cam2map or cam2cam, images imported into "
- "Isis3 using crism2isis should only be interpolated "
+ "Isis using crism2isis should only be interpolated "
"using the nearest-neighbor algorithm due to gimble "
"jitter of the MRO CRISM instrument.");
if (log){
diff --git a/isis/src/mro/apps/hideal2pds/hideal2pds.xml b/isis/src/mro/apps/hideal2pds/hideal2pds.xml
index 6a624d3642..7efa340d48 100644
--- a/isis/src/mro/apps/hideal2pds/hideal2pds.xml
+++ b/isis/src/mro/apps/hideal2pds/hideal2pds.xml
@@ -2,13 +2,13 @@
<application name="hideal2pds" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Export an Isis3 mosaicked ideal cube from a HiRISE image to a PDS product
- containing related spice data.
+ Export an Isis mosaicked ideal cube from a HiRISE image to a PDS product
+ containing related spice data.
</brief>
<description>
<pre>
- This application takes an Isis3 cube from the HiRISE instrument that
+ This application takes an Isis cube from the HiRISE instrument that
has been jitter corrected and mosaicked and exports it to a PDS product
with detached label and spice tables.
@@ -34,10 +34,10 @@
</LI>
</OL>
- The output PDS image will be unsigned word 16 bit type, MSB, BSQ format
+ The output PDS image will be unsigned word 16 bit type, MSB, BSQ format
and the resolution will be in meters.
- Note that the IMAGE_JITTER_CORRECTED keyword is copied from the input
+ Note that the IMAGE_JITTER_CORRECTED keyword is copied from the input
cube. If the input cube has been run through an older version of hijitter,
this value will be set to UNK, since it is not known whether the image
values have been jitter corrected.
@@ -47,7 +47,7 @@
<category>
<missionItem>Mars Reconnaissance Orbiter</missionItem>
- </category>
+ </category>
<history>
<change name="Jeannie Backer" date="2012-11-21">
@@ -60,7 +60,7 @@
Added an option to control the output bits. min = 8, max =16, default = 10. Fixes #5527.
</change>
<change name="Timothy Giroux" date="2020-09-08">
- Output label now has the correct SAMPLE_BIT_MASK value according to bits input. Fixes #3978.
+ Output label now has the correct SAMPLE_BIT_MASK value according to bits input. Fixes #3978.
</change>
</history>
@@ -70,11 +70,11 @@
<type>cube</type>
<fileMode>input</fileMode>
<brief>
- Isis3 ideal camera cube to be exported to PDS format
+ Isis ideal camera cube to be exported to PDS format
</brief>
<description>
- The Ideal cube from a HiRISE image containing the related spice data
- to be exported to PDS.
+ The Ideal cube from a HiRISE image containing the related spice data
+ to be exported to PDS.
</description>
<filter>
*.cub *.lbl
@@ -88,8 +88,8 @@
Output PDS file name.
</brief>
<description>
- The file name of the output PDS image. This value will also be used
- for the name of the detached label and table files.
+ The file name of the output PDS image. This value will also be used
+ for the name of the detached label and table files.
</description>
<filter>
*.img
@@ -107,8 +107,8 @@
Value for the output PDS keyword PRODUCT_VERSION_ID
</brief>
<description>
- This parameter allows the user to specify the value of the standard
- PDS keyword PRODUCT_VERSION_ID within the output PDS label. This
+ This parameter allows the user to specify the value of the standard
+ PDS keyword PRODUCT_VERSION_ID within the output PDS label. This
keyword will be located in the Root of the PDS PVL label. This value
defaults to 1.0.
</description>
@@ -121,9 +121,9 @@
Value for the output PDS keyword RATIONALE_DESC
</brief>
<description>
- This parameter allows the user to specify the value of the standard
+ This parameter allows the user to specify the value of the standard
PDS keyword RATIONALE_DESC within the output PDS label. This keyword
- will be located in the ROOT of the PDS PVL label. Note that if a
+ will be located in the ROOT of the PDS PVL label. Note that if a
keyword value is not entered, the value will be read from the input
cube labels. If it does not exist there, the program will throw an ]
error.
@@ -146,7 +146,7 @@
<brief>Automatically calculate stretch</brief>
<description>Automatically calculate stretch</description>
<exclusions>
- <item>MIN</item>
+ <item>MIN</item>
<item>MAX</item>
</exclusions>
</option>
@@ -154,7 +154,7 @@
<brief>User defined stretch</brief>
<description>User defined stretch</description>
<exclusions>
- <item>MINPER</item>
+ <item>MINPER</item>
<item>MAXPER</item>
</exclusions>
</option>
@@ -187,7 +187,7 @@
Minimum DN valid percentage
</brief>
<description>
- The cumulative percentage value to be mapped to the minimum
+ The cumulative percentage value to be mapped to the minimum
valid pixel for the specified number of bits. For example: With BITS=10
and MINPER=1.0, the DN which corresponds to the cummulative
percent of 1.0 will be mapped to 3, where 0 represents NULL, 1
@@ -211,10 +211,10 @@
Mazimum DN valid percentage
</brief>
<description>
- The cumulative percentage value to be mapped to the maximum
+ The cumulative percentage value to be mapped to the maximum
valid pixel for the specified number of bits. For example: With BITS=10
and MINPER=99.0, the DN which corresponds to the cummulative
- percent of 99.0 will be mapped to 1021, 1021=(2**bits)-1-2.
+ percent of 99.0 will be mapped to 1021, 1021=(2**bits)-1-2.
Where 1023 represents HIS and 1022 represents HRS.
</description>
<minimum inclusive="yes">0.0</minimum>
diff --git a/isis/src/mro/apps/hirdrgen/hirdrgen.xml b/isis/src/mro/apps/hirdrgen/hirdrgen.xml
index f7696b9fba..a0f3807397 100644
--- a/isis/src/mro/apps/hirdrgen/hirdrgen.xml
+++ b/isis/src/mro/apps/hirdrgen/hirdrgen.xml
@@ -10,7 +10,7 @@
Takes an input Isis cube with HiRISE RDR specific labels, and outputs a PDS compatible file.
The DN values are NOT assumed to be between 0.0 and 1.0.
All DN values between MINPER and MAXPER will be stretched to an unsigned integer with
- a size equal to the number of bits specified by BITS, excluding the special pixels.
+ a size equal to the number of bits specified by BITS, excluding the special pixels.
<p>
NOTE: This program does not generate the final PDS HiRISE product. The output
from this program is converted to a JPEG 2000 in the HiRISE pipeline processing.
@@ -70,27 +70,27 @@
Added parameters to allow for a user specified manual stretch.
</change>
<change name="Steven Lambright" date="2008-05-13">
- Removed references to CubeInfo
+ Removed references to CubeInfo
</change>
- <change name="Stuart Sides" date="2008-06-06">
- Changed output keyword PRODUCT_VERSION_ID from an automatic
- translation to a user input parameter
+ <change name="Stuart Sides" date="2008-06-06">
+ Changed output keyword PRODUCT_VERSION_ID from an automatic
+ translation to a user input parameter
</change>
- <change name="Steven Lambright" date="2008-07-10">
+ <change name="Steven Lambright" date="2008-07-10">
Added Rationale Description option
</change>
- <change name="Janet Barrett" date="2010-02-17">
+ <change name="Janet Barrett" date="2010-02-17">
Added ability to write output file in JPEG2000 format.
</change>
- <change name="Christopher Austin" date="2010-03-01">
+ <change name="Christopher Austin" date="2010-03-01">
Fixed an error which misplaced the proper SCALING_FACTOR and OFFSET
keyword values.
</change>
- <change name="Jeannie Backer" date="2012-11-21">
+ <change name="Jeannie Backer" date="2012-11-21">
Changed bandwidth units from nm to NM. Fixed bug so that the program
no uses the default MAXPER=100 value correctly. References #678
PROG: [Changed ProcessExportPds::SetDetached() method call to correct
- spelling. Added g_ to global variables to meet Isis3 standards.]
+ spelling. Added g_ to global variables to meet Isis standards.]
</change>
<change name="Tracie Sucharski" date="2012-12-06">
Changed to use TProjection instead of Projection. References #775
@@ -111,7 +111,7 @@
<description>
This is the Isis cube to be exported to PDS format. All bands of the cube will be exported to the PDS file.
</description>
- <filter>*.cub</filter>
+ <filter>*.cub</filter>
</parameter>
<parameter name="TO">
@@ -121,7 +121,7 @@
The ouput file
</brief>
<description>
- This is the destination file, where the input cube data will
+ This is the destination file, where the input cube data will
be written in PDS format. This file will have unsigned 16 bit DN values in the
PDS IMAGE object no matter what type the input file is. All valid data from the input
cube will be converted to unsigned, 16 bit, most significant byte first (Big Endian).
@@ -145,7 +145,7 @@
<brief>Automatically calculate stretch</brief>
<description>Automatically calculate stretch</description>
<exclusions>
- <item>MIN</item>
+ <item>MIN</item>
<item>MAX</item>
</exclusions>
</option>
@@ -153,7 +153,7 @@
<brief>User defined stretch</brief>
<description>User defined stretch</description>
<exclusions>
- <item>MINPER</item>
+ <item>MINPER</item>
<item>MAXPER</item>
</exclusions>
</option>
@@ -186,7 +186,7 @@
Minimum DN valid percentage
</brief>
<description>
- The cumulative percentage value to be mapped to the minimum
+ The cumulative percentage value to be mapped to the minimum
valid pixel for the specified number of bits. For example: With BITS=10
and MINPER=1.0, the DN which corresponds to the cummulative
percent of 1.0 will be mapped to 3, where 0 represents NULL, 1
@@ -210,10 +210,10 @@
Mazimum DN valid percentage
</brief>
<description>
- The cumulative percentage value to be mapped to the maximum
+ The cumulative percentage value to be mapped to the maximum
valid pixel for the specified number of bits. For example: With BITS=10
and MINPER=99.0, the DN which corresponds to the cummulative
- percent of 99.0 will be mapped to 1021, 1021=(2**bits)-1-2.
+ percent of 99.0 will be mapped to 1021, 1021=(2**bits)-1-2.
Where 1023 represents HIS and 1022 represents HRS.
</description>
<minimum inclusive="yes">0.0</minimum>
@@ -239,14 +239,14 @@
The number of bits to compress the input data to. The valid data as
well as the five special pixel values (NULL, LIS, LRS, HIS, HRS) will be
compressed into this number of bits. The output data type will be
- automaticity choosen using this value. A value of 8 will create
+ automaticity choosen using this value. A value of 8 will create
unsigned byte output files. Values from 9 to 16 will create unsigned
word output files. Unused bits in the unsigned word output file will be
set to zero.
</description>
<minimum inclusive="yes">8</minimum>
<maximum inclusive="yes">16</maximum>
- </parameter>
+ </parameter>
<parameter name="ENCODING_TYPE">
<type>string</type>
<default><item>NONE</item></default>
@@ -267,7 +267,7 @@
<description>The data is encoded as JPEG2000</description>
</option>
</list>
- </parameter>
+ </parameter>
</group>
<group name="Special Keyword">
@@ -280,8 +280,8 @@
Value for the output PDS keyword PRODUCT_VERSION_ID
</brief>
<description>
- This parameter allows the user to specify the value of the standard
- PDS keyword PRODUCT_VERSION_ID within the output PDS label. This
+ This parameter allows the user to specify the value of the standard
+ PDS keyword PRODUCT_VERSION_ID within the output PDS label. This
keyword will be located in the Root of the PDS PVL label.
</description>
</parameter>
@@ -292,7 +292,7 @@
Value for the output PDS keyword RATIONALE_DESC
</brief>
<description>
- This parameter allows the user to specify the value of the standard
+ This parameter allows the user to specify the value of the standard
PDS keyword RATIONALE_DESC within the output PDS label. This keyword
will be located in the Root of the PDS PVL label.
</description>
diff --git a/isis/src/mro/apps/pds2hideal/pds2hideal.xml b/isis/src/mro/apps/pds2hideal/pds2hideal.xml
index 253973ced8..70a49c7f70 100644
--- a/isis/src/mro/apps/pds2hideal/pds2hideal.xml
+++ b/isis/src/mro/apps/pds2hideal/pds2hideal.xml
@@ -2,13 +2,13 @@
<application name="pds2hideal" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Reimport an exported hirise PDS product to an Isis 3 Ideal camera.
+ Reimport an exported hirise PDS product to an Isis Ideal camera.
</brief>
<description>
<pre>
The purpose oof this program is to re-import exported HiRISE Ideal camera cubes
- into Isis3. The input label for this program should be a PDS label containing the
+ into Isis. The input label for this program should be a PDS label containing the
location of the exported image and table files.
This application requires the following files:
@@ -27,7 +27,7 @@
<category>
<missionItem>Mars Reconnaissance Orbiter</missionItem>
- </category>
+ </category>
<history>
<change name="Jeannie Backer" date="2012-11-21">
@@ -40,11 +40,11 @@
<parameter name="FROM">
<type>filename</type>
<fileMode>input</fileMode>
- <brief>
+ <brief>
Input file containing the PDS label.
</brief>
<description>
- Name of the file containing the labels of the input PDS image.
+ Name of the file containing the labels of the input PDS image.
</description>
<filter>
*.img *.lbl
@@ -55,11 +55,11 @@
<type>cube</type>
<fileMode>output</fileMode>
<brief>
- Name of the output file to contain the imported Isis3 cube.
+ Name of the output file to contain the imported Isis cube.
</brief>
<description>
The name of the output file. This file will contain the imported
- Isis3 HiRISE Ideal cube and the related Spice Tables.
+ Isis HiRISE Ideal cube and the related Spice Tables.
</description>
<pixelType>signedWord</pixelType>
<filter>
@@ -71,20 +71,20 @@
<type>string</type>
<brief>
String containing the location of the ShapeModel file of the original
- Isis3 cube that was exported to PDS.
+ Isis cube that was exported to PDS.
</brief>
<description>
This parameter should contain the directory path of the ShapeModel
- file. This path will be added to the ShapeModel keyword in the
+ file. This path will be added to the ShapeModel keyword in the
Kernels Group of the output cube. It should be the same path as shown
- in the original Isis3 cube before it was exported to the PDS product.
+ in the original Isis cube before it was exported to the PDS product.
</description>
<default>
<item>
$base/dems/
</item>
</default>
- </parameter>
+ </parameter>
</group>
</groups>
diff --git a/isis/src/mro/objs/HiLab/HiLab.h b/isis/src/mro/objs/HiLab/HiLab.h
index 171989b3b7..aabff15814 100644
--- a/isis/src/mro/objs/HiLab/HiLab.h
+++ b/isis/src/mro/objs/HiLab/HiLab.h
@@ -29,7 +29,7 @@ namespace Isis {
/**
* @brief Process HiRise label
*
- * This class retrieves label keyword values from an Isis3
+ * This class retrieves label keyword values from an Isis
* HiRise cube file. This class receives a Cube object from
* an opened HiRise cube file and has methods to return HiRise
* specific keyword values from the label.
@@ -49,64 +49,64 @@ namespace Isis {
class HiLab {
public:
HiLab(Cube *cube);
-
+
/**
- * Returns the value of the CpmmNumber keyword read from the instrument
- * group in the labels of a hiris cube
- *
+ * Returns the value of the CpmmNumber keyword read from the instrument
+ * group in the labels of a hiris cube
+ *
* @return int The cpmm number from the cube's labels
*/
int getCpmmNumber() {
return p_cpmmNumber;
};
-
+
/**
* Returns the value of the ChannelNumber keyword read from the instrument
- * group in the labels of a hirise cube
- *
+ * group in the labels of a hirise cube
+ *
* @return int The channel number from the cube's labels
*/
int getChannel() {
return p_channel;
};
-
+
/**
- * Returns the bin value, read as the value of the Summing keyword from
- * the instrument group in the labels of a hirise cube
- *
+ * Returns the bin value, read as the value of the Summing keyword from
+ * the instrument group in the labels of a hirise cube
+ *
* @return int The bin value from the cube's labels
- */
+ */
int getBin() {
return p_bin;
};
/**
- * Returns the value of the Tdi keyword read from the instrument group in
- * the labels of a hirise cube
- *
+ * Returns the value of the Tdi keyword read from the instrument group in
+ * the labels of a hirise cube
+ *
* @return int The tdi from the cube's labels
- */
+ */
int getTdi() {
return p_tdi;
};
-
+
/**
- * Returns the value of the ccd from a lookup table based on
- * the cpmm number.
- *
- *
+ * Returns the value of the ccd from a lookup table based on
+ * the cpmm number.
+ *
+ *
* @return int The ccd value.
*/
int getCcd();
-
+
private:
- int p_cpmmNumber; /**< Value of the CpmmNumber keyword from the cube's
+ int p_cpmmNumber; /**< Value of the CpmmNumber keyword from the cube's
Instrument group**/
- int p_channel; /**< Value of the ChannelNumber keyword from the
+ int p_channel; /**< Value of the ChannelNumber keyword from the
cube's Instrument group**/
- int p_bin; /**< Value of the Summing keyword from the cube's
+ int p_bin; /**< Value of the Summing keyword from the cube's
Instrument group, if it exists**/
- int p_tdi; /**< Value of the Tdi keyword from the cube's
+ int p_tdi; /**< Value of the Tdi keyword from the cube's
Instrument group, if it exists**/
};
};
diff --git a/isis/src/near/apps/msi2isis/main.cpp b/isis/src/near/apps/msi2isis/main.cpp
index ed76325146..b55a0631f5 100644
--- a/isis/src/near/apps/msi2isis/main.cpp
+++ b/isis/src/near/apps/msi2isis/main.cpp
@@ -39,16 +39,16 @@ void IsisMain() {
from = from.setExtension("LBL");
}
if (!from.fileExists()) {
- throw IException(IException::Io,
- "Unable to find PDS label file for ["
- + ui.GetFileName("FROM") + "].",
+ throw IException(IException::Io,
+ "Unable to find PDS label file for ["
+ + ui.GetFileName("FROM") + "].",
_FILEINFO_);
}
}
// These images are small (537 cols x 244 line) and will be run
// through 3 processes.
- // (1) Import to Isis3 cube format
+ // (1) Import to Isis cube format
// (2) Enlarge to 537 cols x 412 lines
// (3) Flip over horizontal axis, if LINE_DISPLAY_DIRECTION=UP
// and null edges.
@@ -61,10 +61,10 @@ void IsisMain() {
// from the pds label, verfify that the image is valid before continuing
if(inputLabelPvl["INSTRUMENT_ID"][0] != "MSI") {
- throw IException(IException::Io,
+ throw IException(IException::Io,
"The input label [" + from.expanded() + "] has an invalid "
- "value for INSTRUMENT_ID = ["
- + inputLabelPvl["INSTRUMENT_ID"][0]
+ "value for INSTRUMENT_ID = ["
+ + inputLabelPvl["INSTRUMENT_ID"][0]
+ "]. The msi2isis program requires INSTRUMENT_ID = [MSI].",
_FILEINFO_);
}
@@ -73,37 +73,37 @@ void IsisMain() {
if ( lines != 244 || samples != 537) {
QString msg = "The given file [" + from.expanded() + "] does not contain "
"a full MSI image. Full NEAR Shoemaker MSI images have "
- "dimension 537 samples x 244 lines. The given image is ["
- + QString(toString(samples)) + "] samples by ["
+ "dimension 537 samples x 244 lines. The given image is ["
+ + QString(toString(samples)) + "] samples by ["
+ QString(toString(lines)) + "] lines.";
throw IException(IException::Io, msg, _FILEINFO_);
}
if (inputLabelPvl["SAMPLE_DISPLAY_DIRECTION"][0] != "RIGHT") {
QString msg = "The input label [" + from.expanded() + "] has an invalid "
- "value for SAMPLE_DISPLAY_DIRECTION = ["
- + inputLabelPvl["SAMPLE_DISPLAY_DIRECTION"][0]
+ "value for SAMPLE_DISPLAY_DIRECTION = ["
+ + inputLabelPvl["SAMPLE_DISPLAY_DIRECTION"][0]
+ "]. The msi2isis program requires "
"SAMPLE_DISPLAY_DIRECTION = [RIGHT].";
throw IException(IException::Io, msg, _FILEINFO_);
}
if (inputLabelPvl["LINE_DISPLAY_DIRECTION"][0] != "UP") {
QString msg = "The input label [" + from.expanded() + "] has an invalid "
- "value for LINE_DISPLAY_DIRECTION = ["
- + inputLabelPvl["LINE_DISPLAY_DIRECTION"][0]
+ "value for LINE_DISPLAY_DIRECTION = ["
+ + inputLabelPvl["LINE_DISPLAY_DIRECTION"][0]
+ "]. The msi2isis program requires "
"LINE_DISPLAY_DIRECTION = [UP].";
throw IException(IException::Io, msg, _FILEINFO_);
}
// Don't import projected image
if(inputLabelPvl.hasObject("IMAGE_MAP_PROJECTION")) {
- QString msg = "Unable to import the NEAR Shoemaker MSI image from ["
+ QString msg = "Unable to import the NEAR Shoemaker MSI image from ["
+ from.expanded() + "] using msi2isis.This program only "
"imports images that have not been projected. Use pds2isis. ";
throw IException(IException::Io, msg, _FILEINFO_);
}
- // the given input file appears to be valid, continue with the import process
+ // the given input file appears to be valid, continue with the import process
FileName importProcessOutCube("$TEMPORARY/" + from.baseName() + ".import.tmp.cub");
CubeAttributeOutput outatt = CubeAttributeOutput("+Real");
importPds.SetOutputCube(importProcessOutCube.expanded(), outatt);
@@ -111,13 +111,13 @@ void IsisMain() {
importPds.Finalize();
CubeAttributeInput inatt;
-
+
// The second process will enlarge the imported cube from 537x244 to 537x412
FileName enlargeProcessOutCube("$TEMPORARY/" + from.baseName() + ".enlarge.tmp.cub");
ProcessRubberSheet enlargeProcess;
Cube *cube = enlargeProcess.SetInputCube(importProcessOutCube.expanded(), inatt);
enlargeProcess.SetOutputCube(enlargeProcessOutCube.expanded(), outatt, 537, 412, 1);
-
+
// Set up the interpolator
Interpolator *interp;
if(ui.GetString("INTERP") == "NEARESTNEIGHBOR") {
@@ -129,42 +129,42 @@ void IsisMain() {
else { //if(ui.GetString("INTERP") == "CUBICCONVOLUTION") {
interp = new Interpolator(Interpolator::CubicConvolutionType);
}
-
+
double sampleScale = 1.0;
double lineScale = 412.0/(double)lines;
Enlarge *enlarge = new Enlarge(cube, sampleScale, lineScale);
enlargeProcess.StartProcess(*enlarge, *interp);
enlargeProcess.Finalize();
-
- // The third (last) process will flip the image lines and set the 33 pixels
+
+ // The third (last) process will flip the image lines and set the 33 pixels
// along each border (top, bottom, left, and right) to null.
ProcessBySample processSamps;
processSamps.SetInputCube(enlargeProcessOutCube.expanded(), inatt);
Cube *outputCube = processSamps.SetOutputCube("TO");
-
+
// translate labels
try {
- // translate the band bin and archive groups to this pvl
+ // translate the band bin and archive groups to this pvl
Pvl bandBinAndArchivePvl;
importPds.TranslatePdsLabels(bandBinAndArchivePvl);
-
+
// add translated values from band bin and archive groups to the output cube
PvlGroup outputBandBinGrp("BandBin");
PvlGroup outputArchiveGrp("Archive");
-
+
if(bandBinAndArchivePvl.findGroup("BandBin").keywords() > 0) {
outputBandBinGrp = bandBinAndArchivePvl.findGroup("BandBin");
}
-
+
// This group will never be empty since we translate INSTRUMENT_ID and this
// is required for the Instrument group
outputArchiveGrp = bandBinAndArchivePvl.findGroup("Archive");
-
+
outputCube->putGroup(PvlGroup("Instrument"));
outputCube->putGroup(outputBandBinGrp);
outputCube->putGroup(outputArchiveGrp);
outputCube->putGroup(PvlGroup("Kernels"));
-
+
Pvl *isisLabelPvl = outputCube->label();
translateMsiLabels(inputLabelPvl, isisLabelPvl);
}
@@ -173,8 +173,8 @@ void IsisMain() {
delete interp;
remove(importProcessOutCube.expanded().toLatin1());
remove(enlargeProcessOutCube.expanded().toLatin1());
- QString msg = "Unable to translate the labels from [" + from.expanded()
- + "] to ISIS3 format using msi2isis.";
+ QString msg = "Unable to translate the labels from [" + from.expanded()
+ + "] to ISIS format using msi2isis.";
throw IException(e, IException::Unknown, msg, _FILEINFO_);
}
// now, determine the number of samples, then flip and trim the output cube
@@ -182,7 +182,7 @@ void IsisMain() {
processSamps.ProcessCube(flipAndTrim);
processSamps.Finalize();
- // clean up temp files and "new" pointers
+ // clean up temp files and "new" pointers
delete enlarge;
delete interp;
remove(importProcessOutCube.expanded().toLatin1());
@@ -190,13 +190,13 @@ void IsisMain() {
}
/**
- * @brief Flip the lines and trim the edges.
- *
+ * @brief Flip the lines and trim the edges.
+ *
* This process will flip over the horizontal axis (i.e. flip lines) and trim
* 33 pixels from the top, bottom, left and right edges of the input buffer.
- *
- * @param in Reference to the input buffer.
- * @param out Reference to the output buffer.
+ *
+ * @param in Reference to the input buffer.
+ * @param out Reference to the output buffer.
*/
void flipAndTrim(Buffer &in, Buffer &out) {
// Trim the left and right sides of the image
@@ -205,7 +205,7 @@ void flipAndTrim(Buffer &in, Buffer &out) {
out[i] = NULL8;
}
}
- // Otherwise, if the current sample is between 33 and 504, trim the
+ // Otherwise, if the current sample is between 33 and 504, trim the
// first and last 33 lines and flip the rest.
else {
int lastLineIndex = in.size() - 1;
@@ -221,13 +221,13 @@ void flipAndTrim(Buffer &in, Buffer &out) {
}
/**
- * Translate the MSI labels into Isis3.
+ * Translate the MSI labels into Isis.
*
* This method requires the Instrument, BandBin, and Kernels groups to already
* exist in the labels.
*
* @param inputLabelPvl The PDS input file.
- * @param isisLabelPvl The output Isis3 cube label Pvl.
+ * @param isisLabelPvl The output Isis cube label Pvl.
*/
void translateMsiLabels(Pvl inputLabelPvl, Pvl *isisLabelPvl) {
PvlGroup &instGrp(isisLabelPvl->findGroup("Instrument", Pvl::Traverse));
@@ -236,7 +236,7 @@ void translateMsiLabels(Pvl inputLabelPvl, Pvl *isisLabelPvl) {
kernelsGrp += PvlKeyword("NaifFrameCode", "-93001");
- PvlToPvlTranslationManager labelXlater(inputLabelPvl,
+ PvlToPvlTranslationManager labelXlater(inputLabelPvl,
"$ISISROOT/appdata/translations/NearMsiImportPdsLabel.trn");
labelXlater.Auto(*isisLabelPvl);
@@ -245,18 +245,18 @@ void translateMsiLabels(Pvl inputLabelPvl, Pvl *isisLabelPvl) {
// Read DPU deck temperature value from the labels (This value is also given
// in celcius in the FITS header under the keyword NEAR-049)
- instGrp += PvlKeyword("DpuDeckTemperature",
- inputLabelPvl["INSTRUMENT_TEMPERATURE"][1],
- inputLabelPvl["INSTRUMENT_TEMPERATURE"].unit());
+ instGrp += PvlKeyword("DpuDeckTemperature",
+ inputLabelPvl["INSTRUMENT_TEMPERATURE"][1],
+ inputLabelPvl["INSTRUMENT_TEMPERATURE"].unit());
// we might want to read values from the FITS header in the future. For
// example...
- //
+ //
// importPds.SaveFileHeader();
// char *fitsHeader = importPds.FileHeader();
- //
+ //
// or
- //
+ //
// importPds.SaveDataHeader();
// char *fitsHeader = importPds.DataHeader()
diff --git a/isis/src/near/apps/msi2isis/msi2isis.xml b/isis/src/near/apps/msi2isis/msi2isis.xml
index 44f8e7e6e5..f7f0f611bc 100644
--- a/isis/src/near/apps/msi2isis/msi2isis.xml
+++ b/isis/src/near/apps/msi2isis/msi2isis.xml
@@ -3,21 +3,21 @@
<application name="msi2isis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Import NEAR MSI files into ISIS3 format
+ Import NEAR MSI files into ISIS format
</brief>
<description>
- This program will import raw images, acquired from the Near Earth Asteroid
- Rendezvous - Shoemaker (NEAR Shoemaker) mission's Multispectral Imager
- (MSI) instrument, to ISIS3 data file format.
+ This program will import raw images, acquired from the Near Earth Asteroid
+ Rendezvous - Shoemaker (NEAR Shoemaker) mission's Multispectral Imager
+ (MSI) instrument, to ISIS data file format.
- The raw image must be in FITS (Flexible Image Transport) format and
- have a PDS label file that points to the location of the FITS image. You must input either the label file or the FITS file for the "TO" input
- parameter. Projected images are not supported. Please note if the FITS file is given, the label file must
+ The raw image must be in FITS (Flexible Image Transport) format and
+ have a PDS label file that points to the location of the FITS image. You must input either the label file or the FITS file for the "TO" input
+ parameter. Projected images are not supported. Please note if the FITS file is given, the label file must
exist in the same directory or the program will throw an error.
- This program will verify that the input files are valid by checking the
- following label keyword values. An error will be thrown if any of these
- criteria are not met.
+ This program will verify that the input files are valid by checking the
+ following label keyword values. An error will be thrown if any of these
+ criteria are not met.
<ul>
<li>INSTRUMENT_ID = MSI</li>
<li>LINE_SAMPLES = 537</li>
@@ -26,13 +26,13 @@
<li>LINE_DISPLAY_DIRECTION = UP</li>
</ul>
- The output cube- successfully imported into ISIS3 goes through the following processes:
+ The output cube- successfully imported into ISIS goes through the following processes:
<ul>
- <li>Convert the raw FITS image data to an ISIS3 cube.</li>
- <li> Save the labels from the input PDS label file to the output ISIS3 cube. Note that FITS labels are not transferred. </li>
+ <li>Convert the raw FITS image data to an ISIS cube.</li>
+ <li> Save the labels from the input PDS label file to the output ISIS cube. Note that FITS labels are not transferred. </li>
<li>Enlarge the image from 537 samples x 244 lines to 537 x 412 using the user-specified interpolation algorithm. Defaults to cubic convolution.</li>
<li>Flip the image vertically, i.e. across the horizontal axis.</li>
- <li>Trim 33 pixels from the top, bottom, left and right sides. These
+ <li>Trim 33 pixels from the top, bottom, left and right sides. These
pixels along the borders will be set to nulls.</li>
</ul>
@@ -40,11 +40,11 @@
<history>
<change name="Jeannie Backer" date="2013-03-27">
- Original version of msi2isis. References #1248.
+ Original version of msi2isis. References #1248.
</change>
<change name="Kristin Berry" date="2014-05-19">
- Updated to add labels from the input PDS label file to the output ISIS3 cube. References #2088.
- </change>
+ Updated to add labels from the input PDS label file to the output ISIS cube. References #2088.
+ </change>
</history>
<seeAlso>
@@ -66,12 +66,12 @@
<type>filename</type>
<fileMode>input</fileMode>
<brief>
- Input NEAR MSI file to be converted to an ISIS3 cube
+ Input NEAR MSI file to be converted to an ISIS cube
</brief>
<description>
- Name of the input NEAR MSI image file to be imported into ISIS3
- format. You may enter the label or the image file. If the image
- file is given, the program will search in the same directory for a
+ Name of the input NEAR MSI image file to be imported into ISIS
+ format. You may enter the label or the image file. If the image
+ file is given, the program will search in the same directory for a
label file with the same base name as the image file base name.
</description>
<filter>
@@ -83,10 +83,10 @@
<type>cube</type>
<fileMode>output</fileMode>
<brief>
- Output ISIS3 cube filename
+ Output ISIS cube filename
</brief>
<description>
- Name of the ISIS3 output cube file that has been imported, enlarged,
+ Name of the ISIS output cube file that has been imported, enlarged,
flipped, and trimmed.
</description>
<filter>
@@ -104,7 +104,7 @@
<brief>Type of interpolation for enlarge process</brief>
<description>
This is the type of interpolation to be performed on the input when
- the image is enlarged from 537 samples x 244 lines to
+ the image is enlarged from 537 samples x 244 lines to
537 samples x 412 lines.
</description>
<list>
@@ -140,7 +140,7 @@
Usage of this import application
</brief>
<description>
- This example shows how to import an MSI fits file to the ISIS3 cube format using the label file.
+ This example shows how to import an MSI fits file to the ISIS cube format using the label file.
</description>
<terminalInterface>
<commandLine>
diff --git a/isis/src/newhorizons/apps/leisa2isis/NewHorizonsLeisaArchive_fit.trn b/isis/src/newhorizons/apps/leisa2isis/NewHorizonsLeisaArchive_fit.trn
index 92b07babc0..c5ab1cc67e 100644
--- a/isis/src/newhorizons/apps/leisa2isis/NewHorizonsLeisaArchive_fit.trn
+++ b/isis/src/newhorizons/apps/leisa2isis/NewHorizonsLeisaArchive_fit.trn
@@ -1,5 +1,5 @@
#
-# This translation file is used to produce the ISIS 3 Archive label group
+# This translation file is used to produce the ISIS Archive label group
# for the New Horizons LEISA camera.
#
diff --git a/isis/src/newhorizons/apps/leisa2isis/NewHorizonsLeisaInstrument_fit.trn b/isis/src/newhorizons/apps/leisa2isis/NewHorizonsLeisaInstrument_fit.trn
index 5ea0d304ac..15b33e8351 100644
--- a/isis/src/newhorizons/apps/leisa2isis/NewHorizonsLeisaInstrument_fit.trn
+++ b/isis/src/newhorizons/apps/leisa2isis/NewHorizonsLeisaInstrument_fit.trn
@@ -1,5 +1,5 @@
#
-# This translation file is used to produce the ISIS 3 Instrument label group
+# This translation file is used to produce the ISIS Instrument label group
# for the New Horizons LEISA camera.
#
Group = SpacecraftName
diff --git a/isis/src/newhorizons/apps/lorri2isis/NewHorizonsLorriArchive_fit.trn b/isis/src/newhorizons/apps/lorri2isis/NewHorizonsLorriArchive_fit.trn
index a2262f661b..6d15158578 100644
--- a/isis/src/newhorizons/apps/lorri2isis/NewHorizonsLorriArchive_fit.trn
+++ b/isis/src/newhorizons/apps/lorri2isis/NewHorizonsLorriArchive_fit.trn
@@ -1,5 +1,5 @@
#
-# This translation file is used to produce the ISIS 3 Archive label group
+# This translation file is used to produce the ISIS Archive label group
# for the New Horizons LORRI camera.
#
Group = HighSpeedCompressionMode
diff --git a/isis/src/newhorizons/apps/lorri2isis/NewHorizonsLorriInstrument_fit.trn b/isis/src/newhorizons/apps/lorri2isis/NewHorizonsLorriInstrument_fit.trn
index 8ce0a2303f..71275dcb3b 100644
--- a/isis/src/newhorizons/apps/lorri2isis/NewHorizonsLorriInstrument_fit.trn
+++ b/isis/src/newhorizons/apps/lorri2isis/NewHorizonsLorriInstrument_fit.trn
@@ -1,5 +1,5 @@
#
-# This translation file is used to produce the ISIS 3 Instrument label group
+# This translation file is used to produce the ISIS Instrument label group
# for the New Horizons LORRI camera.
#
Group = SpacecraftName
diff --git a/isis/src/newhorizons/apps/mvic2isis/NewHorizonsMvicArchive_fit.trn b/isis/src/newhorizons/apps/mvic2isis/NewHorizonsMvicArchive_fit.trn
index 0d12e3883e..3f323984f0 100644
--- a/isis/src/newhorizons/apps/mvic2isis/NewHorizonsMvicArchive_fit.trn
+++ b/isis/src/newhorizons/apps/mvic2isis/NewHorizonsMvicArchive_fit.trn
@@ -1,5 +1,5 @@
#
-# This translation file is used to produce the ISIS 3 Archive label group
+# This translation file is used to produce the ISIS Archive label group
# for the New Horizons LORRI camera.
#
Group = HighSpeedCompressionMode
diff --git a/isis/src/newhorizons/apps/mvic2isis/NewHorizonsMvicInstrument_fit.trn b/isis/src/newhorizons/apps/mvic2isis/NewHorizonsMvicInstrument_fit.trn
index 772d4fb567..ed12e7efbe 100644
--- a/isis/src/newhorizons/apps/mvic2isis/NewHorizonsMvicInstrument_fit.trn
+++ b/isis/src/newhorizons/apps/mvic2isis/NewHorizonsMvicInstrument_fit.trn
@@ -1,5 +1,5 @@
#
-# This translation file is used to produce the ISIS 3 Instrument label group
+# This translation file is used to produce the ISIS Instrument label group
# for the New Horizons MVIC camera.
#
Group = SpacecraftName
diff --git a/isis/src/odyssey/apps/thmbasemap1/thmbasemap1.xml b/isis/src/odyssey/apps/thmbasemap1/thmbasemap1.xml
index 9a15886a2a..bc78c28b58 100644
--- a/isis/src/odyssey/apps/thmbasemap1/thmbasemap1.xml
+++ b/isis/src/odyssey/apps/thmbasemap1/thmbasemap1.xml
@@ -3,43 +3,43 @@
<application name="thmbasemap1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
<brief>
- Mars Odyssey Themis RDR image cleanup
+ Mars Odyssey Themis RDR image cleanup
</brief>
<description><pre>
- Themis image cleanup procedure developed for the Mars geologic base
+ Themis image cleanup procedure developed for the Mars geologic base
map production and the ancillary datasets. The RDR's or radiometrically
- calibrated images are required as input to the program. The 12.57um
+ calibrated images are required as input to the program. The 12.57um
wavelength band is selected for the mosaic, and the 14.88um atmosphere
band is used as input to "thmdriftcor" program. The following programs
are run:
- thm2isis - converts to isis3 format
+ thm2isis - converts to isis format
spiceinit - updates SPICE information
camstats - collects camera staistics
thmdriftcor - applies atmosphere correction using 14.88um band
- cosi - applies a basic photometric normalization using the incidence
+ cosi - applies a basic photometric normalization using the incidence
angles for improved tone matching
cubenorm - used to cleanup banding(column) effect on the RDRs
lineeq - normalize base on line averages for signal drifts and/or
- correcting for photometric changes during crossover from day to
+ correcting for photometric changes during crossover from day to
night.
findgaps - find gaps in the input image
- Generate statistics file and footprint information for input into GIS
+ Generate statistics file and footprint information for input into GIS
packages
-
- The InstrumentId must be "THEMIS," DETECTOR_ID must be "IR,"
- BandBinCenter must have "12.57um," and "14.88um" for the
- atmospheric correction.
-
+
+ The InstrumentId must be "THEMIS," DETECTOR_ID must be "IR,"
+ BandBinCenter must have "12.57um," and "14.88um" for the
+ atmospheric correction.
+
If NIGHT is checked then the night time IR images are processed, and
the incidence angle test is not performed.
-
+
The spiceinit program will automatically use nadir pointing if it fails
- to update with reconstructed or predicted ck kernels.
-
+ to update with reconstructed or predicted ck kernels.
+
If RMINPUT is checked then the input file is deleted after processing.
-
- If RMHIGHINC is checked then the input RDR file is deleted from
+
+ If RMHIGHINC is checked then the input RDR file is deleted from
processing if the incidence angle test is not meant.
</pre></description>
@@ -65,7 +65,7 @@
</history>
<category>
- <missionItem>Mars Odyssey</missionItem>
+ <missionItem>Mars Odyssey</missionItem>
</category>
<groups>
@@ -103,7 +103,7 @@
Process night time IR image
</brief>
<description>
- If checked, this option will process a night time image. For night images
+ If checked, this option will process a night time image. For night images
the program cosi will be skipped.
</description>
<default><item>FALSE</item></default>
@@ -124,7 +124,7 @@
<parameter name="INFO">
<type>boolean</type>
<brief>
- Output selected camera statistics infomation
+ Output selected camera statistics infomation
</brief>
<description>
A selected subset of camera statistics information required for the
@@ -158,7 +158,7 @@
</brief>
<description>
A footprint polygon information will be output for input into a GIS
- program. This is normally required for the geologic base map
+ program. This is normally required for the geologic base map
packages, but not needed if the files will not be imported into
a GIS package.
</description>
@@ -173,7 +173,7 @@
</brief>
<description>
If selected, delete input files after processing is completed.
- </description>
+ </description>
<default><item>FALSE</item></default>
</parameter>
<parameter name="RMHIGHINC">
@@ -198,7 +198,7 @@
angle
</brief>
<description>
- Output list file that will contain the names of files that
+ Output list file that will contain the names of files that
were deleted because of their high incidence angles.
</description>
<filter>
@@ -213,7 +213,7 @@
Output list of files where there is no matching RDR
</brief>
<description>
- Output list file that will contain the names of files that
+ Output list file that will contain the names of files that
do not have matching RDR files for the EDR files.
</description>
<filter>
@@ -228,7 +228,7 @@
Output list of files that have Nadir pointing
</brief>
<description>
- Output list file that will contain the names of files that
+ Output list file that will contain the names of files that
have only Nadir pointing available to them.
</description>
<filter>
@@ -243,8 +243,8 @@
Output list of files that have gaps
</brief>
<description>
- Output list file that will contain the names of files that
- gaps meaning that special pixels were detected by the stats
+ Output list file that will contain the names of files that
+ gaps meaning that special pixels were detected by the stats
program.
</description>
<filter>
diff --git a/isis/src/osirisrex/apps/ocams2isis/OsirisRexOcamsBandBin_fit.trn b/isis/src/osirisrex/apps/ocams2isis/OsirisRexOcamsBandBin_fit.trn
index 433ac4cafc..6246f0a16e 100644
--- a/isis/src/osirisrex/apps/ocams2isis/OsirisRexOcamsBandBin_fit.trn
+++ b/isis/src/osirisrex/apps/ocams2isis/OsirisRexOcamsBandBin_fit.trn
@@ -1,5 +1,5 @@
#
-# This translation file is used to produce the ISIS 3 BandBin label group
+# This translation file is used to produce the ISIS BandBin label group
# for the OSIRIS-REx MapCam, SamCam and PolyCan cameras.
# Translation = (left,right) convert the input "right" to "left"
#
diff --git a/isis/src/osirisrex/apps/ocams2isis/OsirisRexOcamsInstrument_fit.trn b/isis/src/osirisrex/apps/ocams2isis/OsirisRexOcamsInstrument_fit.trn
index 5c4918a466..388172236f 100644
--- a/isis/src/osirisrex/apps/ocams2isis/OsirisRexOcamsInstrument_fit.trn
+++ b/isis/src/osirisrex/apps/ocams2isis/OsirisRexOcamsInstrument_fit.trn
@@ -1,10 +1,10 @@
#
-# This translation file is used to produce the ISIS 3 Instrument label group
+# This translation file is used to produce the ISIS Instrument label group
# for the OSIRIS-REx MapCam, SamCam and PolyCan cameras.
# Translation = (left,right) convert the input "right" to "left"
#
# history 2017-08-28 Jeannie Backer - Added output keyword PolyCamFocusPositionNaifId
-# from input PCNAIFID. References #5127,5128.
+# from input PCNAIFID. References #5127,5128.
Group = MissionName
Auto
diff --git a/isis/src/osirisrex/apps/ocams2isis/OsirisRexOcamsKernels_fit.trn b/isis/src/osirisrex/apps/ocams2isis/OsirisRexOcamsKernels_fit.trn
index c0c73fc802..8a45ac4f06 100644
--- a/isis/src/osirisrex/apps/ocams2isis/OsirisRexOcamsKernels_fit.trn
+++ b/isis/src/osirisrex/apps/ocams2isis/OsirisRexOcamsKernels_fit.trn
@@ -1,9 +1,9 @@
#
-# This translation file is used to produce the ISIS 3 Kernels label group
+# This translation file is used to produce the ISIS Kernels label group
# for the OSIRIS-REx MapCam and SamCam cameras.
# Translation = (left,right) convert the input "right" to "left"
#
-# history 2017-08-23 Jeannie Backer - Moved PolyCam to its own translation file since it uses
+# history 2017-08-23 Jeannie Backer - Moved PolyCam to its own translation file since it uses
# a different input label value to find the proper code.
Group = NaifCode
diff --git a/isis/src/qisis/apps/ipce/ipce.xml b/isis/src/qisis/apps/ipce/ipce.xml
index e2dad797af..624914bc06 100644
--- a/isis/src/qisis/apps/ipce/ipce.xml
+++ b/isis/src/qisis/apps/ipce/ipce.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<application name="ipce" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
-
+
<brief>
Integrated Photogrammetric Control Environment
</brief>
@@ -9,22 +9,22 @@
<description>
<img src='assets/images/IpceUserInterface.png' alt='IPCE User Interface' width='1050' height='388' />
<p><label>Figure 1:</label> <caption>IPCE User Interface</caption></p>
-
+
<h4>Photogrammetric Control and IPCE</h4>
<p>
The quality of digital image mosaics (DIM) and digital elevation models (DEM) - and geologic maps using such products as basemaps - depends greatly upon accurate sensor position and pointing parameters. Spacecraft ephemeris and attitude data provide initial estimates for these parameters. Uncertainty in these data propagate to errors in mapping products. To minimize errors, images are controlled photogrammetrically. Overlapping images are registered to one another by measuring common features (tie points). Images may be tied to the ground by measuring features identifiable on base maps or DEMs (control points). Image measurements are input to the least-squares bundle adjustment which generates improved sensor position and pointing parameters plus the triangulated coordinates of tie and control points.
</p>
<p>
The objective of the Integrated Photogrammetric Control Environment (IPCE) is to incorporate all aspects of the photogrammetric control process within a single interactive and user friendly environment. A project oriented design simplifies data management with the ability to save and restore project data and settings. Multiple, integrated views of data and processing output help to streamline the control workflow.
- </p>
+ </p>
<p>
- IPCE currently includes functionality from the standalone isis3 applications <b><i>jigsaw</i></b>, <b><i>qview</i></b>, <b><i>qnet</i></b>, <b><i>qmos</i></b>, and <b><i>cneteditor</i></b>. Control networks can be visualized in a table view (e.g. <b><i>cneteditor</i></b>), or overlaid on an image view (e.g. <b><i>qview</i></b>, <b><i>qnet</i></b>) or an image footprint view (e.g. <b><i>qmos</i></b>). Control networks can be edited from these views as well. Editing includes adding, deleting, and refining control points and measures or modifying metadata associated with them. The bundle adjustment (e.g. <b><i>jigsaw</i></b>) can be performed any number of times within IPCE. Results can be analyzed, compared against other bundle adjustment runs, and saved/restored as part of the IPCE project.
+ IPCE currently includes functionality from the standalone isis applications <b><i>jigsaw</i></b>, <b><i>qview</i></b>, <b><i>qnet</i></b>, <b><i>qmos</i></b>, and <b><i>cneteditor</i></b>. Control networks can be visualized in a table view (e.g. <b><i>cneteditor</i></b>), or overlaid on an image view (e.g. <b><i>qview</i></b>, <b><i>qnet</i></b>) or an image footprint view (e.g. <b><i>qmos</i></b>). Control networks can be edited from these views as well. Editing includes adding, deleting, and refining control points and measures or modifying metadata associated with them. The bundle adjustment (e.g. <b><i>jigsaw</i></b>) can be performed any number of times within IPCE. Results can be analyzed, compared against other bundle adjustment runs, and saved/restored as part of the IPCE project.
</p>
-
+
<p>
A link to the IPCE User's Manual (PDF format) is given below under <b>Related Objects and Documents</b>. It contains example workflows as well as details on using the application.
</p>
-
+
<h4>Known Issues</h4>
<p>
<ol>
@@ -38,12 +38,12 @@
<li> Images in bundle results will not contain footprint information until the project is saved and re-opened. Re-opening the project will generate the footprint information.</li>
<li> It is recommended that bundle output control networks be named uniquely. Otherwise unpredictable behavior may occur.</li>
</ol>
-
+
</p>
</description>
-
+
<category>
<categoryItem>Control Networks</categoryItem>
</category>
@@ -71,8 +71,8 @@
</documents>
-
-
+
+
</seeAlso>
@@ -88,10 +88,10 @@
Fixes #4358.
</change>
<change name="Tyler Wilson" date="2016-11-10">
- Changed the alias reference for the data_management.png icon from 'data' to 'data-management'.
+ Changed the alias reference for the data_management.png icon from 'data' to 'data-management'.
Annoying errors were showing up on the command line when the application was launched due
to a naming conflict. Fixes #3982.
- </change>
+ </change>
<change name="Tracie Sucharski" date="2017-06-22">
Changed name of application from cnetsuite to ipce.
</change>
@@ -104,7 +104,3 @@
</history>
</application>
-
-
-
-
diff --git a/isis/src/qisis/objs/Directory/SensorGetInfoWorkOrder.h b/isis/src/qisis/objs/Directory/SensorGetInfoWorkOrder.h
index d3f12e7af2..f251cf3ab2 100644
--- a/isis/src/qisis/objs/Directory/SensorGetInfoWorkOrder.h
+++ b/isis/src/qisis/objs/Directory/SensorGetInfoWorkOrder.h
@@ -36,7 +36,7 @@ namespace Isis {
*
* @internal
* @author 2016-06-06 Tyler Wilson - Added documentation for the functions and
- * brought the code into compliance with ISIS3 coding standards.
+ * brought the code into compliance with ISIS coding standards.
* References #3944.
* @history 2017-04-16 J Bonn - Updated to new workorder design #4764.
* @history 2017-07-24 Cole Neuabuer - Set m_isSavedToHistory to false on construction
diff --git a/isis/src/qisis/objs/Directory/ViewControlNet3DWorkOrder.h b/isis/src/qisis/objs/Directory/ViewControlNet3DWorkOrder.h
index 291c1a50fd..825aa50b16 100644
--- a/isis/src/qisis/objs/Directory/ViewControlNet3DWorkOrder.h
+++ b/isis/src/qisis/objs/Directory/ViewControlNet3DWorkOrder.h
@@ -34,7 +34,7 @@ namespace Isis {
*
* @internal
* @author 2016-06-06 Tyler Wilson - Added documentation for the functions and
- * brought the code into compliance with ISIS3 coding standards.
+ * brought the code into compliance with ISIS coding standards.
* References #3944.
* @history 2017-04-16 J Bonn - Updated to new workorder design #4764.
* @history 2017-07-24 Cole Neuabuer - Set m_isSavedToHistory to false on construction
diff --git a/isis/src/qisis/objs/TargetBodyDisplayProperties/TargetBodyDisplayProperties.h b/isis/src/qisis/objs/TargetBodyDisplayProperties/TargetBodyDisplayProperties.h
index cbfc54776d..fc83976bae 100644
--- a/isis/src/qisis/objs/TargetBodyDisplayProperties/TargetBodyDisplayProperties.h
+++ b/isis/src/qisis/objs/TargetBodyDisplayProperties/TargetBodyDisplayProperties.h
@@ -71,7 +71,7 @@ namespace Isis {
* @history 2015-05-27 Ken Edmundson - Creation.
* @hsitory 21016-06-14 Tyler Wilson - Added documentation to member functions/variables
* and corrected some formatting to bring the the code in line
- * with ISIS3 coding standards. Fixes #3997.
+ * with ISIS coding standards. Fixes #3997.
*
*/
class TargetBodyDisplayProperties : public DisplayProperties {
@@ -172,4 +172,3 @@ namespace Isis {
Q_DECLARE_METATYPE(QList<Isis::TargetBodyDisplayProperties *>);
#endif
-
diff --git a/isis/src/rolo/apps/rolo2isis/rolo2isis.xml b/isis/src/rolo/apps/rolo2isis/rolo2isis.xml
index 422c151104..ec13acbc26 100644
--- a/isis/src/rolo/apps/rolo2isis/rolo2isis.xml
+++ b/isis/src/rolo/apps/rolo2isis/rolo2isis.xml
@@ -2,10 +2,10 @@
<application name="rolo2isis" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">
- <brief>Import isis2 rolo image into isis3 </brief>
+ <brief>Import isis2 rolo image into isis </brief>
<description>
- This program will import an isis2 rolo image into an isis3 cube.
+ This program will import an isis2 rolo image into an isis cube.
</description>
<history>
@@ -55,13 +55,13 @@
</groups>
<examples>
-
+
<example>
<brief>
Using rolo2isis
</brief>
<description>
- The use of rolo2isis to ingest rolo isis2 data and output isis3 cubes
+ The use of rolo2isis to ingest rolo isis2 data and output isis cubes
</description>
<terminalInterface>
<commandLine>
@@ -69,10 +69,10 @@
to=mm185801.cub
</commandLine>
<description>
- This example shows the use of rolo2isis to create an Isis3 cube
+ This example shows the use of rolo2isis to create an Isis cube
</description>
</terminalInterface>
-
+
<guiInterfaces>
<guiInterface>
<image width="720" height="886" src="assets/images/roloExampleGUI.png">
@@ -87,7 +87,7 @@
</guiInterface>
</guiInterfaces>
</example>
-
+
</examples>
</application>
diff --git a/isis/src/socet/apps/socetframesettings/socetframesettings.xml b/isis/src/socet/apps/socetframesettings/socetframesettings.xml
index 31be7b2ed9..9fdbbbb50f 100644
--- a/isis/src/socet/apps/socetframesettings/socetframesettings.xml
+++ b/isis/src/socet/apps/socetframesettings/socetframesettings.xml
@@ -56,7 +56,7 @@
use SpiceRotation class, added Messenger, began modifications to meet ISIS coding standards.
</change>
<change name="E. Howington-Kraus" date="2013-02-25">
- Completed modifications to meet ISIS coding standards for formal installation into ISIS3.
+ Completed modifications to meet ISIS coding standards for formal installation into ISIS.
Added check for needed SPICE data (blobs) attached to the cube label. Added parameter TO for
user control over output settings file name (previously the program generated the output file
name based on the base name of the FROM cube). Temporarily removed support for APOLLO METRIC,
diff --git a/isis/src/socet/apps/socetlinescankeywords/socetlinescankeywords.xml b/isis/src/socet/apps/socetlinescankeywords/socetlinescankeywords.xml
index 497212397c..6c563fdc76 100644
--- a/isis/src/socet/apps/socetlinescankeywords/socetlinescankeywords.xml
+++ b/isis/src/socet/apps/socetlinescankeywords/socetlinescankeywords.xml
@@ -62,7 +62,7 @@
standards.
</change>
<change name="E. Howington-Kraus" date="2013-02-20">
- Completed modifications to meet ISIS coding standards for formal installation into ISIS3.
+ Completed modifications to meet ISIS coding standards for formal installation into ISIS.
Added support for HiRISE jitter-corrected images created at U of A. Added check for needed
SPICE data (blobs) attached to the cube label. Renamed parameter PUSHKEY to TO. Temporarily
removed support for MEX-HSRC and MGS-MOC sensors until they are tested and working under the
diff --git a/isis/src/system/apps/csspckgen/csspckgen.xml b/isis/src/system/apps/csspckgen/csspckgen.xml
index d390b8493f..125cee8b88 100644
--- a/isis/src/system/apps/csspckgen/csspckgen.xml
+++ b/isis/src/system/apps/csspckgen/csspckgen.xml
@@ -18,7 +18,7 @@
string.
</p>
<p>
- New version of Isis 3 are capable of resolving this date string and
+ New version of Isis are capable of resolving this date string and
grabbing the latest PCK from the data area. In an effort to support
legacy versions of Isis 3, this program adds Selection groups for the
direct paths to the latest PCK files, and is called by the makedb script
diff --git a/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.cpp b/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.cpp
index 5970d2d966..426f073720 100644
--- a/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.cpp
+++ b/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.cpp
@@ -1,25 +1,25 @@
-/**
- * @file
- * $Revision: 1.3 $
- * $Date: 2010/02/25 18:39:05 $
- *
- * Unless noted otherwise, the portions of Isis written by the USGS are
- * public domain. See individual third-party library and package descriptions
- * for intellectual property information, user agreements, and related
- * information.
- *
- * Although Isis has been used by the USGS, no warranty, expressed or
- * implied, is made by the USGS as to the accuracy and functioning of such
- * software and related material nor shall the fact of distribution
+/**
+ * @file
+ * $Revision: 1.3 $
+ * $Date: 2010/02/25 18:39:05 $
+ *
+ * Unless noted otherwise, the portions of Isis written by the USGS are
+ * public domain. See individual third-party library and package descriptions
+ * for intellectual property information, user agreements, and related
+ * information.
+ *
+ * Although Isis has been used by the USGS, no warranty, expressed or
+ * implied, is made by the USGS as to the accuracy and functioning of such
+ * software and related material nor shall the fact of distribution
* constitute any such warranty, and no responsibility is assumed by the
- * USGS in connection therewith.
- *
- * For additional information, launch
- * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
+ * USGS in connection therewith.
+ *
+ * For additional information, launch
+ * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html
* in a browser or see the Privacy & Disclaimers page on the Isis website,
* http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on
- * http://www.usgs.gov/privacy.html.
- */
+ * http://www.usgs.gov/privacy.html.
+ */
#include <memory>
#include <cmath>
#include <cstdlib>
@@ -45,7 +45,7 @@ ProgramAnalyzer::ProgramAnalyzer() {
/**
* Analyzes the given log file on construction
- *
+ *
* @param logfile A print.prt file
*/
ProgramAnalyzer::ProgramAnalyzer(const QString &logfile) {
@@ -54,16 +54,16 @@ ProgramAnalyzer::ProgramAnalyzer(const QString &logfile) {
}
/**
- * @brief Set the list of program exclusions
- *
+ * @brief Set the list of program exclusions
+ *
* When provided, the QString should contain names of ISIS programs that will be
* excluded in the analysis. If more than one program is desired, separate
* them by commas.
- *
+ *
* The exclusion list takes precedence over any applications added in the
* inclusion list. In other words, if the same program is included in both the
* inclusion and exclusion list, it will be excluded.
- *
+ *
* Note this method can be called repeatedly to add names.
*
* @param name Comma separated list of names of programs to exclude
@@ -76,16 +76,16 @@ void ProgramAnalyzer::setExclude(const QString &name) {
/**
* @brief Loads a list of excluded program names from a file
- *
- * The file is expected to contain the name of an ISIS program, one per line.
- * These programs will be logged but not included in the analysis.
- *
+ *
+ * The file is expected to contain the name of an ISIS program, one per line.
+ * These programs will be logged but not included in the analysis.
+ *
* The exclusion list takes precedence over any applications added in the
* inclusion list. In other words, if the same program is included in both the
* inclusion and exclusion list, it will be excluded.
- *
+ *
* Note this method can be called repeatedly to add names.
- *
+ *
* @param name Name of file containing program list to exclude
*/
void ProgramAnalyzer::exclude(const QString &name) {
@@ -98,23 +98,23 @@ void ProgramAnalyzer::exclude(const QString &name) {
/**
- * @brief Set the list of program inclusions
- *
+ * @brief Set the list of program inclusions
+ *
* When provided, the QString should contain names of ISIS programs that will be
* included in the analysis. If more than one program is desired, separate
* them by commas.
- *
- * If this option is used, it will only included programs given in this list.
- * It operates as both an inclusive and exclusive list, so there is no need to
- * also utilize the exclude features of this class.
- *
- * However, if you do use the exclusion features of this clas, the exclusion
- * list takes precedence over any applications added in the inclusion list. In
- * other words, if the same program is included in both the inclusion and
- * exclusion list, it will be excluded.
- *
+ *
+ * If this option is used, it will only included programs given in this list.
+ * It operates as both an inclusive and exclusive list, so there is no need to
+ * also utilize the exclude features of this class.
+ *
+ * However, if you do use the exclusion features of this clas, the exclusion
+ * list takes precedence over any applications added in the inclusion list. In
+ * other words, if the same program is included in both the inclusion and
+ * exclusion list, it will be excluded.
+ *
* Note this method can be called repeatedly to add names.
- *
+ *
* @param name Comma separated list of names of programs to include
*/
void ProgramAnalyzer::setInclude(const QString &name) {
@@ -125,21 +125,21 @@ void ProgramAnalyzer::setInclude(const QString &name) {
/**
* @brief Loads a list of included program names from a file
- *
- * The file is expected to contain the name of an ISIS program, one per line.
- * These programs will be included in the analysis.
- *
- * If this option is used, it will only included programs given in this list.
- * It operates as both an inclusive and exclusive list, so there is no need to
- * also utilize the exclude features of this class.
- *
- * However, if you do use the exclusion feartures, the exclusion list takes
- * precedence over any applications added in the inclusion list. In other
- * words, if the same program is included in both the inclusion and exclusion
- * list, it will be excluded.
- *
+ *
+ * The file is expected to contain the name of an ISIS program, one per line.
+ * These programs will be included in the analysis.
+ *
+ * If this option is used, it will only included programs given in this list.
+ * It operates as both an inclusive and exclusive list, so there is no need to
+ * also utilize the exclude features of this class.
+ *
+ * However, if you do use the exclusion feartures, the exclusion list takes
+ * precedence over any applications added in the inclusion list. In other
+ * words, if the same program is included in both the inclusion and exclusion
+ * list, it will be excluded.
+ *
* Note this method can be called repeatedly to add names.
- *
+ *
* @param name Name of file containing program list to include
*/
void ProgramAnalyzer::include(const QString &name) {
@@ -151,13 +151,13 @@ void ProgramAnalyzer::include(const QString &name) {
}
/**
- * @brief Adds a print.prt file to the analysis
- *
- * The programs contained in the log file, assumed to be a print.prt file, will
- * be added to the list of programs to be analyzed. They are subject to the
- * exclude and include program lists.
- *
- * @param logfile An ISIS3 print.prt file
+ * @brief Adds a print.prt file to the analysis
+ *
+ * The programs contained in the log file, assumed to be a print.prt file, will
+ * be added to the list of programs to be analyzed. They are subject to the
+ * exclude and include program lists.
+ *
+ * @param logfile An ISIS print.prt file
*/
void ProgramAnalyzer::add(const QString &logfile) {
Pvl plog(logfile);
@@ -167,14 +167,14 @@ void ProgramAnalyzer::add(const QString &logfile) {
}
/**
- * @brief Adds a program object originating from a print.prt file
- *
- * The PvlObject provided is assumed to orginate from an ISIS3 print.prt log
- * file. It contains information that will be extracted and analyzed according
- * to the features of this class.
- *
- *
- * @param program Pvl object containing the output log of an ISIS3 application
+ * @brief Adds a program object originating from a print.prt file
+ *
+ * The PvlObject provided is assumed to orginate from an ISIS print.prt log
+ * file. It contains information that will be extracted and analyzed according
+ * to the features of this class.
+ *
+ *
+ * @param program Pvl object containing the output log of an ISIS application
*/
void ProgramAnalyzer::add(PvlObject &program) {
_count++;
@@ -200,17 +200,17 @@ void ProgramAnalyzer::add(PvlObject &program) {
analyze(pdata);
return;
}
-
+
/**
* @brief Reports program counters for the current state
- *
- * This method reports counts of programs as they were added to the object. It
- * reports total programs, numbers for analyzed, included, excluded, unique,
- * valid, errors, zero CPU/Connect times and incomplete or invalid (typcially
- * negative times) for programs it evaluted.
- *
+ *
+ * This method reports counts of programs as they were added to the object. It
+ * reports total programs, numbers for analyzed, included, excluded, unique,
+ * valid, errors, zero CPU/Connect times and incomplete or invalid (typcially
+ * negative times) for programs it evaluted.
+ *
* @param name Name of Pvl group to create
- *
+ *
* @return PvlGroup Pvl group containing program numbers/counts
*/
PvlGroup ProgramAnalyzer::review(const QString &name) const {
@@ -231,14 +231,14 @@ PvlGroup ProgramAnalyzer::review(const QString &name) const {
/**
- * @brief Reports cumulative runtime performance statistics for programs
- *
- * This method formats the contents of the program analysis in a Pvl group that
- * provides information for all programs regardin CPU, connect and I/O times.
- *
- *
+ * @brief Reports cumulative runtime performance statistics for programs
+ *
+ * This method formats the contents of the program analysis in a Pvl group that
+ * provides information for all programs regardin CPU, connect and I/O times.
+ *
+ *
* @param name Name of Pvl group to create
- *
+ *
* @return PvlGroup Pvl group containing cumulative program analysis
*/
PvlGroup ProgramAnalyzer::cumulative(const QString &name) const {
@@ -246,14 +246,14 @@ PvlGroup ProgramAnalyzer::cumulative(const QString &name) const {
}
/**
- * @brief Reports analysis for a specific program
- *
- * This object maintains individual statistics for each unique program. This
- * method reports the analysis for a particular program.
- *
- *
+ * @brief Reports analysis for a specific program
+ *
+ * This object maintains individual statistics for each unique program. This
+ * method reports the analysis for a particular program.
+ *
+ *
* @param name Name of the program to analyze
- *
+ *
* @return PvlGroup Pvl group containing program analysis
*/
PvlGroup ProgramAnalyzer::summarize(const QString &name) const {
@@ -262,13 +262,13 @@ PvlGroup ProgramAnalyzer::summarize(const QString &name) const {
/**
* @brief Reports analysis for the nth occuring application in the list
- *
- * This object maintains individual statistics for each unique program. This
- * method reports the analysis for a program that occurs in the list at the
- * given index.
-
+ *
+ * This object maintains individual statistics for each unique program. This
+ * method reports the analysis for a program that occurs in the list at the
+ * given index.
+
* @param index Index of the application to summerize
- *
+ *
* @return PvlGroup Pvl group containing the program analysis
*/
PvlGroup ProgramAnalyzer::summarize(const int index) const {
@@ -277,9 +277,9 @@ PvlGroup ProgramAnalyzer::summarize(const int index) const {
/**
* @brief Writes a header in CVS format to a ostream
- *
+ *
* @param out Output stream to write the header
- *
+ *
* @return ostream& Returns the stream
*/
ostream &ProgramAnalyzer::header(ostream &out) const {
@@ -288,18 +288,18 @@ ostream &ProgramAnalyzer::header(ostream &out) const {
}
/**
- * @brief Writes the analysis to the stream in CSV format
- *
- * This method provides the analysis in CSV format for more traditional
- * manipulation. This format is well suited to be plotted for further analysis
- * of the program/system performance.
- *
- * The columns provided are: Program name, FROM file, TO file, runtime, connect
- * time, CPU time, and I/O time (difference in runtime and CPU time).
- *
- *
+ * @brief Writes the analysis to the stream in CSV format
+ *
+ * This method provides the analysis in CSV format for more traditional
+ * manipulation. This format is well suited to be plotted for further analysis
+ * of the program/system performance.
+ *
+ * The columns provided are: Program name, FROM file, TO file, runtime, connect
+ * time, CPU time, and I/O time (difference in runtime and CPU time).
+ *
+ *
* @param out Output stream to write data to
- *
+ *
* @return ostream& The output stream
*/
ostream &ProgramAnalyzer::listify(ostream &out) const {
@@ -322,7 +322,7 @@ ostream &ProgramAnalyzer::listify(ostream &out) const {
/**
* @brief Initializes the class
- *
+ *
* This init function is reintrant and will reset all internal parameters to the
* empty state.
*/
@@ -338,15 +338,15 @@ void ProgramAnalyzer::init() {
/**
* @brief Provides a count of analyzed programs
- *
- * Iterates through all programs included in the analysis and provides a count
- * fo the total. It will search through for a given status and only includes
- * those which have the indicated status. The valid status to check are those
- * defined in the Status enum list.
- *
+ *
+ * Iterates through all programs included in the analysis and provides a count
+ * fo the total. It will search through for a given status and only includes
+ * those which have the indicated status. The valid status to check are those
+ * defined in the Status enum list.
+ *
* @param status Status of the program to count
- *
- * @return int
+ *
+ * @return int
*/
int ProgramAnalyzer::getCount (ProgramAnalyzer::Status status) const {
vector<ProgramData>::const_iterator progs = _pdata.begin();
@@ -357,20 +357,20 @@ int ProgramAnalyzer::getCount (ProgramAnalyzer::Status status) const {
}
return (n);
}
-
-
+
+
/**
- * @brief Extracts a keyword value from the Pvl object
- *
- *
+ * @brief Extracts a keyword value from the Pvl object
+ *
+ *
* @param obj Pvl object to search for the keyword
* @param key Name of keyword to find
* @param grp Optional group within the object to find the keyword
- *
- * @return QString Value of the keyword if the keyword exists, otherwise an empty
+ *
+ * @return QString Value of the keyword if the keyword exists, otherwise an empty
* QString is returned.
*/
-QString ProgramAnalyzer::getKey(PvlObject &obj, const QString &key,
+QString ProgramAnalyzer::getKey(PvlObject &obj, const QString &key,
const QString &grp) const {
QString value("");
@@ -385,20 +385,20 @@ QString ProgramAnalyzer::getKey(PvlObject &obj, const QString &key,
}
/**
- * @brief Converts times represented in text to digital values
- *
- * The text QString, atime, is expected to be of the format "HH:MM:SS.sss" where
- * "HH" is hours, "MM" is minutes and "SS.sss" is seconds.milliseconds. The
- * units returned are in seconds.
- *
+ * @brief Converts times represented in text to digital values
+ *
+ * The text QString, atime, is expected to be of the format "HH:MM:SS.sss" where
+ * "HH" is hours, "MM" is minutes and "SS.sss" is seconds.milliseconds. The
+ * units returned are in seconds.
+ *
* @param atime Text QString containing time to convert
* @param dtime Time in seconds
- *
- * @return ProgramAnalyzer::Status Returns BADDATA if the text QString is empty
+ *
+ * @return ProgramAnalyzer::Status Returns BADDATA if the text QString is empty
* or malformed, or VALID if the conversion
* succeeds.
*/
-ProgramAnalyzer::Status ProgramAnalyzer::convertTime(const QString &atime,
+ProgramAnalyzer::Status ProgramAnalyzer::convertTime(const QString &atime,
double &dtime) const {
if ( atime.isEmpty() ) return (BADDATA);
QStringList t = atime.split(":");
@@ -418,23 +418,23 @@ ProgramAnalyzer::Status ProgramAnalyzer::convertTime(const QString &atime,
}
/**
- * @brief Compute analysis of program entry
- *
- * This method accepts a Pvl object that is assumed to orignate from an ISIS3
- * print.prt log file and conforms to the format in the log file.
- *
- * Data is extracted from certain keywords in the object. Invalid objects or
- * error conditions are detected and are indicated in the status of the program
- * analysis structure, pdata. Other conditions of no time for runtimes or CPU
- * times is also detected and indicated.
- *
- *
+ * @brief Compute analysis of program entry
+ *
+ * This method accepts a Pvl object that is assumed to orignate from an ISIS
+ * print.prt log file and conforms to the format in the log file.
+ *
+ * Data is extracted from certain keywords in the object. Invalid objects or
+ * error conditions are detected and are indicated in the status of the program
+ * analysis structure, pdata. Other conditions of no time for runtimes or CPU
+ * times is also detected and indicated.
+ *
+ *
* @param obj Object containing program data
* @param pdata Structure to return derived values from the program data
- *
+ *
* @return bool True if successful, false otherwise.
*/
-bool ProgramAnalyzer::accounting(PvlObject &obj,
+bool ProgramAnalyzer::accounting(PvlObject &obj,
ProgramAnalyzer::ProgramData &pdata) const {
// Assume an error occured if the Accounting group is missing
@@ -442,7 +442,7 @@ bool ProgramAnalyzer::accounting(PvlObject &obj,
pdata.status = ERRORS;
return (false);
}
-
+
PvlGroup &acc = obj.findGroup("Accounting");
Status status = convertTime(findKey(acc,"ConnectTime"), pdata.connectTime);
pdata.status = convertTime(findKey(acc, "CpuTime"), pdata.cpuTime);
@@ -457,13 +457,13 @@ bool ProgramAnalyzer::accounting(PvlObject &obj,
/**
- * @brief Performs the analysis of a program
- *
- * This method accepts a program data structure, determines validity for
- * inclusion in the analysis and computes statistics from the data content.
- *
+ * @brief Performs the analysis of a program
+ *
+ * This method accepts a program data structure, determines validity for
+ * inclusion in the analysis and computes statistics from the data content.
+ *
* @param data Structure containing program data
- *
+ *
* @return bool True if valid and included, false otherwize
*/
bool ProgramAnalyzer::analyze(const ProgramAnalyzer::ProgramData &data) {
@@ -490,17 +490,17 @@ bool ProgramAnalyzer::analyze(const ProgramAnalyzer::ProgramData &data) {
/**
* @brief Produces report of run time statistics for the given structure
- *
- *
- * The data contained with the RunTimeStats is externalized to a Pvl group with
- * some resonable formatting.
- *
+ *
+ *
+ * The data contained with the RunTimeStats is externalized to a Pvl group with
+ * some resonable formatting.
+ *
* @param stats Run time stats for the given data
* @param name Optional name of the PvlGroup results
- *
+ *
* @return PvlGroup Pvl group of runtime statistics
*/
-PvlGroup ProgramAnalyzer::toPvl(const RunTimeStats &stats,
+PvlGroup ProgramAnalyzer::toPvl(const RunTimeStats &stats,
const QString &name) const {
PvlGroup pvl((name.isEmpty() ? stats.pname : name));
@@ -525,9 +525,9 @@ PvlGroup ProgramAnalyzer::toPvl(const RunTimeStats &stats,
/**
* @brief Returns NULL for empty QStrings to ensure meaningful content
- *
+ *
* @param s String to test for content
- *
+ *
* @return QString Returns existing content if present, NULL if empty
*/
QString ProgramAnalyzer::format(const QString &s) const {
@@ -547,7 +547,7 @@ QString ProgramAnalyzer::format(const QString &s) const {
*
* @return QString Returns the converted QString
*/
- QString ProgramAnalyzer::DblToStr(const double &value, const int precision)
+ QString ProgramAnalyzer::DblToStr(const double &value, const int precision)
const {
if(IsSpecial(value)) {
return (QString("0.0"));
@@ -561,18 +561,18 @@ QString ProgramAnalyzer::format(const QString &s) const {
}
/**
- * @brief Returns the count of all programs in the log list
- *
- * This method computes a count of all programs that exist in the list of
- * applications that encurred a limit in the analysis. It is not enough to
- * just report the number of entries in the list - each list contains a count
- * of occurances. These occurances are summed and return to the caller.
- *
+ * @brief Returns the count of all programs in the log list
+ *
+ * This method computes a count of all programs that exist in the list of
+ * applications that encurred a limit in the analysis. It is not enough to
+ * just report the number of entries in the list - each list contains a count
+ * of occurances. These occurances are summed and return to the caller.
+ *
* @param limit List of applications incurring a limit
- *
+ *
* @return int Total number of occurances all programs in the list
*/
- int ProgramAnalyzer::LimitTotals(const ProgramAnalyzer::LogList &limit)
+ int ProgramAnalyzer::LimitTotals(const ProgramAnalyzer::LogList &limit)
const {
int total(0);
for ( int i = 0 ; i < limit.size() ; i++ ) {
@@ -582,5 +582,3 @@ QString ProgramAnalyzer::format(const QString &s) const {
}
} // namespace Isis
-
-
diff --git a/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.h b/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.h
index 8971449957..e3d2303991 100644
--- a/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.h
+++ b/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.h
@@ -37,14 +37,14 @@
namespace Isis {
/**
- * @brief A ProgramAnalyzer accumulates print log runtime statistics
- *
- * This class reads an ISIS3 print log and accumulates runtime statistics for
- * all programs found in the log file. It will compute overall CPU and
+ * @brief A ProgramAnalyzer accumulates print log runtime statistics
+ *
+ * This class reads an ISIS print log and accumulates runtime statistics for
+ * all programs found in the log file. It will compute overall CPU and
* connect time to use in analysis of (typically I/O) performance.
- *
- * Various format and reporting utilities are provided to externalize the
- * results.
+ *
+ * Various format and reporting utilities are provided to externalize the
+ * results.
*
* @ingroup Utility
* @author 2006-11-09 Kris Becker
@@ -105,7 +105,7 @@ namespace Isis {
Statistics cputime;
Statistics iotime;
RunTimeStats() : pname(""), contime(), cputime(), iotime() { }
- RunTimeStats(const QString &name) : pname(name), contime(),
+ RunTimeStats(const QString &name) : pname(name), contime(),
cputime(), iotime() { }
};
@@ -119,7 +119,7 @@ namespace Isis {
QString to;
double cpuTime;
double connectTime;
- ProgramData() : status(BADDATA), name(""), runtime(""),
+ ProgramData() : status(BADDATA), name(""), runtime(""),
from(""), to(""), cpuTime(0.0), connectTime(0.0) { }
};
@@ -137,7 +137,7 @@ namespace Isis {
void init();
int getCount (Status status) const;
- QString getKey(PvlObject &obj, const QString &key,
+ QString getKey(PvlObject &obj, const QString &key,
const QString &grp = "") const;
/** Find a string in a PvlContainer */
@@ -162,5 +162,3 @@ namespace Isis {
#endif
-
-
diff --git a/isis/src/system/apps/prtloganalyzer/prtloganalyzer.xml b/isis/src/system/apps/prtloganalyzer/prtloganalyzer.xml
index f393aa0ecb..1808c1ae0a 100644
--- a/isis/src/system/apps/prtloganalyzer/prtloganalyzer.xml
+++ b/isis/src/system/apps/prtloganalyzer/prtloganalyzer.xml
@@ -5,27 +5,27 @@
Analyze program execution efficiency in ISIS print.prt logs
</brief>
- <description>
+ <description>
<p>
- <b>prtloganalyzer</b> analyzes the content of an ISIS3 print.prt log file
- for application efficiency, frequency and validity. It reads the full
- contents of the ISIS3 log file (generally named <i>print.prt</i> but can
- be changed with command line and/or IsisPreferences files) and categorizes
- them by application name. Runtime statistics (run time, CPU
- utilization and I/O time) are computed for each applicaiton. A
- running total for all applications as well as each unique program are
- maintained. The results are provided in Pvl and comma separated value
+ <b>prtloganalyzer</b> analyzes the content of an ISIS print.prt log file
+ for application efficiency, frequency and validity. It reads the full
+ contents of the ISIS log file (generally named <i>print.prt</i> but can
+ be changed with command line and/or IsisPreferences files) and categorizes
+ them by application name. Runtime statistics (run time, CPU
+ utilization and I/O time) are computed for each applicaiton. A
+ running total for all applications as well as each unique program are
+ maintained. The results are provided in Pvl and comma separated value
(CSV) file format for easy evaluation.
</p>
<p>
- The ISIS3 print log file contain Pvl objects that, at a minimum,
- describe for each program its parameters and accounting numbers for
- each run. Nearly all ISIS3 applications write to this log at the end
- of their execution. Here is an small example of the contents an ISIS3
+ The ISIS print log file contain Pvl objects that, at a minimum,
+ describe for each program its parameters and accounting numbers for
+ each run. Nearly all ISIS applications write to this log at the end
+ of their execution. Here is an small example of the contents an ISIS
print.prt log file:
</p>
<PRE>
-
+
Object = lrowac2isis
IsisVersion = "3.2.1beta | 2010-03-18"
ProgramVersion = 2010-01-19
@@ -255,8 +255,8 @@ Object = automos
End_Object
</PRE>
<p>
- In the above example, there are 6 total programs of which 5 are
- unique (cam2map is run twice). The output of this application with
+ In the above example, there are 6 total programs of which 5 are
+ unique (cam2map is run twice). The output of this application with
command line <b>prtloganalyzer from=print.prt</b> is:
</p>
<PRE>
@@ -290,17 +290,17 @@ Group = ProgramTotals
End_Group
</PRE>
<p>
- The following table summarizes the definitions of the keywords and
- values found in the <b>Results</b> group. This group provides a
- count summary of applications categorized to indicate the applications
+ The following table summarizes the definitions of the keywords and
+ values found in the <b>Results</b> group. This group provides a
+ count summary of applications categorized to indicate the applications
processing status as found in the log file.
</p>
<br><h1 align="center">Results Group Keywords</h1></br>
<TABLE BORDER="1">
<CAPTION>
- Description of <b>Results</b> group keywords as produced
+ Description of <b>Results</b> group keywords as produced
by the <b>prtloganalyzer</b> application
- </CAPTION>
+ </CAPTION>
<TR>
<TH>Keyword</TH>
<TH>Description</TH>
@@ -308,110 +308,110 @@ End_Group
<TR>
<TD>Programs</TD>
<TD>
- Provides the total number of all applications found
+ Provides the total number of all applications found
in the print log file.
</TD>
</TR>
<TR>
<TD>Unique</TD>
<TD>
- Count of the number of unique programs found in the
- print log. Programs with the same name are
- tabulated together to form an indication of a single
+ Count of the number of unique programs found in the
+ print log. Programs with the same name are
+ tabulated together to form an indication of a single
programs efficiency.
</TD>
</TR>
<TR>
<TD>Included</TD>
<TD>
- The application provides two ways to include only
- named applications (see the <b>INCLUDE</b> and
- <b>INCLUDEFROM</b> parameters). This keyword
- provides a count of all the included programs
- analyzed.
+ The application provides two ways to include only
+ named applications (see the <b>INCLUDE</b> and
+ <b>INCLUDEFROM</b> parameters). This keyword
+ provides a count of all the included programs
+ analyzed.
</TD>
</TR>
<TR>
<TD>Excluded</TD>
<TD>
- The application provides two ways to exclude
- specific applications (see the <b>EXCLUDE</b> and
- <b>EXCLUDEFROM</b> parameters). This keyword
- provides a count of all excluded programs from the
+ The application provides two ways to exclude
+ specific applications (see the <b>EXCLUDE</b> and
+ <b>EXCLUDEFROM</b> parameters). This keyword
+ provides a count of all excluded programs from the
print log file.
</TD>
</TR>
<TR>
<TD>Valid</TD>
<TD>
- This keyword provides a count of the number of valid
- programs that were found in the print log file.
- These are application Pvl objects that do not
+ This keyword provides a count of the number of valid
+ programs that were found in the print log file.
+ These are application Pvl objects that do not
contain an <b>Errors</b> group.
</TD>
</TR>
<TR>
<TD>ZeroTime</TD>
<TD>
- This keyword provides a count of the number of
- applications that have 0 times for
- <b>ConnectTime</b> and <b>CpuTime</b> in the
- <b>Accounting</b> group of an application. These
- occurances are not included in the efficiency
- analysis as the statistical results are skewed by
+ This keyword provides a count of the number of
+ applications that have 0 times for
+ <b>ConnectTime</b> and <b>CpuTime</b> in the
+ <b>Accounting</b> group of an application. These
+ occurances are not included in the efficiency
+ analysis as the statistical results are skewed by
them.
</TD>
</TR>
<TR>
<TD>NoData</TD>
<TD>
- There are times when an application may not contain
- an <b>Accounting</b> group. These are rare
- occasions and may not ever occur in the wild, but
+ There are times when an application may not contain
+ an <b>Accounting</b> group. These are rare
+ occasions and may not ever occur in the wild, but
a count is provided here.
</TD>
</TR>
<TR>
<TD>BadData</TD>
<TD>
- Occasionally something can go wrong with the print
- log file and it can become corrupted or the
- application did not format the contents properly.
- This parameter counts the number of occurances where
+ Occasionally something can go wrong with the print
+ log file and it can become corrupted or the
+ application did not format the contents properly.
+ This parameter counts the number of occurances where
some of the data is invalid or missing entitirely.
</TD>
</TR>
<TR>
<TD>Total</TD>
<TD>
- This number provides the total number of valid
- programs found in the given print log file. This
- number includes only those used in the
+ This number provides the total number of valid
+ programs found in the given print log file. This
+ number includes only those used in the
<b>ProgramTotals</b> group in the results.
</TD>
</TR>
</TABLE>
<p>
- The <b>ProgramTotals</b> group provides the runtime numbers for all
- the programs. This will give an indication of performance for all
- applications included in the analysis. The <b>SUMMARY</b> parameter
- indicates the name of a file that will included the <b>Results</b> and
- <b>ProgramTotals</b> groups and a <b>ProgramTotals</b> group for each
- unique set of applications, such as <b>cam2map</b>. The following
- table describes the meaning of the keywords contained in the
- <b>ProgramTotals</b> group above.
+ The <b>ProgramTotals</b> group provides the runtime numbers for all
+ the programs. This will give an indication of performance for all
+ applications included in the analysis. The <b>SUMMARY</b> parameter
+ indicates the name of a file that will included the <b>Results</b> and
+ <b>ProgramTotals</b> groups and a <b>ProgramTotals</b> group for each
+ unique set of applications, such as <b>cam2map</b>. The following
+ table describes the meaning of the keywords contained in the
+ <b>ProgramTotals</b> group above.
</p>
<p>
- All units of times are in seconds unless otherwise indicated. All
- these values are computed from the <b>Accounting</b> group in each
- application object entry in the log file. These numbers are computed
- from keywords in this group. The <i>ConnectTime</i> keyword is used
- to compute runtime values. The <i>CpuTime</i> keyword is used to
- compute CPU values. The I/O values are computed using the
- difference between the connect times and the cpu times. Not real
- scientific but is the best we can do given the data to work with. I/O
- times may also include wait states during the run of the application
- other than disk I/O. Our assumption is that I/O dominates this
+ All units of times are in seconds unless otherwise indicated. All
+ these values are computed from the <b>Accounting</b> group in each
+ application object entry in the log file. These numbers are computed
+ from keywords in this group. The <i>ConnectTime</i> keyword is used
+ to compute runtime values. The <i>CpuTime</i> keyword is used to
+ compute CPU values. The I/O values are computed using the
+ difference between the connect times and the cpu times. Not real
+ scientific but is the best we can do given the data to work with. I/O
+ times may also include wait states during the run of the application
+ other than disk I/O. Our assumption is that I/O dominates this
difference.
</p>
<br><h1 align="center">ProgramTotals Group Keywords</h1></br>
@@ -419,7 +419,7 @@ End_Group
<CAPTION>
Description of <b>ProgramTotals</b> group keywords as produced by
the <b>prtloganalyzer</b> application.
- </CAPTION>
+ </CAPTION>
<TR>
<TH>Keyword</TH>
<TH>Description</TH>
@@ -427,8 +427,8 @@ End_Group
<TR>
<TD>Hits</TD>
<TD>
- Provides the total number of all applications found
- in the print log file. Should be the same as the <b>Total</b>
+ Provides the total number of all applications found
+ in the print log file. Should be the same as the <b>Total</b>
keyword in the <b>Results</b> group.
</TD>
</TR>
@@ -447,14 +447,14 @@ End_Group
<TR>
<TD>ConnectTimeAverage</TD>
<TD>
- Indicates the average time an application took to
+ Indicates the average time an application took to
complete.
</TD>
</TR>
<TR>
<TD>ConnectTimeStdDev</TD>
- <TD>
- Indicates the standard deviation of the time an application
+ <TD>
+ Indicates the standard deviation of the time an application
took to complete.
</TD>
</TR>
@@ -478,8 +478,8 @@ End_Group
</TR>
<TR>
<TD>CpuTimeStdDev</TD>
- <TD>
- Indicates the standard deviation of the cpu time an
+ <TD>
+ Indicates the standard deviation of the cpu time an
application used.
</TD>
</TR>
@@ -503,16 +503,16 @@ End_Group
</TR>
<TR>
<TD>IOTimeStdDev</TD>
- <TD>
- Indicates the standard deviation of the I/O time an
+ <TD>
+ Indicates the standard deviation of the I/O time an
application used.
</TD>
</TR>
</TABLE>
<p>
- Finally, the name of the file specified in the LOG parameter will
- contain a flat file of comma separated values (CSV) for each program.
- This files is intended to be used to plot the computed values for each
+ Finally, the name of the file specified in the LOG parameter will
+ contain a flat file of comma separated values (CSV) for each program.
+ This files is intended to be used to plot the computed values for each
of the applications. The following is the contents of the LOG file.
</p>
<PRE>
@@ -525,13 +525,13 @@ cam2map,M109629168CE.vis.odd.cal.cub,M109629168CE.vis.odd.proj.cub,2010-05-04T15
automos,NULL,NULL,2010-05-04T16:31:56,3.00,1.50,1.50
</PRE>
<p>
- As you can see the file contains certain fields from each application
- selected from the print log file. The name of the program is provided
- as well as the FROM and TO parameters to the program if they exist.
- It either one does not exist, a NULL values is written (some programs
- don't have a FROM or a TO parameter). The time the program was
- executed/started is also provided. This parameter provides the
- ability to plot a time based parameter. The connect, CPU and I/O
+ As you can see the file contains certain fields from each application
+ selected from the print log file. The name of the program is provided
+ as well as the FROM and TO parameters to the program if they exist.
+ It either one does not exist, a NULL values is written (some programs
+ don't have a FROM or a TO parameter). The time the program was
+ executed/started is also provided. This parameter provides the
+ ability to plot a time based parameter. The connect, CPU and I/O
times then follow.
</p>
</description>
@@ -548,7 +548,7 @@ automos,NULL,NULL,2010-05-04T16:31:56,3.00,1.50,1.50
<groups>
<group name="Files">
-
+
<parameter name="FROM">
<type>filename</type>
<fileMode>input</fileMode>
@@ -559,12 +559,12 @@ automos,NULL,NULL,2010-05-04T16:31:56,3.00,1.50,1.50
Name of an ISIS print.prt log file
</brief>
<description>
- This parameter provides the name of the ISIS3 print log file. The
- name is typically "print.prt" but can vary. Note that many
- different print.prt files can be concatenated together in one file
- so that analysis can be performed on many files. One such way to
- concatenate print files is to use the UNIX <b>cat</b> command to
- combine two or more files to a single file. The general form is
+ This parameter provides the name of the ISIS print log file. The
+ name is typically "print.prt" but can vary. Note that many
+ different print.prt files can be concatenated together in one file
+ so that analysis can be performed on many files. One such way to
+ concatenate print files is to use the UNIX <b>cat</b> command to
+ combine two or more files to a single file. The general form is
<b>cat file1 file2 file3 > catfile</b>.
</description>
</parameter>
@@ -578,14 +578,14 @@ automos,NULL,NULL,2010-05-04T16:31:56,3.00,1.50,1.50
</brief>
<description>
<p>
- This parameter is optional and can be used to list the names of
- programs that will be included in from the print file. This is
- handy to limit the full-up analysis to a specific set of
- applications. The file should contain the name of a single
- application on each line.
+ This parameter is optional and can be used to list the names of
+ programs that will be included in from the print file. This is
+ handy to limit the full-up analysis to a specific set of
+ applications. The file should contain the name of a single
+ application on each line.
</p>
<p>
- If applications of the same name exist in the exclude list as
+ If applications of the same name exist in the exclude list as
well, exclusions always takes precedence over the inclusions.
</p>
</description>
@@ -593,7 +593,7 @@ automos,NULL,NULL,2010-05-04T16:31:56,3.00,1.50,1.50
*.lis
</filter>
</parameter>
-
+
<parameter name="EXCLUDEFROM">
<type>filename</type>
<fileMode>input</fileMode>
@@ -603,14 +603,14 @@ automos,NULL,NULL,2010-05-04T16:31:56,3.00,1.50,1.50
</brief>
<description>
<p>
- This parameter is optional and can be used to list the names of
- programs that will be excluded in from the print file. This is
+ This parameter is optional and can be used to list the names of
+ programs that will be excluded in from the print file. This is
handy to exlude programs that are mostly benign in nature
(.e.g., <b>getkey</b>) that may skew the analysis. The file
should contain the name of a single application on each line.
</p>
<p>
- If applications of the same name exist in the include list as
+ If applications of the same name exist in the include list as
well, exclusions always takes precedence over the inclusions.
</p>
</description>
@@ -618,20 +618,20 @@ automos,NULL,NULL,2010-05-04T16:31:56,3.00,1.50,1.50
*.lis
</filter>
</parameter>
-
+
<parameter name="SUMMARY">
<type>filename</type>
<fileMode>output</fileMode>
<internalDefault>None</internalDefault>
<filter>*.dat</filter>
<brief>
- Output file containing summarization of each unique program in print
+ Output file containing summarization of each unique program in print
file analysis
</brief>
<description>
- If specifed the file name given for this parameter will contain the
- reported <b>Results</b> and <b>ProgramTotals</b> groups as well as a
- <b>ProgramTotals</b> group but with the name for each unique
+ If specifed the file name given for this parameter will contain the
+ reported <b>Results</b> and <b>ProgramTotals</b> groups as well as a
+ <b>ProgramTotals</b> group but with the name for each unique
application set.
</description>
</parameter>
@@ -644,9 +644,9 @@ automos,NULL,NULL,2010-05-04T16:31:56,3.00,1.50,1.50
Writes the specifics for all valid programs to this file
</brief>
<description>
- If specified, the file name given for this parameter will contain a
- comma separated value format listing for each application included
- in the analysis. See the main documentation for details on the
+ If specified, the file name given for this parameter will contain a
+ comma separated value format listing for each application included
+ in the analysis. See the main documentation for details on the
contents of this file.
</description>
</parameter>
@@ -660,9 +660,9 @@ automos,NULL,NULL,2010-05-04T16:31:56,3.00,1.50,1.50
Application names to include in analysis
</brief>
<description>
- This parameter is a convenient way to provided a list of
- applications to include in the analysis. Expected is a comma
- separated list of ISIS3 application names. All other applications
+ This parameter is a convenient way to provided a list of
+ applications to include in the analysis. Expected is a comma
+ separated list of ISIS application names. All other applications
that occur in the print log are excluded from the analysis.
</description>
</parameter>
@@ -674,9 +674,9 @@ automos,NULL,NULL,2010-05-04T16:31:56,3.00,1.50,1.50
Application names to exclude in analysis
</brief>
<description>
- This parameter is a convenient way to provided a list of
- applications to exclude in the analysis. Expected is a comma
- separated list of ISIS3 application names. All other applications
+ This parameter is a convenient way to provided a list of
+ applications to exclude in the analysis. Expected is a comma
+ separated list of ISIS application names. All other applications
that occur in the print log are included in the analysis.
</description>
</parameter>
diff --git a/isis/src/system/objs/Kernel/Kernel.h b/isis/src/system/objs/Kernel/Kernel.h
index 5b5c37e4d5..5aca65e5cd 100644
--- a/isis/src/system/objs/Kernel/Kernel.h
+++ b/isis/src/system/objs/Kernel/Kernel.h
@@ -42,7 +42,7 @@ namespace Isis {
* namespace into the Kernel class and renamed it
* Type. Added accessor and mutator methods. Changed
* method names to lower camel case and changed
- * member variable prefix to m_ to comply with Isis3
+ * member variable prefix to m_ to comply with Isis
* standards. Documented enumeration, methods, member
* variables. Created unitTest.References #924.
*/
diff --git a/isis/src/tgo/apps/tgocassis2isis/TgoCassisArchive.trn b/isis/src/tgo/apps/tgocassis2isis/TgoCassisArchive.trn
index 3e228cd98c..514a66d2fc 100644
--- a/isis/src/tgo/apps/tgocassis2isis/TgoCassisArchive.trn
+++ b/isis/src/tgo/apps/tgocassis2isis/TgoCassisArchive.trn
@@ -1,5 +1,5 @@
# Translates CaSSIS xml labels into the Archive 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.
@@ -48,7 +48,7 @@ End_Group
Group = ProductVersionId
Auto
- Optional
+ Optional
InputPosition = Identification_Area
InputKey = version_id
OutputName = ProductVersionId
@@ -189,7 +189,7 @@ End_Group
Group = FocalLength
Auto
Optional
- InputPosition = (CaSSIS_Header, CaSSIS_General)
+ InputPosition = (CaSSIS_Header, CaSSIS_General)
InputKey = TELESCOPE_FOCAL_LENGTH
OutputName = FocalLength
OutputPosition = (Object, IsisCube, Group, Archive)
@@ -506,4 +506,3 @@ End_Group
# </xs:complexType>
End
-
diff --git a/isis/src/tgo/apps/tgocassis2isis/TgoCassisBandBin.trn b/isis/src/tgo/apps/tgocassis2isis/TgoCassisBandBin.trn
index ebc97a83b5..59e843a1f5 100644
--- a/isis/src/tgo/apps/tgocassis2isis/TgoCassisBandBin.trn
+++ b/isis/src/tgo/apps/tgocassis2isis/TgoCassisBandBin.trn
@@ -1,5 +1,5 @@
# Translates CaSSIS xml labels into the BandBin 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/src/tgo/apps/tgocassis2isis/TgoCassisExportedInstrument.trn b/isis/src/tgo/apps/tgocassis2isis/TgoCassisExportedInstrument.trn
index d31f3b2606..efd56e1d96 100644
--- a/isis/src/tgo/apps/tgocassis2isis/TgoCassisExportedInstrument.trn
+++ b/isis/src/tgo/apps/tgocassis2isis/TgoCassisExportedInstrument.trn
@@ -1,5 +1,5 @@
# Translates CaSSIS 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/src/tgo/apps/tgocassis2isis/TgoCassisInstrument.trn b/isis/src/tgo/apps/tgocassis2isis/TgoCassisInstrument.trn
index 43b0e03b13..f010647a33 100644
--- a/isis/src/tgo/apps/tgocassis2isis/TgoCassisInstrument.trn
+++ b/isis/src/tgo/apps/tgocassis2isis/TgoCassisInstrument.trn
@@ -1,5 +1,5 @@
# Translates CaSSIS 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/src/tgo/apps/tgocassis2isis/TgoCassisMapping.trn b/isis/src/tgo/apps/tgocassis2isis/TgoCassisMapping.trn
index 299f86fe24..62db466f60 100644
--- a/isis/src/tgo/apps/tgocassis2isis/TgoCassisMapping.trn
+++ b/isis/src/tgo/apps/tgocassis2isis/TgoCassisMapping.trn
@@ -1,5 +1,5 @@
# Translates CaSSIS xml labels into the Mapping 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.
@@ -29,13 +29,13 @@
# </Axis_Array>
# </Array_2D_Image>
#
-#
+#
# history 2018-08-09 Jeannie Backer - Changed group name from MapProjection
# to ProjectionName.
Group = ProjectionName
Auto
- InputPosition = (Observation_Area, Discipline_Area, cart:Cartography, cart:Spatial_Reference_Information, cart:Horizontal_Coordinate_System_Definition, cart:Planar, cart:Map_Projection)
+ InputPosition = (Observation_Area, Discipline_Area, cart:Cartography, cart:Spatial_Reference_Information, cart:Horizontal_Coordinate_System_Definition, cart:Planar, cart:Map_Projection)
InputKey = cart:map_projection_name
OutputName = ProjectionName
OutputPosition = (Object,IsisCube,Group,Mapping)
@@ -44,7 +44,7 @@ End_Group
Group = CenterLongitude
Auto
- InputPosition = (Observation_Area, Discipline_Area, cart:Cartography, cart:Spatial_Reference_Information, cart:Horizontal_Coordinate_System_Definition, cart:Planar, cart:Map_Projection, cart:Equirectangular)
+ InputPosition = (Observation_Area, Discipline_Area, cart:Cartography, cart:Spatial_Reference_Information, cart:Horizontal_Coordinate_System_Definition, cart:Planar, cart:Map_Projection, cart:Equirectangular)
InputKey = cart:longitude_of_central_meridian
OutputName = CenterLongitude
OutputPosition = (Object,IsisCube,Group,Mapping)
@@ -53,7 +53,7 @@ End_Group
Group = CenterLatitude
Auto
- InputPosition = (Observation_Area, Discipline_Area, cart:Cartography, cart:Spatial_Reference_Information, cart:Horizontal_Coordinate_System_Definition, cart:Planar, cart:Map_Projection, cart:Equirectangular)
+ InputPosition = (Observation_Area, Discipline_Area, cart:Cartography, cart:Spatial_Reference_Information, cart:Horizontal_Coordinate_System_Definition, cart:Planar, cart:Map_Projection, cart:Equirectangular)
InputKey = cart:latitude_of_projection_origin
OutputName = CenterLatitude
OutputPosition = (Object,IsisCube,Group,Mapping)
@@ -105,7 +105,7 @@ Group = MaximumLongitude
OutputName = MaximumLongitude
OutputPosition = (Object,IsisCube,Group,Mapping)
Translation = (*, *)
-End_Group
+End_Group
Group = MinimumLongitude
Auto
@@ -181,7 +181,7 @@ Group = TargetName
Translation = (*, *)
End_Group
-# Does not exist in xml label
+# Does not exist in xml label
Group = LongitudeDomain
Auto
InputDefault = 360
diff --git a/isis/src/tgo/apps/tgocassis2isis/TgoCassisMosaic.trn b/isis/src/tgo/apps/tgocassis2isis/TgoCassisMosaic.trn
index 1c2575c5d4..e783752fca 100644
--- a/isis/src/tgo/apps/tgocassis2isis/TgoCassisMosaic.trn
+++ b/isis/src/tgo/apps/tgocassis2isis/TgoCassisMosaic.trn
@@ -1,5 +1,5 @@
# Translates CaSSIS xml labels into the Mosaic 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.
@@ -29,12 +29,12 @@
# </Axis_Array>
# </Array_2D_Image>
#
-#
-# history:
+#
+# history:
# ????-??-?? Makayla Shepherd - Original Version
# 2018-06-13 Kristin Berry - Updated for changes to exported mosaic format.
# 2018-06-17 Kristin Berry - Added additional geometrical, time, and mission-related
-# keywords to ingest.
+# keywords to ingest.
Group = SpacecraftName
Auto
@@ -87,7 +87,7 @@ End_Group
Group = LocalTime
Auto
InputKey = local_true_solar_time
- InputPosition = (Observation_Area, Time_Coordinates)
+ InputPosition = (Observation_Area, Time_Coordinates)
OutputName = LocalTime
OutputPosition = (Object, IsisCube, Group, Mosaic)
Translation = (*, *)
@@ -147,5 +147,3 @@ Group = NorthAzimuth
OutputPosition = (Object, IsisCube, Group, Mosaic)
Translation = (*, *)
End_Group
-
-
diff --git a/isis/src/tgo/apps/tgocassis2isis/TgoCassisMosaicBandBin.trn b/isis/src/tgo/apps/tgocassis2isis/TgoCassisMosaicBandBin.trn
index c020dfbbb1..7d32944840 100644
--- a/isis/src/tgo/apps/tgocassis2isis/TgoCassisMosaicBandBin.trn
+++ b/isis/src/tgo/apps/tgocassis2isis/TgoCassisMosaicBandBin.trn
@@ -1,6 +1,6 @@
# Translates CaSSIS xml labels into the BandBin PvlGroup values
-# for the ingested ISIS3 cube labels, for exported mosaics which have been
-# generated using tgocassisrdrgen.
+# for the ingested ISIS cube labels, for exported mosaics which have been
+# generated using tgocassisrdrgen.
#
# The Dependencies keyword specifies a tag or attribute at the same level as
# the InputKey that uniquely identifies the InputKey.
@@ -36,7 +36,7 @@
# axis_name tag with a value of Sample.
#
# history:
-# 2018-06-13 Kristin Berry - Original Version.
+# 2018-06-13 Kristin Berry - Original Version.
# 2020-12-22 Kaitlyn Lee - Updated Center and Width translations to match
TgoCassisBandBin.trn.
diff --git a/isis/src/tgo/apps/tgocassis2isis/main.cpp b/isis/src/tgo/apps/tgocassis2isis/main.cpp
index 94b91d4311..32381e105a 100644
--- a/isis/src/tgo/apps/tgocassis2isis/main.cpp
+++ b/isis/src/tgo/apps/tgocassis2isis/main.cpp
@@ -77,7 +77,7 @@ void IsisMain() {
}
if (!outputCube->group("Archive").hasKeyword("ObservationId")){
- convertUniqueIdToObservationId(*outputLabel);
+ convertUniqueIdToObservationId(*outputLabel);
}
FileName outputCubeFileName(ui.GetFileName("TO"));
@@ -175,7 +175,7 @@ void translateCoreInfo(XmlToPvlTranslationManager labelXlater, ProcessImport &im
* Translate the cartographic info from the xml.
*
* @param xmlFileName The xml label file name for the input image.
- * @param outputCube Pointer to output cube where ISIS3 labels will be added and
+ * @param outputCube Pointer to output cube where ISIS labels will be added and
* updated.
*/
bool translateMappingLabel(FileName xmlFileName, Cube *outputCube) {
@@ -207,7 +207,7 @@ bool translateMappingLabel(FileName xmlFileName, Cube *outputCube) {
* Translate the Mosaic group info from the xml.
*
* @param xmlFileName The xml label file name for the input image.
- * @param outputCube Pointer to output cube where ISIS3 labels will be added and
+ * @param outputCube Pointer to output cube where ISIS labels will be added and
* updated.
*/
bool translateMosaicLabel(FileName xmlFileName, Cube *outputCube) {
@@ -275,11 +275,11 @@ bool translateMosaicLabel(FileName xmlFileName, Cube *outputCube) {
/**
- * Translate instrument, bandbin, and archive info from xml label into ISIS3
+ * Translate instrument, bandbin, and archive info from xml label into ISIS
* label and add kernels group.
*
* @param inputLabel Reference to the xml label file name for the input image.
- * @param outputCube Pointer to output cube where ISIS3 labels will be added and
+ * @param outputCube Pointer to output cube where ISIS labels will be added and
* updated.
*
* @internal
@@ -337,7 +337,7 @@ void translateLabels(FileName &inputLabel, Cube *outputCube, QString instTransFi
}
if (outputLabel->hasGroup("StopTime")) {
- PvlKeyword *stopTime = &outputLabel->findGroup("Instrument", Pvl::Traverse)["StopTime"];
+ PvlKeyword *stopTime = &outputLabel->findGroup("Instrument", Pvl::Traverse)["StopTime"];
QString stopTimeString = stopTime[0];
if (stopTimeString.endsWith("Z", Qt::CaseInsensitive)){
stopTimeString.chop(1);
@@ -440,7 +440,7 @@ void translateLabels(FileName &inputLabel, Cube *outputCube, QString instTransFi
// Add an alpha cube group based on the subwindowing
if (archive.hasKeyword("Window_Count")) {
- int windowNumber = (int)archive["Window_Count"] + 1;
+ int windowNumber = (int)archive["Window_Count"] + 1;
QString windowString = "Window_" + toString(windowNumber);
int frameletStartSample = (int) archive[windowString + "_Start_Sample"] + 1;
int frameletEndSample = (int) archive[windowString + "_End_Sample"] + 1;
diff --git a/isis/src/tgo/apps/tgocassisrdrgen/TgoCassisExport.trn b/isis/src/tgo/apps/tgocassisrdrgen/TgoCassisExport.trn
index 98da2c6fb4..11529e4fef 100644
--- a/isis/src/tgo/apps/tgocassisrdrgen/TgoCassisExport.trn
+++ b/isis/src/tgo/apps/tgocassisrdrgen/TgoCassisExport.trn
@@ -1,4 +1,4 @@
-# Translation for TGO CaSSIS export from ISIS3 cube to PDS4 product.
+# Translation for TGO CaSSIS export from ISIS cube to PDS4 product.
#
# Note these translations must be are ordered based on the required PDS4 order.
#
@@ -13,7 +13,7 @@
# history 2018-05-18 Jeannie Backer - Changed group names to upper camel case for consistency.
# history 2018-05-22 Kaitlyn Lee - Moved mosaic keywords to tgoCassisExportMosaic.trn.
# history 2018-06-18 Jeannie Backer - Look for ObservationId in Archive group
-# history 2019-06-12 Kristin Berry - Removed CaSSIS_Header for non-PDS4 compliance.
+# history 2019-06-12 Kristin Berry - Removed CaSSIS_Header for non-PDS4 compliance.
#Group = FileName
# Auto
@@ -100,7 +100,7 @@ End_Group
#Group = SmithedCK
# Auto
# Optional
-# InputKey = SmithedCK
+# InputKey = SmithedCK
# InputPosition = (IsisCube, Archive)
# OutputName = cassis:smithedck
# OutputPosition = (Product_Observational, Mission_Area, cassis:CaSSIS)
@@ -118,7 +118,7 @@ End_Group
#End_Group
# Commented-out non-PDS4 compliant CaSSIS_Header. Left in here in case
-# we want to translate these into a PDS4-compliant structure in the future.
+# we want to translate these into a PDS4-compliant structure in the future.
#Group = ProductId
# Auto
diff --git a/isis/src/voyager/apps/voy2isis/voy2isis.xml b/isis/src/voyager/apps/voy2isis/voy2isis.xml
index bb514abe0a..ead3e387ee 100644
--- a/isis/src/voyager/apps/voy2isis/voy2isis.xml
+++ b/isis/src/voyager/apps/voy2isis/voy2isis.xml
@@ -10,15 +10,15 @@
<p>
This program will take in raw image files from the Voyager spacecraft
mission and import them into Isis formatted cubes. The input files are
- compressed Planetary Data System (PDS) formatted Voyager Experiment
- Data Record (EDR) files. The output cube will contain tranlated labels in
- pvl format with instrument, archive, bandbin, kernel, and nominal reseau
+ compressed Planetary Data System (PDS) formatted Voyager Experiment
+ Data Record (EDR) files. The output cube will contain tranlated labels in
+ pvl format with instrument, archive, bandbin, kernel, and nominal reseau
information.
</p>
<p>
Some input images from the PDS archive may be missing a value for INSTRUMENT_NAME in their header.
For these images, the name of the instrument can be specified as NAC (NARROW_ANGLE_CAMERA)
- or WAC (WIDE_ANGLE_CAMERA) using the optional INSTRUMENT parameter.
+ or WAC (WIDE_ANGLE_CAMERA) using the optional INSTRUMENT parameter.
Users are encouraged to find this information in the pds data volume index.tab file.
</p>
</description>
@@ -29,16 +29,16 @@
</change>
<change name="Jeannie Walldren" date="2009-03-23">
Modified the Makefile in the app test to ignore particular lines when
- comparing labels. Removed the orginal extension from the name of the
- temporary decompressed file output by a call to vdcomp. Modified error
+ comparing labels. Removed the orginal extension from the name of the
+ temporary decompressed file output by a call to vdcomp. Modified error
message for accuracy.
</change>
<change name="Mackenzie Boyd" date="2010-04-30">
Modified StartTime in labels to remove Z from end. Modified naif frame
- code for all cameras to be -100 (-32001 -> -32101) from what they were
+ code for all cameras to be -100 (-32001 -> -32101) from what they were
previously to match updated ck and fk kernels. Added significant changes
- which affect the start time and image number for improved accuracy.
- </change>
+ which affect the start time and image number for improved accuracy.
+ </change>
<change name="Steven Lambright" date="2010-06-17">
Updated to make input IMQ's PVL labels parsable by our PVL classes
</change>
@@ -46,10 +46,10 @@
Added keywords Camera_State_1 and Camera_State_2.
</change>
<change name="Mackenzie Boyd" date="2011-01-21">
- Added support for .img files.
+ Added support for .img files.
</change>
<change name="Stuart Sides" date="2012-05-05">
- Added Center and Width keywords to the BandBin group.
+ Added Center and Width keywords to the BandBin group.
</change>
<change name="Kristin Berry" date="2015-07-22">
Added NaifStatus::CheckErrors() to see if any NAIF errors were signaled. References #2248
@@ -64,7 +64,7 @@
Made changes to allow merge of two voy2isis tickets. References #4421, #4345.
</change>
<change name="Kristin Berry" date="2019-11-06">
- Added the INSTRUMENT parameter to allow the specification of the InstrumentId
+ Added the INSTRUMENT parameter to allow the specification of the InstrumentId
when it cannot be determined from the labels. Fixed #3426
</change>
</history>
@@ -131,7 +131,7 @@
Output Isis cube
</brief>
<description>
- Use this parameter to select the output filename for the imported
+ Use this parameter to select the output filename for the imported
image.
</description>
<filter>
@@ -144,10 +144,10 @@
<brief>Defines the InstrumentId to use for the image. Only needs to be specified if missing from the input image.</brief>
<default><item>AUTOMATIC</item></default>
<description>
- This parameter is used to specify the InstrumentId for the image. If left at
- its default value, ISIS will determine the InstrumentId automatically
- using the INSTRUMENT_NAME value from the input image. This option was added because some images are
- missing the INSTRUMENT_NAME from their labels.
+ This parameter is used to specify the InstrumentId for the image. If left at
+ its default value, ISIS will determine the InstrumentId automatically
+ using the INSTRUMENT_NAME value from the input image. This option was added because some images are
+ missing the INSTRUMENT_NAME from their labels.
</description>
<list>
<option value="AUTOMATIC">
@@ -179,14 +179,14 @@
<brief>Using voy2isis</brief>
<description>
This example shows the use of voy2isis to ingest Voyager EDRs and output
- Isis3 cubes.
+ Isis cubes.
</description>
<terminalInterface>
<commandLine>
from=input/voyagerEdr.imq to=isisImage.cub
</commandLine>
<description>
- This example shows how to import with voy2isis. Both parameters must
+ This example shows how to import with voy2isis. Both parameters must
be used.
</description>
</terminalInterface>
@@ -197,7 +197,7 @@
Example GUI
</brief>
<description>
- Screenshot of the GUI
+ Screenshot of the GUI
</description>
<thumbnail width="200" height="168" src="assets/thumbs/voy2isisGUI.jpg" caption="voy2isis gui"/>
</image>
diff --git a/isis/src/voyager/apps/voy2isis/voyager_na_bandbin.trn b/isis/src/voyager/apps/voy2isis/voyager_na_bandbin.trn
index 2604aa33a2..3c78349ae4 100644
--- a/isis/src/voyager/apps/voy2isis/voyager_na_bandbin.trn
+++ b/isis/src/voyager/apps/voy2isis/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/src/voyager/apps/voy2isis/voyager_wa_bandbin.trn b/isis/src/voyager/apps/voy2isis/voyager_wa_bandbin.trn
index 9cd291a2ff..293fd22e7d 100644
--- a/isis/src/voyager/apps/voy2isis/voyager_wa_bandbin.trn
+++ b/isis/src/voyager/apps/voy2isis/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/tests/BundleMeasureTests.cpp b/isis/tests/BundleMeasureTests.cpp
index 8e48717784..0ee137ae2e 100644
--- a/isis/tests/BundleMeasureTests.cpp
+++ b/isis/tests/BundleMeasureTests.cpp
@@ -78,7 +78,7 @@ TEST_F( BundleMeasure_CreateObj, Constructor ) {
TEST_F( BundleMeasure_CreateObj, CopyConstructor ) {
- // First, check if the lineResidual is being initialized to ISIS3 Null.
+ // First, check if the lineResidual is being initialized to ISIS Null.
EXPECT_EQ( testBundleMeasurePtr->lineResidual(), Null );
// The interior ControlMeasure object's Line Residual will be used to confirm
@@ -109,7 +109,7 @@ TEST_F( BundleMeasure_CreateObj, CopyConstructor ) {
TEST_F( BundleMeasure_CreateObj, AssignmentOperator ) {
- // First, check if the lineResidual is being initialized to ISIS3 Null.
+ // First, check if the lineResidual is being initialized to ISIS Null.
EXPECT_EQ( testBundleMeasurePtr->lineResidual(), Null );
// The interior ControlMeasure object's Line Residual will be used to confirm
--
GitLab