MATCHDEM = FALSE, the default does not check the SHAPEMODEL keyword of the input cube - files and does not propogate what DEM Shapemodel that was used when the input files were + files and does not propagate what DEM Shapemodel that was used when the input files were projected.
@@ -61,19 +61,43 @@ options is explained in the tables and descriptions below.- The Track feature creates a band in the output mosaic file containing the index - values for every pixel in the output mosaic. The Track-band can only be used appropriately through - the QVIEW-AdvancedTracking tool. As the user interactively pans across the displayed - mosaic band (Band1), for every mosaic pixel location QVIEW-AdvancedTracking will report - the source cube filename that was input to automos. The Track-band cannot be used outside - the QVIEW-AdvancedTracking tool. The file (byte) size of the mosaic is increased due to - the track-band. + The TRACK feature creates a separate tracking cube in addition to the mosaic cube, and + contains information for the source files of every pixel within the output mosaic. + This cube will have the same base-name as the mosaic cube but will end in + "_tracking.cub". The tracking cube must always reside in the same directory as the + mosaic cube to be properly accessed; this means that if the mosaic cube is copied or + moved, then its associated tracking cube must be copied or moved to the same location. + The tracking cube will always be of type unsigned integer. Depending on the + bit-type of the mosaic cube and/or the number of bands it contains, the tracking cube + may be as much as four times the size of the mosaic cube itself.
- The Track feature works with Priority options ONTOP (with HIGHSATURATION and - LOWSATURATION parameters) and BENEATH for single band input cubes. It does NOT support - multiple band input cubes with these priority options. It does work for multiband cubes - when PRIORITY=BAND. Furthermore, this feature is NOT supported when PRIORITY=AVERAGE. + The tracking cube can be used appropriately through the QVIEW-AdvancedTracking + tool. As the user pans across the displayed mosaic, for every mosaic pixel location, + QVIEW-AdvancedTracking will interactively report the index, the filename and the + serial number of the input cube that was input to automos for that specific pixel + location. Since the tracking cube is of bit-type unsigned integer, the DN values of + 0, 1 and 2 are reserved for NULL, LRS and LIS, respectively, so valid pixel DN values + will begin at an offset of 3. In other words, a pixel of DN value 3 in the tracking + cube means that this same pixel within the mosaic was taken from the first input + image. The tracking cube cannot be used outside of the QVIEW-AdvancedTracking tool + except as a visual representation of the source cubes for the different pixels. +
++ The TRACK feature works with Priority options ONTOP and BENEATH for single band input + cubes. It works for multiband cubes for PRIORITY=ONTOP only when the NULL, + HIGHSATURATION and LOWSATURATION options are set to true. It also works for multiband + cubes when PRIORITY=BAND. Furthermore, this feature is NOT supported when + PRIORITY=AVERAGE. +
+
+ Please Note: Prior to ISIS version 3.6.0, tracking for the various mosaicking apllications
+ was being handled with an internal tracking band. Tracking is now being handled by an
+ external tracking cube that contains the associated tracking information. This application
+ can no longer add to mosaics of the old format. In order to continue to use these
+ older mosaics with the updated mosaicking applications, you must first use the
+
@@ -90,8 +114,17 @@
current input image will appear in the output mosaic (it replaces the output mosaic
pixel). Invalid input
+ NOTE: When using this priority with multi-band mosaics and with the TRACK + option set, all Special Pixel flags must be set as well. This is because the same + pixel within different bands of a single input image may hold both Valid and Special + Pixel values, and since our Tracking capabilities can only track one input image per + pixel (as it is a single band), it must accept the values for that particular pixel + from every band in the input image being placed on top. +
- The Track feature creates a band in the output mosaic file containing the index - values for every pixel in the output mosaic. The Track-band can only be used - appropriately through the QVIEW-AdvancedTracking tool. As the user interactively - pans across the displayed mosaic band (Band1), for every mosaic pixel location - QVIEW-AdvancedTracking will report the source cube filename that was input to - automos. The Track-band cannot be used outside the QVIEW-AdvancedTracking tool. - TRACK must be set to TRUE at the time of mosaic creation only and cannot be turned - on after the mosaic is created. When a mosaic is created with TRACK=TRUE, all - subsequent runs will default to TRACK=TRUE. When a mosaic is created with - TRACK=FALSE, an error will be encountered if subsequent runs have TRACK=TRUE. - The file (byte) size of the mosaic is increased due to - the track-band. -
-- A table, called InputImages, containing the names of the images used in the mosaic - will be added to the cube when TRACK=TRUE. + The Track feature creates a separate tracking cube containing the index values for + the source of every pixel in the output mosaic. The tracking cube can only be used + appropriately through the QVIEW-AdvancedTracking tool. As the user pans across the + displayed mosaic, for every mosaic pixel location QVIEW-AdvancedTracking will + interactively report the filename, the serial number and the index of the input cube + that was input to automos for that specific pixel location. The tracking cube cannot + be used outside the QVIEW-AdvancedTracking tool except as a visual representation of + the source cubes for the different pixels. TRACK must be set to TRUE at the time of + mosaic creation only and cannot be turned on after the mosaic is created. When a + mosaic is created with TRACK=TRUE, all subsequent runs will default to TRACK=TRUE. + When a mosaic is created with TRACK=FALSE, an error will be encountered if subsequent + runs have TRACK=TRUE. The tracking cube will always be of type unsigned integer. + Depending on the bit-type of the mosaic cube and/or the number of bands it contains, + the tracking cube may be as much as four times the size of the mosaic cube itself.
WARNING:
- If Tracking is turned on in a mosaic, any subsequent applications that modify "dn"
- values will corrupt the track-band, for instance the application
- The output mosaic shows the result of the second input image being mosaiced with the + The output mosaic shows the result of the second input image being mosaicked with the first input image. You can see in band one that none of the special pixels were retained because none of the special pixel flags were set. In other words, regardless of whether there was a valid comparison at that pixel of the priority band, all other bands will @@ -959,7 +996,7 @@
In band two, you can still see where the special pixels were in the second input image. The second image would have been "on top" because in band two, the pixels are less than - those of the mosaic. However, the valid data in the mosaic was left alone because the + those of the mosaic. However, the valid data in the mosaic was disregarded because the special pixel flags were not set. You cannot see the special pixels from the first image because the valid pixels from the second image were kept instead.
diff --git a/isis/src/base/apps/automos/automos.cpp b/isis/src/base/apps/automos/main.cpp similarity index 100% rename from isis/src/base/apps/automos/automos.cpp rename to isis/src/base/apps/automos/main.cpp diff --git a/isis/src/base/apps/autoregtemplate/autoregtemplate.cpp b/isis/src/base/apps/autoregtemplate/main.cpp similarity index 100% rename from isis/src/base/apps/autoregtemplate/autoregtemplate.cpp rename to isis/src/base/apps/autoregtemplate/main.cpp diff --git a/isis/src/base/apps/bandnorm/bandnorm.cpp b/isis/src/base/apps/bandnorm/main.cpp similarity index 100% rename from isis/src/base/apps/bandnorm/bandnorm.cpp rename to isis/src/base/apps/bandnorm/main.cpp diff --git a/isis/src/base/apps/bandtrim/bandtrim.cpp b/isis/src/base/apps/bandtrim/main.cpp similarity index 100% rename from isis/src/base/apps/bandtrim/bandtrim.cpp rename to isis/src/base/apps/bandtrim/main.cpp diff --git a/isis/src/base/apps/barscale/barscale.cpp b/isis/src/base/apps/barscale/main.cpp similarity index 100% rename from isis/src/base/apps/barscale/barscale.cpp rename to isis/src/base/apps/barscale/main.cpp diff --git a/isis/src/base/apps/bit2bit/bit2bit.cpp b/isis/src/base/apps/bit2bit/main.cpp similarity index 100% rename from isis/src/base/apps/bit2bit/bit2bit.cpp rename to isis/src/base/apps/bit2bit/main.cpp diff --git a/isis/src/base/apps/blend/blend.cpp b/isis/src/base/apps/blend/main.cpp similarity index 100% rename from isis/src/base/apps/blend/blend.cpp rename to isis/src/base/apps/blend/main.cpp diff --git a/isis/src/base/apps/butterworth/butterworth.cpp b/isis/src/base/apps/butterworth/main.cpp similarity index 100% rename from isis/src/base/apps/butterworth/butterworth.cpp rename to isis/src/base/apps/butterworth/main.cpp diff --git a/isis/src/base/apps/cam2cam/cam2cam.cpp b/isis/src/base/apps/cam2cam/main.cpp similarity index 100% rename from isis/src/base/apps/cam2cam/cam2cam.cpp rename to isis/src/base/apps/cam2cam/main.cpp diff --git a/isis/src/base/apps/cam2map/cam2map.cpp b/isis/src/base/apps/cam2map/main.cpp similarity index 100% rename from isis/src/base/apps/cam2map/cam2map.cpp rename to isis/src/base/apps/cam2map/main.cpp diff --git a/isis/src/base/apps/cam2map/tsts/targCodeFromNaifKeywordsObj/Makefile b/isis/src/base/apps/cam2map/tsts/targCodeFromNaifKeywordsObj/Makefile deleted file mode 100644 index 068d99b44ba1e240065544d1133817a762895a23..0000000000000000000000000000000000000000 --- a/isis/src/base/apps/cam2map/tsts/targCodeFromNaifKeywordsObj/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -APPNAME = cam2map - -cam2mapTruth.cub.TOLERANCE = .000001 -cam2mapCheckRange.cub.TOLERANCE = .000001 - -include $(ISISROOT)/make/isismake.tsts - -commands: - $(APPNAME) from=$(INPUT)/test.cub \ - to=$(OUTPUT)/cam2mapTruth.cub \ - map=$(INPUT)/test.map \ - lonseam=continue \ - pixres=map \ - >& /dev/null; - catlab from=$(OUTPUT)/cam2mapTruth.cub \ - to=$(OUTPUT)/cubeLabel.pvl \ - >& /dev/null; diff --git a/isis/src/base/apps/caminfo/caminfo.cpp b/isis/src/base/apps/caminfo/main.cpp similarity index 100% rename from isis/src/base/apps/caminfo/caminfo.cpp rename to isis/src/base/apps/caminfo/main.cpp diff --git a/isis/src/base/apps/campt/campt.cpp b/isis/src/base/apps/campt/main.cpp similarity index 100% rename from isis/src/base/apps/campt/campt.cpp rename to isis/src/base/apps/campt/main.cpp diff --git a/isis/src/base/apps/camrange/camrange.cpp b/isis/src/base/apps/camrange/main.cpp similarity index 100% rename from isis/src/base/apps/camrange/camrange.cpp rename to isis/src/base/apps/camrange/main.cpp diff --git a/isis/src/base/apps/camstats/camstats.cpp b/isis/src/base/apps/camstats/main.cpp similarity index 100% rename from isis/src/base/apps/camstats/camstats.cpp rename to isis/src/base/apps/camstats/main.cpp diff --git a/isis/src/base/apps/camtrim/camtrim.cpp b/isis/src/base/apps/camtrim/main.cpp similarity index 100% rename from isis/src/base/apps/camtrim/camtrim.cpp rename to isis/src/base/apps/camtrim/main.cpp diff --git a/isis/src/base/apps/cathist/cathist.cpp b/isis/src/base/apps/cathist/main.cpp similarity index 100% rename from isis/src/base/apps/cathist/cathist.cpp rename to isis/src/base/apps/cathist/main.cpp diff --git a/isis/src/base/apps/catlab/catlab.cpp b/isis/src/base/apps/catlab/main.cpp similarity index 100% rename from isis/src/base/apps/catlab/catlab.cpp rename to isis/src/base/apps/catlab/main.cpp diff --git a/isis/src/base/apps/catoriglab/catoriglab.cpp b/isis/src/base/apps/catoriglab/main.cpp similarity index 100% rename from isis/src/base/apps/catoriglab/catoriglab.cpp rename to isis/src/base/apps/catoriglab/main.cpp diff --git a/isis/src/base/apps/catoriglab/tsts/XmlLabel/Makefile b/isis/src/base/apps/catoriglab/tsts/XmlLabel/Makefile index 8c7d14ac85ca530f6cb0b8c8b5bd904ea877628f..13d8c87d2d7568c3bbcc10988c469a29ea912bad 100644 --- a/isis/src/base/apps/catoriglab/tsts/XmlLabel/Makefile +++ b/isis/src/base/apps/catoriglab/tsts/XmlLabel/Makefile @@ -1,21 +1,7 @@ APPNAME = catoriglab -# history 2018-09-05 Kristin Berry - Added code to strip out XML attributes from test, since their order can chage. include $(ISISROOT)/make/isismake.tsts commands: - $(APPNAME) from=$(INPUT)/tgoCaSSISImage.cub \ - APPEND=false TO=$(OUTPUT)/XmlLabelTemp.txt > /dev/null; - $(SED) 's+\FSW_HEADER.*>+\FSW_HEADER>+' \ - $(OUTPUT)/XmlLabelTemp.txt \ - > $(OUTPUT)/tempLabel1.txt; - $(SED) 's+\PEHK_HEADER.*>+\PEHK_HEADER>+' \ - $(OUTPUT)/tempLabel1.txt \ - > $(OUTPUT)/tempLabel2.txt; - $(SED) 's+\Science_Facets.*>+\Science_Facets>+' \ - $(OUTPUT)/tempLabel2.txt \ - > $(OUTPUT)/XmlLabel.txt; - $(RM) $(OUTPUT)/XmlLabelTemp.txt; - $(RM) $(OUTPUT)/tempLabel1.txt; - $(RM) $(OUTPUT)/tempLabel2.txt; - + $(APPNAME) from= $(INPUT)/tgoCaSSISImage.cub \ + APPEND= false TO= $(OUTPUT)/XmlLabel.txt > /dev/null; diff --git a/isis/src/base/apps/center/center.cpp b/isis/src/base/apps/center/main.cpp similarity index 100% rename from isis/src/base/apps/center/center.cpp rename to isis/src/base/apps/center/main.cpp diff --git a/isis/src/base/apps/circle/circle.cpp b/isis/src/base/apps/circle/main.cpp similarity index 100% rename from isis/src/base/apps/circle/circle.cpp rename to isis/src/base/apps/circle/main.cpp diff --git a/isis/src/base/apps/ckwriter/CkKernelWriter.cpp b/isis/src/base/apps/ckwriter/CkKernelWriter.cpp index 8ebb9c3124ef26385b6ef34942cf7cde27f73f37..5057893df07904312967721568fe82847b3a528a 100644 --- a/isis/src/base/apps/ckwriter/CkKernelWriter.cpp +++ b/isis/src/base/apps/ckwriter/CkKernelWriter.cpp @@ -37,7 +37,7 @@ #include "IString.h" #include "NaifStatus.h" #include "Pvl.h" -#include "SpiceSegment.h" +#include "CkSpiceSegment.h" #include "TextFile.h" using namespace std; @@ -105,7 +105,7 @@ namespace Isis { return; } - void CkKernelWriter::write(const SpiceSegment &segment) const { + void CkKernelWriter::write(const CkSpiceSegment &segment) const { switch ( _ckType ) { case 1: writeCk1(segment); @@ -175,10 +175,10 @@ namespace Isis { return; } - void CkKernelWriter::writeCk1(const SpiceSegment &segment) const { + void CkKernelWriter::writeCk1(const CkSpiceSegment &segment) const { - const SpiceSegment::SVector &sclks = segment.SCLKTimes(); - const SpiceSegment::SMatrix &quats = segment.Quaternions(); + const CkSpiceSegment::SVector &sclks = segment.SCLKTimes(); + const CkSpiceSegment::SMatrix &quats = segment.Quaternions(); ConstSpiceDouble *avvs(0); SpiceBoolean hasAvvs(SPICEFALSE); if ( segment.hasAngularVelocities() ) { @@ -198,28 +198,28 @@ namespace Isis { return; } - void CkKernelWriter::writeCk2(const SpiceSegment &segment) const { + void CkKernelWriter::writeCk2(const CkSpiceSegment &segment) const { if ( !segment.hasAngularVelocities() ) { QString mess = "Type 2 CK kernels require angular velocities"; throw IException(IException::User, mess, _FILEINFO_); } - const SpiceSegment::SVector &sclks = segment.SCLKTimes(); - const SpiceSegment::SMatrix &quats = segment.Quaternions(); - const SpiceSegment::SMatrix &avvs = segment.AngularVelocities(); + const CkSpiceSegment::SVector &sclks = segment.SCLKTimes(); + const CkSpiceSegment::SMatrix &quats = segment.Quaternions(); + const CkSpiceSegment::SMatrix &avvs = segment.AngularVelocities(); QString refFrame = segment.ReferenceFrame(); QString segId = segment.Id(); int nrecs = segment.size(); - SpiceSegment::SVector stops(nrecs); + CkSpiceSegment::SVector stops(nrecs); for ( int i = 0 ; i < nrecs-1 ; i++) { stops[i] = sclks[i+1]; } stops[nrecs-1] = sclks[nrecs-1]; - SpiceSegment::SVector rates(nrecs, segment.TickRate()); + CkSpiceSegment::SVector rates(nrecs, segment.TickRate()); NaifStatus::CheckErrors(); ckw02_c(_handle, sclks[0], sclks[nrecs-1], segment.InstCode(), refFrame.toLatin1().data(), segId.toLatin1().data(), nrecs, &sclks[0], @@ -229,10 +229,10 @@ namespace Isis { } - void CkKernelWriter::writeCk3(const SpiceSegment &segment) const { + void CkKernelWriter::writeCk3(const CkSpiceSegment &segment) const { - const SpiceSegment::SVector &sclks = segment.SCLKTimes(); - const SpiceSegment::SMatrix &quats = segment.Quaternions(); + const CkSpiceSegment::SVector &sclks = segment.SCLKTimes(); + const CkSpiceSegment::SMatrix &quats = segment.Quaternions(); ConstSpiceDouble *avvs(0); SpiceBoolean hasAvvs(SPICEFALSE); if ( segment.hasAngularVelocities() ) { @@ -257,5 +257,3 @@ namespace Isis { }; // namespace Isis - - diff --git a/isis/src/base/apps/ckwriter/CkKernelWriter.h b/isis/src/base/apps/ckwriter/CkKernelWriter.h index 1d2ede9103d71f0cfa82f1bd5ebebaf6cc36bb0c..c1c492244b886cf7aa14f49327e8b17545228e32 100644 --- a/isis/src/base/apps/ckwriter/CkKernelWriter.h +++ b/isis/src/base/apps/ckwriter/CkKernelWriter.h @@ -1,67 +1,67 @@ #ifndef CkKernelWriter_h #define CkKernelWriter_h -/** - * @file - * $Revision$ +/** + * @file + * $Revision$ * $Date$ - * - * 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 + * + * 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. - * + * * $Id$ - */ + */ #include@@ -36,7 +36,7 @@
MATCHDEM = FALSE, the default does not check the SHAPEMODEL keyword of the input cube - files and does not propogate what DEM Shapemodel that was used when the input files were + files and does not propagate what DEM Shapemodel that was used when the input files were projected.
@@ -47,19 +47,43 @@ options is explained in the tables and descriptions below.
- The Track feature creates a band in the output mosaic file containing the index - values for every pixel in the output mosaic.The Track-band can only be used appropriately through - the QVIEW-AdvancedTracking tool. As the user interactively pans across the displayed - mosaic band (Band1), for every mosaic pixel location QVIEW-AdvancedTracking will report - the source cube filename that was input to automos. The Track-band cannot be used outside - the QVIEW-AdvancedTracking tool. Hence the file (byte) size of the mosaic is increased due to - the track-band. + The TRACK feature creates a separate tracking cube in addition to the mosaic cube, and + contains information for the source files of every pixel within the output mosaic. + This cube will have the same base-name as the mosaic cube, but will end in + "_tracking.cub". The tracking cube must always reside in the same directory as the + mosaic cube to be properly accessed; this means that if the mosaic cube is copied or + moved, then its associated tracking cube must be copied or moved to the same location. + The tracking cube will always be of type unsigned integer. Depending on the + bit-type of the mosaic cube and/or the number of bands it contains, the tracking cube + may be as much as four times the size of the mosaic cube itself.
- The Track feature works with Priority options ONTOP (with HIGHSATURATION and - LOWSATURATION parameters) and BENEATH for single band input cubes. It does NOT support - multiple band input cubes with these priority options. It does work for multiband cubes - when PRIORITY=BAND. Furthermore, this feature is NOT supported when PRIORITY=AVERAGE. + The tracking cube can be used appropriately through the QVIEW-AdvancedTracking + tool. As the user pans across the displayed mosaic, for every mosaic pixel location, + QVIEW-AdvancedTracking will interactively report the index, the filename and the + serial number of the input cube that was input to handmos for that specific pixel + location. Since the tracking cube is of bit-type unsigned integer, the DN values of + 0, 1 and 2 are reserved for NULL, LRS and LIS, respectively, so valid pixel DN values + will begin at an offset of 3. In other words, a pixel of DN value 3 in the tracking + cube means that this same pixel within the mosaic was taken from the first input + image. The tracking cube cannot be used outside of the QVIEW-AdvancedTracking tool + except as a visual representation of the source cubes for the different pixels. +
++ The TRACK feature works with Priority options ONTOP and BENEATH for single band input + cubes. It works for multiband cubes for PRIORITY=ONTOP only when the NULL, + HIGHSATURATION and LOWSATURATION options are set to true. It also works for multiband + cubes when PRIORITY=BAND. Furthermore, this feature is NOT supported when + PRIORITY=AVERAGE. +
+
+ Please Note: Prior to ISIS version 3.6.0, tracking for the various mosaicking apllications
+ was being handled with an internal tracking band. Tracking is now being handled by an
+ external tracking cube that contains the associated tracking information. This application
+ can no longer add to mosaics of the old format. In order to continue to use these
+ older mosaics with the updated mosaicking applications, you must first use the
+
@@ -76,8 +100,17 @@
current input image will appear in the output mosaic (it replaces the output mosaic
pixel). Invalid input
+ NOTE: When using this priority with multi-band mosaics and with the TRACK + option set, all Special Pixel flags must be set as well. This is because the same + pixel within different bands of a single input image may hold both Valid and Special + Pixel values, and since our Tracking capabilities can only track one input image per + pixel (as it is a single band), it must accept the values for that particular pixel + from every band in the input image being placed on top. +