Test autolabeler (#5229) (3f8e0cf2) · Commits · aflab / astrogeology / ISIS3

.gitignore

+2 −0

Original line number	Diff line number	Diff line
		#Test1

		# Ignore all
		*

CHANGELOG.md

+4 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ release.
		- Removed the `.py` extention from the _isisdataeval_ tool `isisdata_mockup` for consistency and install it in $ISISROOT/bin; added the `--tojson` and `--hasher` option to _isisdata_mockup_ tool improve utility; updated the tool `README.md` documentation to reflect this change, removed help output and trimmed example results; fixed paths to test data in `make_isisdata_mockup.sh`. [#5163](https://github.com/DOI-USGS/ISIS3/pull/5163)

		### Added
		- Added rclone to run dependencies in meta.yaml [#5183](https://github.com/DOI-USGS/ISIS3/issues/5183)

		### Deprecated

		@@ -46,6 +47,7 @@ release.

		### Fixed
		- Updated History constructor to check for invalid BLOB before copying History BLOB to output cube [#4966](https://github.com/DOI-USGS/ISIS3/issues/4966)
		- Updated photomet MinnaertEmpirical model to support photemplate-style PVL format [#3621](https://github.com/DOI-USGS/ISIS3/issues/3621)

		## [8.0.0] - 2023-04-19

		@@ -53,7 +55,9 @@ release.
		- Updated download location for Dawn source files to include updated pck from HAMO Dawn mosaic [#4001](https://github.com/USGS-Astrogeology/ISIS3/issues/4001)
		- Pinned cspice version to 67 [#5083](https://github.com/USGS-Astrogeology/ISIS3/issues/5083)
		- Changed the `rsync` related commands in the ISIS SPICE Web Service document to `downloadIsisData` command
		- Updated documentation for `tgocassisrdrgen` to be more descriptive and accurate.
		- Updated Geos from version 3.7 to 3.9 [#3627](https://github.com/DOI-USGS/ISIS3/issues/3627)
		- Updated Ale to version 0.9.1 [#5209](https://github.com/DOI-USGS/ISIS3/pull/5209)

		### Added
		- Instructions on setting `channel_priority=flexible` for isis environment manually during installation [#5158](https://github.com/DOI-USGS/ISIS3/issues/5158)

environment.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@ channels:
		- defaults

		dependencies:
		- ale=0.8.6
		- ale=0.9.1
		- armadillo
		- boost=1.72
		- boost-cpp=1.72

isis/src/base/objs/MinnaertEmpirical/MinnaertEmpirical.cpp

+79 −2

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ namespace Isis {
		* phase curve values that exist between the given phase angles. The values
		* in the phase angle list are limited to values that are >=0 and <=180.
		*
		* @param phaselist List of phase angles to interpolate
		* @param phasestrlist List of phase angles to interpolate
		*/
		void MinnaertEmpirical::SetPhotoPhaseList(QString phasestrlist) {
		double phaseangle;
		@@ -92,6 +92,38 @@ namespace Isis {
		}
		}

		/**
		* Set the empirical Minnaert function phase angle list. This is the list
		* of phase angles that Minnaert K values and phase curve list values will
		* be provided for. A spline curve will be used to interpolate K values and
		* phase curve values that exist between the given phase angles. The values
		* in the phase angle list are limited to values that are >=0 and <=180.
		*
		* @param phaselist PvlKeyword containing phase angles to interpolate
		*/
		void MinnaertEmpirical::SetPhotoPhaseList(PvlKeyword phaseList) {

		// If the format is Keyword="1,2,3,4,5" rather than Keyword = (1,2,3,4,5)
		if (phaseList.size() == 1) {
		SetPhotoPhaseList(QString(phaseList));
		return;
		}

		double phaseAngle;
		p_photoPhaseList.clear();

		for (int i=0; i< phaseList.size(); i++) {
		phaseAngle = phaseList[i].toDouble();

		if (phaseAngle < 0.0 \|\| phaseAngle > 180.0) {
		QString msg = "Invalid value of empirical Minnaert phase angle list value [" +
		toString(phaseAngle) + "]";
		throw IException(IException::User, msg, _FILEINFO_);
		}
		p_photoPhaseList.push_back(phaseAngle);
		}
		}

		/**
		* Set the empirical Minnaert function K exponent list. This is used to
		* govern the limb-darkening in the Minnaert photometric function. Values
		@@ -99,7 +131,7 @@ namespace Isis {
		* almost no limb darkening) to 1.0 (Lambert function). This
		* parameter is limited to values that are >=0.
		*
		* @param klist List of Minnaert function exponents to interpolate
		* @param kstrlist List of Minnaert function exponents to interpolate
		*/
		void MinnaertEmpirical::SetPhotoKList(QString kstrlist) {
		double kvalue;
		@@ -117,6 +149,29 @@ namespace Isis {
		}
		}

		/**
		* Set the empirical Minnaert function K exponent list. This is used to
		* govern the limb-darkening in the Minnaert photometric function. Values
		* of the Minnaert exponent generally fall in the range from 0.5 ("lunar-like",
		* almost no limb darkening) to 1.0 (Lambert function). This
		* parameter is limited to values that are >=0.
		*
		* @param kstrList PvkKeyword containing List of Minnaert function exponents to interpolate
		*/
		void MinnaertEmpirical::SetPhotoKList(PvlKeyword kstrList) {

		// If the format is Keyword="1,2,3,4,5" rather than Keyword = (1,2,3,4,5)
		if (kstrList.size() == 1) {
		SetPhotoKList(QString(kstrList));
		return;
		}

		p_photoKList.clear();
		for (int i=0; i<kstrList.size(); i++) {
		p_photoKList.push_back(kstrList[i].toDouble());
		}
		}

		/**
		* Set the empirical Minnaert function phase curve list. This list provides
		* the brightness values that correspond to the limb-darkening values in the
		@@ -135,6 +190,28 @@ namespace Isis {
		}
		}

		/**
		* Set the empirical Minnaert function phase curve list. This list provides
		* the brightness values that correspond to the limb-darkening values in the
		* empirical Minnaert photometric function.
		*
		* @param phasecurvelist PvlKeyword containing list of brightness values corresponding
		* to Minnaert function exponents
		*/
		void MinnaertEmpirical::SetPhotoPhaseCurveList(PvlKeyword photocurvestrList) {

		// If the format is Keyword="1,2,3,4,5" rather than Keyword = (1,2,3,4,5)
		if (photocurvestrList.size() == 1) {
		SetPhotoPhaseCurveList(QString(photocurvestrList));
		return;
		}

		p_photoPhaseCurveList.clear();
		for (int i=0; i<photocurvestrList.size(); i++) {
		p_photoPhaseCurveList.push_back(photocurvestrList[i].toDouble());
		}
		}

		double MinnaertEmpirical::PhotoModelAlgorithm(double phase, double incidence,
		double emission) {
		static double pht_minnaert_empirical;

isis/src/base/objs/MinnaertEmpirical/MinnaertEmpirical.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -46,8 +46,11 @@ namespace Isis {
		virtual ~MinnaertEmpirical();

		void SetPhotoPhaseList(QString phasestrlist);
		void SetPhotoPhaseList(PvlKeyword phaselist);
		void SetPhotoKList(QString kstrlist);
		void SetPhotoKList(PvlKeyword kstrlist);
		void SetPhotoPhaseCurveList(QString phasecurvestrlist);
		void SetPhotoPhaseCurveList(PvlKeyword phasecurvestrlist);

		//! Return photometric phase angle list
		// inline std::vector<double> PhotoPhaseList() const {