Lro lidar infrastructure Added a new input parameter, FROMLIST to the user interface (#3162) (2ed006e1) · Commits · aflab / astrogeology / ISIS3

isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.cpp

+1 −19

Original line number	Diff line number	Diff line
		@@ -429,24 +429,6 @@ namespace Isis {
		}


		/**
		* Allows mission specific programs to set version_id
		* required for PDS4 labels. This value is added to the xml file
		* by the identificationArea() method.
		*
		* The input string should be colon separated string with 6
		* identifiers:
		*
		* @author 2019-03-01 Kristin Berry
		*
		* @param versiondId The version_id value required for PDS4
		* compliant labels.
		*/
		void ProcessExportPds4::setVersionId(QString versionId) {
		m_versionId = versionId;
		}


		/**
		* Allows mission specific programs to set the title
		* required for PDS4 labels. This value is added to the xml file

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

+37 −3

Original line number	Diff line number	Diff line
		@@ -43,7 +43,13 @@
		</change>
		<change name="Debbie A Cook" date="2019-02-23">
		Added new file OUTPUTTYPE=TEST, to be used strictly for testing.
		This option does a SLOW sort on the output data. References #5343.
		This option does a SLOW sort on the output data. The resulting output file
		is sorted by pointID, which allows testing software to compare
		output with truth data. References #5343.
		</change>
		<change name="Debbie A Cook" date="2019-03-11">
		Added new input parameter FROMLIST to allow entering multiple input
		Lidar CSV files. All input points are written out into a single Lidar data file.
		</change>
		</history>

		@@ -57,16 +63,44 @@
		<type>filename</type>
		<fileMode>input</fileMode>
		<brief>
		Input LOLA Lidar CSV
		Input LOLA Lidar RDR data in CSV format
		</brief>
		<description>
		This file is a complied CSV with data from LOLA.
		This file is downloaded from Washington University at

		"https://ode.rsl.wustl.edu/moon/indextools.aspx?displaypage=lolardr"

		It contains altimetry readings organized along the spacecraft orbit track.

		</description>
		<exclusions>
		<item>FROMLIST</item>
		</exclusions>
		<filter>
		*.csv
		</filter>
		</parameter>

		<parameter name="FROMLIST">
		<type>filename</type>
		<fileMode>input</fileMode>
		<internalDefault>None</internalDefault>
		<brief>
		Input LOLA Lidar CSV file list from which to generate the Lidar control point file
		</brief>
		<description>
		This file contains a list of CSV files of LOLA Lidar RDR that will be used to generate
		an Isis Lidar control point file. Each file in FROMLIST is expected to be a CSV with
		LOLA Lidar RDR data. See FROM for more information on the data.
		</description>
		<exclusions>
		<item>FROM</item>
		</exclusions>
		<filter>
		*.lis
		</filter>
		</parameter>

		<parameter name="CUBES">
		<type>filename</type>
		<fileMode>input</fileMode>

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

+76 −91

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		#include "FileName.h"
		#include "ID.h"

		#include "FileList.h"
		#include "IException.h"
		#include "iTime.h"
		#include "Latitude.h"
		@@ -36,8 +37,19 @@ struct LidarCube {

		void IsisMain() {

		FileList filelist;
		UserInterface &ui = Application::GetUserInterface();
		FileName dataFile = ui.GetFileName("FROM");

		// Get the Lidar csv data from either/or both FROM and FROMLIST
		if (ui.WasEntered("FROM")) filelist.push_back(FileName(ui.GetFileName("FROM")));
		if (ui.WasEntered("FROMLIST")) filelist.read(FileName(ui.GetFileName("FROMLIST")));

		if (filelist.size() < 1) {
		QString msg =
		"Input CSV files must be specified in FROM and/or FROMLIST - no files were found.";
		throw IException(IException::User,msg,_FILEINFO_);
		}

		SerialNumberList cubeList = SerialNumberList(ui.GetFileName("CUBES"));
		double threshold = ui.GetDouble("THRESHOLD");
		double rangeSigma = ui.GetDouble("POINT_RANGE_SIGMA");
		@@ -56,6 +68,7 @@ void IsisMain() {
		radiusSigma = ui.GetDouble("POINT_RADIUS_SIGMA");
		}

		// Read necessary label information from cubes
		QList<LidarCube> images;

		for (int i = 0; i < cubeList.size(); i++) {
		@@ -73,8 +86,6 @@ void IsisMain() {
		images.append(lidarCube);
		}

		CSVReader lidarDataFile;
		lidarDataFile.read(dataFile.expanded());
		LidarData lidarDataSet;
		CubeManager cubeMgr;
		Distance majorAx;
		@@ -84,7 +95,13 @@ void IsisMain() {
		// Set up an automatic id generator for the point ids
		ID pointId = ID(ui.GetString("POINTID"));

		//Start at 1 because there is a header. TODO actually set a header in lidarDataFile
		// Loop through Lidar csv data file(s) and load the data into a single LidarData object, LidarDataSet
		for (int ifile = 0; ifile < filelist.size(); ifile++) {
		CSVReader lidarDataFile;
		lidarDataFile.read(filelist[ifile].expanded());

		// Start at 1 to skip the header. TODO actually set a header in lidarDataFile

		for (int i = 1; i < lidarDataFile.rows(); i++) {
		CSVReader::CSVAxis row = lidarDataFile.getRow(i);

		@@ -102,19 +119,19 @@ void IsisMain() {
		lidarPoint->setRange(range);
		lidarPoint->setSigmaRange(rangeSigma);

		// Just set the point coordinates for now. We need to wait until we set
		// the target radii to be able to set the coordinate sigmas. The sigmas
		// will be converted to angles and the target radii are needed to do that.
		// Set the point coordinates and their sigmas and add to the Lidar Control Point file
		SurfacePoint spoint(lat, lon, radius);
		// lidarPoint->SetAprioriSurfacePoint(SurfacePoint(lat, lon, radius));

		bool setSurfacePointRadii = true;
		spoint.SetSphericalSigmasDistance(
		Distance(latSigma, Distance::Units::Meters),
		Distance(lonSigma, Distance::Units::Meters),
		Distance(radiusSigma, Distance::Units::Meters));
		lidarPoint->SetAprioriSurfacePoint(spoint);

		// Loop through images to set measures in the Lidar Control Point
		for (int j = 0; j < images.size(); j++) {
		Cube *cube = cubeMgr.OpenCube(images[j].name.expanded());

		if (cube != NULL) {

		Camera *camera = cube->camera();

		if (camera != NULL) {
		@@ -124,43 +141,9 @@ void IsisMain() {

		if (samp > 0.5 - threshold && line > 0.5 - threshold
		&& samp < camera->Samples() + .5 && line < camera->Lines() + .5) {

		ControlMeasure *measure = new ControlMeasure;

		measure->SetCoordinate(camera->Sample(), camera->Line());
		measure->SetCubeSerialNumber(images[j].sn);

		if (setSurfacePointRadii) {
		// Get the radii and set the radii in the SurfacePoint
		std::vector<Distance> targetRadii;
		targetRadii = camera->target()->radii();
		majorAx = targetRadii[0];
		minorAx = targetRadii[1];
		polarAx = targetRadii[2];
		setSurfacePointRadii = false;
		spoint.SetSphericalSigmasDistance(
		Distance(latSigma, Distance::Units::Meters),
		Distance(lonSigma, Distance::Units::Meters),
		Distance(radiusSigma, Distance::Units::Meters));
		lidarPoint->SetAprioriSurfacePoint(spoint);
		// if (camera->target()->shape()->hasValidTarget()) {
		// targetRadii = camera->target()->shape()->targetRadii();
		// }
		// else {
		// QString msg = "Valid target not defined in shape model ";
		// throw IException(IException::Unknown, msg, _FILEINFO_);
		// }

		// targid = camera->SpkTargetId();
		// Distance targetRadii[3];
		// camera0>getDouble(
		// camera->radii(targetRadii);
		// majorAx = targetRadii[0];
		// minorAx = targetRadii[1];
		// polarAx = targetRadii[2];
		// setSurfacePointRadii = false;
		}

		lidarPoint->Add(measure);
		if (time >= images[j].startTime && time <= images[j].endTime) {
		QString newSerial = measure->GetCubeSerialNumber();
		@@ -187,7 +170,9 @@ void IsisMain() {
		}

		lidarDataSet.insert(QSharedPointer<LidarControlPoint>(lidarPoint));
		}
		} // End loop on lidarDataFile rows
		lidarDataFile.clear();
		} // End loop on lidar data file list


		if (ui.GetString("OUTPUTTYPE") == "JSON") {