Skip to content
Snippets Groups Projects
Commit 0a954716 authored by Lauren Adoram-Kershner's avatar Lauren Adoram-Kershner Committed by Jesse Mapel
Browse files

Logging added to Ls; couple typo corrections in Framer (#226)

* Logging added to Ls

* Logging added to Ls sensor model, log pointer setter added to head file

* More loggers added to state functions

* Fixe Travis Error

* Fixing Travis Error #2 dump json logging objects

* Travis #3

* Fixed spacing
parent d8434c15
Branches
Tags
No related merge requests found
......@@ -32,6 +32,9 @@
#include <CorrelationModel.h>
#include "Distortion.h"
#include "spdlog/spdlog.h"
#include "spdlog/sinks/basic_file_sink.h"
class UsgsAstroLsSensorModel : public csm::RasterGM, virtual public csm::SettableEllipsoid
{
public:
......@@ -115,6 +118,10 @@ public:
std::vector<double> m_covariance;
int m_imageFlipFlag;
// Define logging pointer and file content
std::string m_logFile;
std::shared_ptr<spdlog::logger> m_logger;
// Hardcoded
static const std::string _SENSOR_MODEL_NAME; // state date element 0
......@@ -683,6 +690,9 @@ public:
// reference by the given index.
//<
virtual std::shared_ptr<spdlog::logger> getLogger();
virtual void setLogger(std::shared_ptr<spdlog::logger> logger);
//---
// Uncertainty Propagation
......
......@@ -97,7 +97,7 @@ csm::ImageCoord UsgsAstroFrameSensorModel::groundToImage(const csm::EcefCoord &g
double desiredPrecision,
double *achievedPrecision,
csm::WarningList *warnings) const {
MESSAGE_LOG(this->m_logger, "Computeing groundToImage(No adjustments) for {}, {}, {}, with desired precision {}",
MESSAGE_LOG(this->m_logger, "Computing groundToImage(No adjustments) for {}, {}, {}, with desired precision {}",
groundPt.x, groundPt.y, groundPt.z, desiredPrecision);
return groundToImage(groundPt, m_noAdjustments, desiredPrecision, achievedPrecision, warnings);
......@@ -121,7 +121,7 @@ csm::ImageCoord UsgsAstroFrameSensorModel::groundToImage(
double* achieved_precision,
csm::WarningList* warnings ) const {
MESSAGE_LOG(this->m_logger, "Computeing groundToImage for {}, {}, {}, with desired precision {}",
MESSAGE_LOG(this->m_logger, "Computing groundToImage for {}, {}, {}, with desired precision {}",
groundPt.x, groundPt.y, groundPt.z, desired_precision);
double x = groundPt.x;
......@@ -171,6 +171,7 @@ csm::ImageCoordCovar UsgsAstroFrameSensorModel::groundToImage(const csm::EcefCoo
csm::WarningList *warnings) const {
MESSAGE_LOG(this->m_logger, "Computeing groundToImage(Covar) for {}, {}, {}, with desired precision {}",
groundPt.x, groundPt.y, groundPt.z, desiredPrecision);
csm::EcefCoord gp;
gp.x = groundPt.x;
gp.y = groundPt.y;
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment