Commit d7de0c4a authored May 31, 2019 by Kristin Committed by Summer Stapleton May 31, 2019

Add Kaguya TC support to ISIS (#3240)

* Added base for KaguyaTcCamera

* Still adding to base

* additonal changes

* Added appropriate ckframeid

* Fixed improper makefile

* Added unitTest.cpp to KaguyaTcCamera

* Adding camera plugin and test.

* Update camera plugin.

* Added working unit test. Added naif ck ID to ingestion.

* Changed camera parent class to LineScanCamera

* Add a Distortion Model to Kaguya TC ISIS camera model (#3215)

* Initial distortion model changes

* Distortion model updates to actually match equation in documentation

* Update truthdata for sensor model

* Update Kaguya TC Camera model to use LineScan Camera detector map (#3218)

* Initial distortion model changes

* Distortion model updates to actually match equation in documentation

* Update truthdata for sensor model

* Switch Kaguya TC to use L/S camera detector map. It is not a framer!

* Fix typo

* Fixes GroundMap, SkyMap in Kaguya TC Camera Model and improve Focal Map Origin (#3220)

* Initial distortion model changes

* Distortion model updates to actually match equation in documentation

* Update truthdata for sensor model

* Switch Kaguya TC to use L/S camera detector map. It is not a framer!

* Fix typo

* Update detector origin in Kaguya TC model to be more reasonable

* Update Kaguya TC Camera Model to include Detector offsets for swath modes (#3222)

* Initial distortion model changes

* Distortion model updates to actually match equation in documentation

* Update truthdata for sensor model

* Switch Kaguya TC to use L/S camera detector map. It is not a framer!

* Fix typo

* Update detector origin in Kaguya TC model to be more reasonable

* Update to center position and offsets for distortion map swath modes added to Kaguya TC Camera Model

* Change camera model to pull the Origin from the IAK

* Update Kaguya TC camera model time and add option to Spice::getClockTime (#3237)

* Added gtests for Displacement.cpp, removed Displacement unitTest and truthfile. (#3209)

* Added BasisFunctionTests.cpp. Removed BasisFunction unit test and truthfile.

* changed expectedOutput values for some of the tests

* Made tests for Displacement.cpp using gtest. removed Displacement unitTest and truthfile.

* Initial distortion model changes

* Updated README data area instructions (#3214)

* Fixed data area instructions in README and some links

* Fixed bold in block quote

* Fixed legacy install guide link

* extra l

* Testing indentation list

* Testing indentation list again

* Testing indentation list code snippet

* Minor wording clean up

* Removed extra number

* Removed duplicate Mars Odyssey entry

* Distortion model updates to actually match equation in documentation

* Update truthdata for sensor model

* Updates to the build recipe for ISIS releases for the 3.7.0 release candidate. (#3205)

* Minor modifications for RC build

* Small modification to version in the recipe/meta.yaml

* Updating release stage in isis/version

* Switch Kaguya TC to use L/S camera detector map. It is not a framer!

* Fix typo

* Update detector origin in Kaguya TC model to be more reasonable

* Update to center position and offsets for distortion map swath modes added to Kaguya TC Camera Model

* Added Area3DTests.cpp (#3216)

* Added BasisFunctionTests.cpp. Removed BasisFunction unit test and truthfile.

* changed expectedOutput values for some of the tests

* Made tests for Displacement.cpp using gtest. removed Displacement unitTest and truthfile.

* Added Area3DTests.cpp, removed Area3D truthfile and unit test.

* included TestUtilities.h for use with exception testing, added a test for teh Area3D '=' operator

* changed formatting to adhere to USGS coding standards

* re-addedd the unit test and truth file

* gllssi2isis Original Label Fix (#3226)

* Allowed writting of residuals when value is zero to controlnet pvl

* Updated ControlNetVersioner unit test

* Fixed pvl labels original pvl labels not being written to the resulting cube.

* Updated docstrings and history for updated methods

* Removed the need to set the output cube pixel type

* Reverted proceeimport changes

* Set the dimensions in the process before processing

* Added missing 1 in a history record

* Reverted and applied a more appropriate fix

* Used outfile obtained at the beginning of the program

* Added history comment to app xml

* Removed accidental comma (#3230)

* Update README.md (#3232)

Update readability

* Updated the time used by the camera model to use the clock count, rather than the start time

* Modifying files for conda build for ISIS3.7.0_RC2 (#3229)

* Modifying files for conda build for ISIS3.7.0_RC_2

* Changes to modifications until issue #3231 can be completed

* Small typo

* One final added comment for clarification

* Update unit test for Kaguya TC to match output of updated camera model

* Update unit test for Kaguya TC to match output of updated camera model (#3241)

* Merge dev info kaguyatc (#3243)

* Added gtests for Displacement.cpp, removed Displacement unitTest and truthfile. (#3209)

* Added BasisFunctionTests.cpp. Removed BasisFunction unit test and truthfile.

* changed expectedOutput values for some of the tests

* Made tests for Displacement.cpp using gtest. removed Displacement unitTest and truthfile.

* Updated README data area instructions (#3214)

* Fixed data area instructions in README and some links

* Fixed bold in block quote

* Fixed legacy install guide link

* extra l

* Testing indentation list

* Testing indentation list again

* Testing indentation list code snippet

* Minor wording clean up

* Removed extra number

* Removed duplicate Mars Odyssey entry

* Updates to the build recipe for ISIS releases for the 3.7.0 release candidate. (#3205)

* Minor modifications for RC build

* Small modification to version in the recipe/meta.yaml

* Updating release stage in isis/version

* Added Area3DTests.cpp (#3216)

* Added BasisFunctionTests.cpp. Removed BasisFunction unit test and truthfile.

* changed expectedOutput values for some of the tests

* Made tests for Displacement.cpp using gtest. removed Displacement unitTest and truthfile.

* Added Area3DTests.cpp, removed Area3D truthfile and unit test.

* included TestUtilities.h for use with exception testing, added a test for teh Area3D '=' operator

* changed formatting to adhere to USGS coding standards

* re-addedd the unit test and truth file

* gllssi2isis Original Label Fix (#3226)

* Allowed writting of residuals when value is zero to controlnet pvl

* Updated ControlNetVersioner unit test

* Fixed pvl labels original pvl labels not being written to the resulting cube.

* Updated docstrings and history for updated methods

* Removed the need to set the output cube pixel type

* Reverted proceeimport changes

* Set the dimensions in the process before processing

* Added missing 1 in a history record

* Reverted and applied a more appropriate fix

* Used outfile obtained at the beginning of the program

* Added history comment to app xml

* Removed accidental comma (#3230)

* Update README.md (#3232)

Update readability

* Modifying files for conda build for ISIS3.7.0_RC2 (#3229)

* Modifying files for conda build for ISIS3.7.0_RC_2

* Changes to modifications until issue #3231 can be completed

* Small typo

* One final added comment for clarification

* Update kaguyatc branch from dev (#3245)

* Updated truthdata for ProcessExportPds4 class to match updates made for CaSSIS sprint

* Fix trailing Z time-format in tgocassis2isis when reingesting images exported from ISIS3

* Added gtests for Displacement.cpp, removed Displacement unitTest and truthfile. (#3209)

* Added BasisFunctionTests.cpp. Removed BasisFunction unit test and truthfile.

* changed expectedOutput values for some of the tests

* Made tests for Displacement.cpp using gtest. removed Displacement unitTest and truthfile.

* Updated README data area instructions (#3214)

* Fixed data area instructions in README and some links

* Fixed bold in block quote

* Fixed legacy install guide link

* extra l

* Testing indentation list

* Testing indentation list again

* Testing indentation list code snippet

* Minor wording clean up

* Removed extra number

* Removed duplicate Mars Odyssey entry

* Updates to the build recipe for ISIS releases for the 3.7.0 release candidate. (#3205)

* Minor modifications for RC build

* Small modification to version in the recipe/meta.yaml

* Updating release stage in isis/version

* Added Area3DTests.cpp (#3216)

* Added BasisFunctionTests.cpp. Removed BasisFunction unit test and truthfile.

* changed expectedOutput values for some of the tests

* Made tests for Displacement.cpp using gtest. removed Displacement unitTest and truthfile.

* Added Area3DTests.cpp, removed Area3D truthfile and unit test.

* included TestUtilities.h for use with exception testing, added a test for teh Area3D '=' operator

* changed formatting to adhere to USGS coding standards

* re-addedd the unit test and truth file

* gllssi2isis Original Label Fix (#3226)

* Allowed writting of residuals when value is zero to controlnet pvl

* Updated ControlNetVersioner unit test

* Fixed pvl labels original pvl labels not being written to the resulting cube.

* Updated docstrings and history for updated methods

* Removed the need to set the output cube pixel type

* Reverted proceeimport changes

* Set the dimensions in the process before processing

* Added missing 1 in a history record

* Reverted and applied a more appropriate fix

* Used outfile obtained at the beginning of the program

* Added history comment to app xml

* Removed accidental comma (#3230)

* Update README.md (#3232)

Update readability

* Modifying files for conda build for ISIS3.7.0_RC2 (#3229)

* Modifying files for conda build for ISIS3.7.0_RC_2

* Changes to modifications until issue #3231 can be completed

* Small typo

* One final added comment for clarification

* Adding tab completion for tcsh on conda activation (#3244)

* Added base for KaguyaTcCamera

* Still adding to base

* additonal changes

* Added appropriate ckframeid

* Fixed improper makefile

* Added unitTest.cpp to KaguyaTcCamera

* Adding camera plugin and test.

* Update camera plugin.

* Added working unit test. Added naif ck ID to ingestion.

* Changed camera parent class to LineScanCamera

* Add a Distortion Model to Kaguya TC ISIS camera model (#3215)

* Initial distortion model changes

* Distortion model updates to actually match equation in documentation

* Update truthdata for sensor model

* Update Kaguya TC Camera model to use LineScan Camera detector map (#3218)

* Initial distortion model changes

* Distortion model updates to actually match equation in documentation

* Update truthdata for sensor model

* Switch Kaguya TC to use L/S camera detector map. It is not a framer!

* Fix typo

* Fixes GroundMap, SkyMap in Kaguya TC Camera Model and improve Focal Map Origin (#3220)

* Initial distortion model changes

* Distortion model updates to actually match equation in documentation

* Update truthdata for sensor model

* Switch Kaguya TC to use L/S camera detector map. It is not a framer!

* Fix typo

* Update detector origin in Kaguya TC model to be more reasonable

* Update Kaguya TC Camera Model to include Detector offsets for swath modes (#3222)

* Initial distortion model changes

* Distortion model updates to actually match equation in documentation

* Update truthdata for sensor model

* Switch Kaguya TC to use L/S camera detector map. It is not a framer!

* Fix typo

* Update detector origin in Kaguya TC model to be more reasonable

* Update to center position and offsets for distortion map swath modes added to Kaguya TC Camera Model

* Change camera model to pull the Origin from the IAK

* Update Kaguya TC camera model time and add option to Spice::getClockTime (#3237)

* Added gtests for Displacement.cpp, removed Displacement unitTest and truthfile. (#3209)

* Added BasisFunctionTests.cpp. Removed BasisFunction unit test and truthfile.

* changed expectedOutput values for some of the tests

* Made tests for Displacement.cpp using gtest. removed Displacement unitTest and truthfile.

* Initial distortion model changes

* Updated README data area instructions (#3214)

* Fixed data area instructions in README and some links

* Fixed bold in block quote

* Fixed legacy install guide link

* extra l

* Testing indentation list

* Testing indentation list again

* Testing indentation list code snippet

* Minor wording clean up

* Removed extra number

* Removed duplicate Mars Odyssey entry

* Distortion model updates to actually match equation in documentation

* Update truthdata for sensor model

* Updates to the build recipe for ISIS releases for the 3.7.0 release candidate. (#3205)

* Minor modifications for RC build

* Small modification to version in the recipe/meta.yaml

* Updating release stage in isis/version

* Switch Kaguya TC to use L/S camera detector map. It is not a framer!

* Fix typo

* Update detector origin in Kaguya TC model to be more reasonable

* Update to center position and offsets for distortion map swath modes added to Kaguya TC Camera Model

* Added Area3DTests.cpp (#3216)

* Added BasisFunctionTests.cpp. Removed BasisFunction unit test and truthfile.

* changed expectedOutput values for some of the tests

* Made tests for Displacement.cpp using gtest. removed Displacement unitTest and truthfile.

* Added Area3DTests.cpp, removed Area3D truthfile and unit test.

* included TestUtilities.h for use with exception testing, added a test for teh Area3D '=' operator

* changed formatting to adhere to USGS coding standards

* re-addedd the unit test and truth file

* gllssi2isis Original Label Fix (#3226)

* Allowed writting of residuals when value is zero to controlnet pvl

* Updated ControlNetVersioner unit test

* Fixed pvl labels original pvl labels not being written to the resulting cube.

* Updated docstrings and history for updated methods

* Removed the need to set the output cube pixel type

* Reverted proceeimport changes

* Set the dimensions in the process before processing

* Added missing 1 in a history record

* Reverted and applied a more appropriate fix

* Used outfile obtained at the beginning of the program

* Added history comment to app xml

* Removed accidental comma (#3230)

* Update README.md (#3232)

Update readability

* Updated the time used by the camera model to use the clock count, rather than the start time

* Modifying files for conda build for ISIS3.7.0_RC2 (#3229)

* Modifying files for conda build for ISIS3.7.0_RC_2

* Changes to modifications until issue #3231 can be completed

* Small typo

* One final added comment for clarification

* Update unit test for Kaguya TC to match output of updated camera model

* Moddified description (#3246)

* updates for review comments (#3277)

* Updated truthdata for ProcessExportPds4 class to match updates made for CaSSIS sprint

* Fix trailing Z time-format in tgocassis2isis when reingesting images exported from ISIS3

* Added base for KaguyaTcCamera

* Still adding to base

* additonal changes

* Added appropriate ckframeid

* Fixed improper makefile

* Added unitTest.cpp to KaguyaTcCamera

* Adding camera plugin and test.

* Update camera plugin.

* Added working unit test. Added naif ck ID to ingestion.

* Changed camera parent class to LineScanCamera

* Add a Distortion Model to Kaguya TC ISIS camera model (#3215)

* Initial distortion model changes

* Distortion model updates to actually match equation in documentation

* Update truthdata for sensor model

* Update Kaguya TC Camera model to use LineScan Camera detector map (#3218)

* Initial distortion model changes

* Distortion model updates to actually match equation in documentation

* Update truthdata for sensor model

* Switch Kaguya TC to use L/S camera detector map. It is not a framer!

* Fix typo

* Fixes GroundMap, SkyMap in Kaguya TC Camera Model and improve Focal Map Origin (#3220)

* Initial distortion model changes

* Distortion model updates to actually match equation in documentation

* Update truthdata for sensor model

* Switch Kaguya TC to use L/S camera detector map. It is not a framer!

* Fix typo

* Update detector origin in Kaguya TC model to be more reasonable

* Update Kaguya TC Camera Model to include Detector offsets for swath modes (#3222)

* Initial distortion model changes

* Distortion model updates to actually match equation in documentation

* Update truthdata for sensor model

* Switch Kaguya TC to use L/S camera detector map. It is not a framer!

* Fix typo

* Update detector origin in Kaguya TC model to be more reasonable

* Update to center position and offsets for distortion map swath modes added to Kaguya TC Camera Model

* Change camera model to pull the Origin from the IAK

* Update Kaguya TC camera model time and add option to Spice::getClockTime (#3237)

* Added gtests for Displacement.cpp, removed Displacement unitTest and truthfile. (#3209)

* Added BasisFunctionTests.cpp. Removed BasisFunction unit test and truthfile.

* changed expectedOutput values for some of the tests

* Made tests for Displacement.cpp using gtest. removed Displacement unitTest and truthfile.

* Initial distortion model changes

* Updated README data area instructions (#3214)

* Fixed data area instructions in README and some links

* Fixed bold in block quote

* Fixed legacy install guide link

* extra l

* Testing indentation list

* Testing indentation list again

* Testing indentation list code snippet

* Minor wording clean up

* Removed extra number

* Removed duplicate Mars Odyssey entry

* Distortion model updates to actually match equation in documentation

* Update truthdata for sensor model

* Updates to the build recipe for ISIS releases for the 3.7.0 release candidate. (#3205)

* Minor modifications for RC build

* Small modification to version in the recipe/meta.yaml

* Updating release stage in isis/version

* Switch Kaguya TC to use L/S camera detector map. It is not a framer!

* Fix typo

* Update detector origin in Kaguya TC model to be more reasonable

* Update to center position and offsets for distortion map swath modes added to Kaguya TC Camera Model

* Added Area3DTests.cpp (#3216)

* Added BasisFunctionTests.cpp. Removed BasisFunction unit test and truthfile.

* changed expectedOutput values for some of the tests

* Made tests for Displacement.cpp using gtest. removed Displacement unitTest and truthfile.

* Added Area3DTests.cpp, removed Area3D truthfile and unit test.

* included TestUtilities.h for use with exception testing, added a test for teh Area3D '=' operator

* changed formatting to adhere to USGS coding standards

* re-addedd the unit test and truth file

* gllssi2isis Original Label Fix (#3226)

* Allowed writting of residuals when value is zero to controlnet pvl

* Updated ControlNetVersioner unit test

* Fixed pvl labels original pvl labels not being written to the resulting cube.

* Updated docstrings and history for updated methods

* Removed the need to set the output cube pixel type

* Reverted proceeimport changes

* Set the dimensions in the process before processing

* Added missing 1 in a history record

* Reverted and applied a more appropriate fix

* Used outfile obtained at the beginning of the program

* Added history comment to app xml

* Removed accidental comma (#3230)

* Update README.md (#3232)

Update readability

* Updated the time used by the camera model to use the clock count, rather than the start time

* Modifying files for conda build for ISIS3.7.0_RC2 (#3229)

* Modifying files for conda build for ISIS3.7.0_RC_2

* Changes to modifications until issue #3231 can be completed

* Small typo

* One final added comment for clarification

* Update unit test for Kaguya TC to match output of updated camera model

* Updates to Kaguya TC big PR based on comments

* Update kaguyatc2isis.xml

Replace tab with spaces.

* Fix spacing

* Updated comment for clarity

* Move comment

parent 23f993ea

isis/src/base/objs/Spice/Spice.cpp

+11 −3

Original line number	Diff line number	Diff line
		@@ -968,10 +968,13 @@ namespace Isis {
		/**
		* This converts the spacecraft clock ticks value (clockValue) to an iTime.
		*
		* If the clock ticks value is provided directly, rather than the spacecraft
		* clock string, set clockTicks=true.
		*
		* Use this when possible because naif calls (such as scs2e_c) cannot be
		* called when not using naif.
		*/
		iTime Spice::getClockTime(QString clockValue, int sclkCode) {
		iTime Spice::getClockTime(QString clockValue, int sclkCode, bool clockTicks) {
		if (sclkCode == -1) {
		sclkCode = naifSclkCode();
		}
		@@ -984,7 +987,12 @@ namespace Isis {
		if (storedClockTime.isNull()) {
		SpiceDouble timeOutput;
		NaifStatus::CheckErrors();
		if (clockTicks) {
		sct2e_c(sclkCode, (SpiceDouble) clockValue.toDouble(), &timeOutput);
		}
		else {
		scs2e_c(sclkCode, clockValue.toLatin1().data(), &timeOutput);
		}
		NaifStatus::CheckErrors();
		storedClockTime = timeOutput;
		storeResult(key, SpiceDoubleType, timeOutput);

isis/src/base/objs/Spice/Spice.h

+7 −1

Original line number	Diff line number	Diff line
		@@ -285,6 +285,11 @@ namespace Isis {
		* PCK to define the new body, including its body code. This PCK is only
		* loaded in spiceinit so the code needs to be saved so that the radii
		* keyword can be created to retrieve the target radii.
		* @history 2019-04-16 Kristin Berry - Added a parameter to getClockTime called clockTicks which
		* defaults to false. When set to true, this indicates that the input value
		* is in encoded clock ticks, rather than a full spacecraft clock time
		* string. As such, when used sct2e_c is used to convert to an ET rather
		* than scs2e_c.
		*/
		class Spice {
		public:
		@@ -320,7 +325,8 @@ namespace Isis {
		QString targetName() const;

		iTime getClockTime(QString clockValue,
		int sclkCode = -1);
		int sclkCode = -1,
		bool clockTicks=false);
		SpiceDouble getDouble(const QString &key, int index = 0);
		SpiceInt getInteger(const QString &key, int index = 0);
		QString getString(const QString &key, int index = 0);

isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.xml

+42 −38

Original line number	Diff line number	Diff line
		@@ -7,8 +7,9 @@
		</brief>

		<description>
		This program will import a Kaguya Terrain Camera (TC)
		file from a PDS3 formatted image to an ISIS3 formatted cube.
		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.
		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.
		@@ -34,6 +35,9 @@
		<change name="Jeannie Backer" date="2018-10-02">
		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.
		</change>
		</history>

		<category>
		@@ -54,7 +58,7 @@
		labels.
		</description>
		<filter>
		.img .IMG
		.img .IMG .lbl .LBL
		</filter>
		</parameter>

isis/src/kaguya/apps/kaguyatc2isis/main.cpp

+123 −1

Original line number	Diff line number	Diff line
		@@ -97,7 +97,6 @@ void IsisMain() {
		PvlToPvlTranslationManager archiveXlater(label, transFile.expanded());
		archiveXlater.Auto(otherLabels);

		// Create a Kernels group
		transFile = transDir + "kaguyaTcKernels.trn";
		PvlToPvlTranslationManager kernelsXlater(label, transFile.expanded());
		kernelsXlater.Auto(otherLabels);
		@@ -128,6 +127,129 @@ void IsisMain() {
		}
		}
		outcube->putGroup(otherLabels.findGroup("Instrument"));
		/*
		// This code is not needed now, but is included here commented-out in case it becomes necessary
		// to support the swath modes by setting their NaifFrameCodes in the future. The swath mode
		// setting is currently handled entirely via the camera model.

		// add kernels group
		QString instId = inst["InstrumentId"];
		QString encoding = inst["EncodingType"];
		QString swath = inst["SwathModeId"];
		PvlGroup kern("Kernels");
		if (instId == "TC1") {
		if (swath == "Full") {
		if (productSetId == "TC_w_Level2B0") {
		if (encoding == "DCT") {
		kern += PvlKeyword("NaifFrameCode", toString(-131352));
		}
		else { // encoding == "N/A" so no compression
		kern += PvlKeyword("NaifFrameCode", toString(-131353));
		}
		}
		else if (productSetId == "TC_s_Level2B0") {
		if (encoding == "DCT") {
		kern += PvlKeyword("NaifFrameCode", toString(-131354));
		}
		else { // encoding == "N/A" so no compression
		kern += PvlKeyword("NaifFrameCode", toString(-131355));
		}
		}
		}
		else if (swath == "Nominal") {
		if (productSetId == "TC_w_Level2B0") {
		if (encoding == "DCT") {
		kern += PvlKeyword("NaifFrameCode", toString(-131356));
		}
		else { // encoding == "N/A" so no compression
		kern += PvlKeyword("NaifFrameCode", toString(-131357));
		}
		}
		else if (productSetId == "TC_s_Level2B0") {
		if (encoding == "DCT") {
		kern += PvlKeyword("NaifFrameCode", toString(-131358));
		}
		else { // encoding == "N/A" so no compression
		kern += PvlKeyword("NaifFrameCode", toString(-131359));
		}
		}
		}
		else { // swath == "Half"
		if (productSetId == "TC_w_Level2B0") {
		if (encoding == "DCT") {
		kern += PvlKeyword("NaifFrameCode", toString(-131360));
		}
		else { // encoding == "N/A" so no compression
		kern += PvlKeyword("NaifFrameCode", toString(-131361));
		}
		}
		else if (productSetId == "TC_s_Level2B0") {
		if (encoding == "DCT") {
		kern += PvlKeyword("NaifFrameCode", toString(-131362));
		}
		else { // encoding == "N/A" so no compression
		kern += PvlKeyword("NaifFrameCode", toString(-131363));
		}
		}
		}
		}
		if (instId == "TC2") {
		if (swath == "Full") {
		if (productSetId == "TC_w_Level2B0") {
		if (encoding == "DCT") {
		kern += PvlKeyword("NaifFrameCode", toString(-131372));
		}
		else { // encoding == "N/A" so no compression
		kern += PvlKeyword("NaifFrameCode", toString(-131373));
		}
		}
		else if (productSetId == "TC_s_Level2B0") {
		if (encoding == "DCT") {
		kern += PvlKeyword("NaifFrameCode", toString(-131374));
		}
		else { // encoding == "N/A" so no compression
		kern += PvlKeyword("NaifFrameCode", toString(-131375));
		}
		}
		}
		else if (swath == "Nominal") {
		if (productSetId == "TC_w_Level2B0") {
		if (encoding == "DCT") {
		kern += PvlKeyword("NaifFrameCode", toString(-131376));
		}
		else { // encoding == "N/A" so no compression
		kern += PvlKeyword("NaifFrameCode", toString(-131377));
		}
		}
		else if (productSetId == "TC_s_Level2B0") {
		if (encoding == "DCT") {
		kern += PvlKeyword("NaifFrameCode", toString(-131378));
		}
		else { // encoding == "N/A" so no compression
		kern += PvlKeyword("NaifFrameCode", toString(-131379));
		}
		}
		}
		else { // swath == "Half"
		if (productSetId == "TC_w_Level2B0") {
		if (encoding == "DCT") {
		kern += PvlKeyword("NaifFrameCode", toString(-131380));
		}
		else { // encoding == "N/A" so no compression
		kern += PvlKeyword("NaifFrameCode", toString(-131381));
		}
		}
		else if (productSetId == "TC_s_Level2B0") {
		if (encoding == "DCT") {
		kern += PvlKeyword("NaifFrameCode", toString(-131382));
		}
		else { // encoding == "N/A" so no compression
		kern += PvlKeyword("NaifFrameCode", toString(-131383));
		}
		}
		}
		}
		*/
		}
		if ( otherLabels.hasGroup("BandBin")
		&& otherLabels.findGroup("BandBin").keywords() > 0 ) {

isis/src/kaguya/objs/KaguyaTcCamera/Camera.plugin

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		Group = KAGUYA/TC1
		Version = 1
		Library = KaguyaTcCamera
		Routine = KaguyaTcCameraPlugin
		EndGroup

		Group = KAGUYA/TC2
		Version = 1
		Library = KaguyaTcCamera
		Routine = KaguyaTcCameraPlugin
		EndGroup