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/cam2cam/cam2cam.cpp b/isis/src/base/apps/cam2cam/cam2cam.cpp index ce6be30660cc5062b805382a3648eece39a47279..5ad273102e3e79a43cee0f85cf611cd07ea837d4 100644 --- a/isis/src/base/apps/cam2cam/cam2cam.cpp +++ b/isis/src/base/apps/cam2cam/cam2cam.cpp @@ -1,6 +1,7 @@ #include "Isis.h" #include "CameraFactory.h" #include "Camera.h" +#include "Distance.h" #include "ProcessRubberSheet.h" #include "IException.h" #include "cam2cam.h" @@ -118,7 +119,13 @@ bool cam2cam::Xform(double &inSample, double &inLine, // Get the universal lat/lon and see if it can be converted to input line/samp double lat = p_outcam->UniversalLatitude(); double lon = p_outcam->UniversalLongitude(); - if(!p_incam->SetUniversalGround(lat, lon)) return false; + Distance rad = p_outcam->LocalRadius(); + if (rad.isValid()) { + if(!p_incam->SetUniversalGround(lat, lon, rad.meters())) return false; + } + else { + if(!p_incam->SetUniversalGround(lat, lon)) return false; + } // Make sure the point is inside the input image if(p_incam->Sample() < 0.5) return false; diff --git a/isis/src/base/apps/cam2cam/cam2cam.xml b/isis/src/base/apps/cam2cam/cam2cam.xml index 9700441f44b5f2bd92ee6fdc0079b55d882373f5..469b534622d2cb46028a7e55762504e411c4cdbb 100644 --- a/isis/src/base/apps/cam2cam/cam2cam.xml +++ b/isis/src/base/apps/cam2cam/cam2cam.xml @@ -6,7 +6,7 @@
- Campt computes geometric and photometric information at a given pixel
- location or list of pixel locations in the input image
Note the input image cube has preliminary requirements: @@ -26,42 +26,42 @@ xsi:noNamespaceSchemaLocation=
The point of interest in the image can be entered as
+
The following is a partial list of coordinates computed in the campt application:
- Geometric Information:
- Photometric Information:
- In addition, this application will return a list of other spacecraft,
- sun and instrument-related information including but not limited to
-
- You may choose the format of the output file. The option list includes
- a choice of a
+ You may choose the format of the output file. The option list includes
+ a choice of a
Group = GroundPoint
Filename = /usgs/cpkgs/isis3/data/mgs/testData/ab102401.cub
@@ -115,10 +115,10 @@ Group = GroundPoint
Error = NULL
End_Group
-
+
Note: The "Error" keyword will only appear when using a coordinate list. The value of - "Error" will be NULL unless an error occurs during the processing of a coordinate in the + "Error" will be NULL unless an error occurs during the processing of a coordinate in the coordinate list. Then, the value of this keyword will be the error message.
@@ -151,19 +151,19 @@ End_Group Added additional output- Note that this parameter is optional when running campt on the + Note that this parameter is optional when running campt on the command line.
Expected order for image coordinates: sample, line
@@ -294,14 +297,14 @@ End_Group
The "Error" keyword will only appear when using a coordinate list. The value of "Error" - will then be NULL unless an error occurs during the processing of a coordinate in the + will then be NULL unless an error occurs during the processing of a coordinate in the coordinate list. Then, the value of this keyword will be the error message. This allows for campt to continue processing the remaining coordinates in the coordinate list. -
+
- For the input of Latitude and Longitude, campt expects
-
Refer to
- Refer to
- This parameter provides two different methods to compute the - output radius value for a given latitude, longitude map grid + This parameter provides two different methods to compute the + output radius value for a given latitude, longitude map grid point.
/ x^2+y^2 \
- | ----------- |
G(x,y) = 1 \ 2(STDDEV)^2 /
- --------------- e^
- 2(pi)(STDDEV)^2
+ --------------- e^
+ 2(pi)(STDDEV)^2
This formula creates a kernel that then runs through the image. The center of
the kernel is at (0,0). This means that a 3x3 boxcar will be of the form
- The kernel coordinates
+ The kernel coordinates
(-2,-2) (-1,-2) (0,-2) (1,-2) (2,-2)
- (-2,-1) (-1,-1) (0,-1) (1,-1) (2,-1)
- (-2, 0) (-1, 0) (0, 0) (1, 0) (2, 0)
+ (-2,-1) (-1,-1) (0,-1) (1,-1) (2,-1)
+ (-2, 0) (-1, 0) (0, 0) (1, 0) (2, 0)
(-2, 1) (-1, 1) (0, 1) (1, 1) (2, 1)
(-2, 2) (-1, 2) (0, 2) (1, 2) (2, 2)
-
+
The kernel values (approx)
1 4 7 4 1
4 16 26 16 4
7 26 41 26 7 x 1/273
4 16 26 16 4
- 1 4 7 4 1
-
+ 1 4 7 4 1
+
@@ -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. +