Merge pull request #282 from kledmundson/LroLidar_Infrastructure (9153807d) · Commits · aflab / astrogeology / ISIS3

isis/src/lro/apps/lrolola2isis/lrolola2isis.cpp

+3 −14

Original line number	Diff line number	Diff line
		@@ -46,26 +46,16 @@ void IsisMain() {
		double lonSigma = Isis::Null;
		double radiusSigma = Isis::Null;

		if (ui.GetDouble("POINT_LATITUDE_SIGMA")) {
		if (ui.WasEntered("POINT_LATITUDE_SIGMA")) {
		latSigma = ui.GetDouble("POINT_LATITUDE_SIGMA");
		}
		if (ui.GetDouble("POINT_LONGITUDE_SIGMA")) {
		if (ui.WasEntered("POINT_LONGITUDE_SIGMA")) {
		lonSigma = ui.GetDouble("POINT_LONGITUDE_SIGMA");
		}
		if (ui.GetDouble("POINT_RADIUS_SIGMA")) {
		if (ui.WasEntered("POINT_RADIUS_SIGMA")) {
		radiusSigma = ui.GetDouble("POINT_RADIUS_SIGMA");
		}

		// if (ui.WasEntered("POINT_LATITUDE_SIGMA")) {
		// latSigma = ui.GetDouble("POINT_LATITUDE_SIGMA");
		// }
		// if (ui.WasEntered("POINT_LONGITUDE_SIGMA")) {
		// lonSigma = ui.GetDouble("POINT_LONGITUDE_SIGMA");
		// }
		// if (ui.WasEntered("POINT_RADIUS_SIGMA")) {
		// radiusSigma = ui.GetDouble("POINT_RADIUS_SIGMA");
		// }

		QList<LidarCube> images;

		for (int i = 0; i < cubeList.size(); i++) {
		@@ -128,7 +118,6 @@ void IsisMain() {
		Camera *camera = cube->camera();

		if (camera != NULL) {
		// if (camera->SetGround(lat, lon)) {
		if (camera->SetGround(spoint)) {
		double samp = camera->Sample();
		double line = camera->Line();

isis/src/lro/apps/lrolola2isis/lrolola2isis.xml

+29 −31

Original line number	Diff line number	Diff line
		@@ -37,6 +37,9 @@
		lidar point coordinates. Ensures use of lidar point radius instead of the
		local radius.
		</change>
		<change name="Ken Edmundson" date="2018-06-25">
		Changed internal default for lidar coordinate a priori uncertainties to "none", allowing FREE
		lidar points.
		</history>

		<category>
		@@ -151,40 +154,35 @@
		</group>
		<group name="Point Uncertainties">
		<parameter name="POINT_RANGE_SIGMA">
		<type>double</type>
		<brief> Range uncertainty for all points (meters)
		</brief>
		<brief> Range uncertainty for all points (meters)</brief>
		<description>
		This value will be used as the range uncertainty
		for all points. Units are meters.
		</description>
		<default>
		<item>10.0</item>
		</default>
		<type>double</type>
		<internalDefault>none</internalDefault>
		<minimum inclusive="yes">0</minimum>
		</parameter>

		<parameter name="POINT_LATITUDE_SIGMA">
		<brief> Latitude uncertainty for all points (meters)
		</brief>
		<brief> Latitude uncertainty for all points (meters)</brief>
		<description>
		This value will be used as the latitude uncertainty
		for all points. Units are meters.
		</description>
		<type>double</type>
		<default><item>10.0</item></default>
		<internalDefault>none</internalDefault>
		<minimum inclusive="yes">0</minimum>
		</parameter>

		<parameter name="POINT_LONGITUDE_SIGMA">
		<brief> Longitude uncertainty for all points (meters)
		</brief>
		<brief> Longitude uncertainty for all points (meters)</brief>
		<description>
		This optional value will be used as the longitude
		uncertainty for all points. Units are meters.
		</description>
		<type>double</type>
		<default><item>10.0</item></default>
		<internalDefault>none</internalDefault>
		<minimum inclusive="yes">0</minimum>
		</parameter>

		@@ -196,7 +194,7 @@
		all points. Units are meters.
		</description>
		<type>double</type>
		<default><item>10.0</item></default>
		<internalDefault>none</internalDefault>
		<minimum inclusive="yes">0</minimum>
		</parameter>
		</group>