Csmobservation #4419

jessemapel · 2021-04-26T15:06:48Z

First pass at CSM observation class and settings class. This only allows for setting the parameters using a parameter set, not a type or explicit list.

References #4410

jessemapel · 2021-04-26T15:07:25Z

isis/src/base/objs/CSMCamera/CSMCamera.h

@@ -116,6 +116,10 @@ namespace Isis {
      virtual double RightAscension();
      virtual double Declination();

+      std::vector<int> getParameterIndices(csm::param::Set paramSet) const;
+      void applyParameterCorrection(int index, double correction);
+      double getParameterCovariance(int index1, int index2);


Note that these are not exposed via the Camera API so we have to dynamic cast to get to them.

jessemapel · 2021-04-26T15:08:19Z

isis/src/control/objs/BundleUtilities/AbstractBundleObservation.h

@@ -73,7 +72,7 @@ namespace Isis {
      virtual QStringList parameterList();
      virtual QStringList imageNames();

-    private:
+    protected:


The members below here are duplicated in the BundleObservation class. They probably need to go away.

Agreed. Making the values protected in the parent and removing from the child classes works as a solution and I merged this, but am still potentially interested in investigating if it's possible to handle weights/corrections/apriori/adjustedsigmas at the parent level if we were to modify how these are applied to be be more generalized.

jessemapel · 2021-04-26T15:09:12Z

isis/src/control/objs/CsmBundleObservation/CsmBundleObservation.cpp

+   * @return @b const BundleObservationSolveSettingsQsp Returns a pointer to the solve
+   *                                                    settings for this CsmBundleObservation
+   */
+  const BundleObservationSolveSettingsQsp CsmBundleObservation::solveSettings() {


This returns the wrong type of solve settings because of how the abstract interface works. It expects to return an ISIS settings. The only place it's used is in computePartials, so once we get that updated we should remove this from the abstract class so that we can have unique settings.

jessemapel · 2021-04-26T15:09:46Z

isis/src/control/objs/CsmBundleObservation/CsmBundleObservation.cpp

+ *   @history 2016-10-26 Ian Humphrey - Default values are now provided for parameters that are
+ *                           not being solved. Fixes #4464.
+ */
+QString CsmBundleObservation::formatBundleOutputString(bool errorPropagation, bool imageCSV) {


I left these two functions unimplemented until we figure out how we want to report stuff.

jessemapel · 2021-04-26T15:10:07Z

isis/src/control/objs/CsmBundleObservation/CsmBundleObservation.h

+
+      int numberParameters();
+
+      const BundleObservationSolveSettingsQsp solveSettings();


Again, returning the wrong type to satisfy the parent API.

jessemapel · 2021-04-26T15:10:47Z

isis/src/control/objs/CsmBundleObservation/CsmBundleObservationSolveSettings.h

+
+}
+
+#endif // CsmBundleObservationSolveSettings_h


This class is a dumb holder for right now, but I plan for it to encapsulate the different ways you can specify things:

parameter set

parameter type

explicit parameter names

jessemapel · 2021-04-26T15:11:56Z

isis/tests/CSMCameraTests.cpp

+      .WillOnce(::testing::Return(csm::param::REAL));
+  EXPECT_CALL(mockModel, getParameterType(2))
+      .Times(1)
+      .WillOnce(::testing::Return(csm::param::REAL));


The mock is a little weird here because GeometricModel::getParameterSetIndices is not virtual so we can't mock it out. We have to mock out the functions it calls. See

https://github.com/sminster/csm/blob/master/GeometricModel.cpp#L58

* Now compiling * Updated CSMCamera tests and docs

* copylab * Initial work toward a working AbstractBundleObservation class * Fix accidentl add of temporary changes from another project * Trial 2 on fixing my accidental changes * csm bundle building properly (#4409) * Updates for linking and compiling * Starting virtual functions * Add virtuals to AbstractBundleObservation and get compiling again * Remove function from parent * Get jigsaw tests passing on csmbundle branch (#4413) * Add virtuals to AbstractBundleObservation and get compiling again * Remove function from parent * Get existing jigsaw tests passing * Remove unneeded functions from BundleObservation * Clean up a bit more * Clean up BundleObservation and AbstractBundleObservation more * Remove unneeded BodyRotation * Add target body solve back into bundle adjusment calc * Remove debug output * Removed unneeded memeber variables BundleObservation Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov> * Move some functions to pure virtual * Csmobservation (#4419) * Now compiling * Updated CSMCamera tests and docs * Remove duplicated member variables and accesor functions from BundleObservation and add Csm camera type to Camera enum * Remove commented-out code * Added required headers from removed ground map header (#4427) * last missing header (#4428) * Moved CSM settings into BOSS * Generates Serial Numbers using CSM label information (#4437) * Creates Serial Numbers using CSM label information * Updated second SerialNumberList:add function to accommodate CSM label * Add hooks for csm bundle settings to jigsaw (#4438) * In progress * Added tests and Pvl support * Add missing 'y' to docs Co-authored-by: Kristin Berry <kberry@usgs.gov> * Moves partial calculation into CSM and ISIS observation classes. (#4436) * Remove duplicated member variables and accesor functions from BundleObservation and add Csm camera type to Camera enum * Remove commented-out code * Imagecoeff migrated into BundleObservation class working * Get base level working for all coeffs in ISIS * Fix accidental move into if statement to get tests passing again * Updated RHS for CsmBundleObservation to work * Adds point3D support to CSM Camera observations and also adds ground Partials member function to CSMCamera * Draft of sensor partials code * Add docs, some fixes based on review requests * move computation of weights and observation values to bundle observations * Add observationvalue function to CsmBundleObservation and move the weighting that it is possible to to the observation classes * Make CSMSolveSet an optional parameter to get jigsaw tests passing again * cleanup * Move observation weights into MLE if block Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov> * Implemented bundleOutputString for CSM (#4444) * Added test for CSM bundleOutputString * Passing unit test and updates to bundleOutputString * Addressed PR feedback * Csmcsv (#4446) * CSM CSV output * Small test clean-up * typo fix * obs header fix * Remove param list from bo * Added debug output * Now reurning * Fixed unit test * xml save test update * Clean up bundleresults unit test output * Fixed qfile member * Fixed old path * Changed header to use param names * Making separate csvs * Added reverse on obs by instId * Trying to fix multiple sensors * Fixed images header * More debug * removed debug outs * Added terrible imageindex search * Added held config fix * Updated for observation test * Updated jigsaw test makefiles * Updated with new tests * Updates Bundle Observation Vector to support Csm observations. (#4457) * Remove duplicated member variables and accesor functions from BundleObservation and add Csm camera type to Camera enum * Remove commented-out code * Imagecoeff migrated into BundleObservation class working * Get base level working for all coeffs in ISIS * Fix accidental move into if statement to get tests passing again * Updated RHS for CsmBundleObservation to work * Adds point3D support to CSM Camera observations and also adds ground Partials member function to CSMCamera * Draft of sensor partials code * Add docs, some fixes based on review requests * move computation of weights and observation values to bundle observations * Add observationvalue function to CsmBundleObservation and move the weighting that it is possible to to the observation classes * Make CSMSolveSet an optional parameter to get jigsaw tests passing again * cleanup * Move observation weights into MLE if block * Added isis vs. csm support to Bundle Observation Vector class to allow jigsaw to proceed past the setup stage for csm networks * Comment cleanup * Fix failing unit tests * Add docs * Updated based on feedback with potentially temporary fix to get unit tests passing * Update tests a bit * Aligned signature definitions and cleaned up * remove unneeded functions * More comment cleanup Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov> * Jigsaw Test Conversions (sccconfig, scconfigHeld, radar) (#4463) * Converted jigsaw scconfig tests. * Added jigsaw radar test * Updated tests to reflect PR #4446 changes & removed makefile tests * Updates to scconfig tests * Gets csm bundle converging (#4464) * Added cam type checks * checking csm partials * Debug partials * debug corrections * Fixed index * Scaled ground partials * Updated param comparison * Removed debug out * Fixes spacing issue in CSM bundleout.txt (#4465) * Update csm bundlout to have correct spacing for paramter names * Reverted unintential change Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov> * Removed unit-test specific changes I made to the code instead of the unit test * Add latitudinal partials for CSM (#4468) * Add latitudinal partials for CSM * Added test Co-authored-by: Jesse Mapel <jmapel@usgs.gov> * Csm clean up (#4483) * Added cms index list error * Added CSMCameraTests for partials * Observation clean-up * Cleaned up vector * Rename BundleObservation classes (#4518) * rename BundleObservation classes * omit changes to sip wrappers * Adds more capabilities to TestCsmModel (#4527) * Updated to get new isd/state form to test jigsaw parsing * Add functional image-to-ground, ground-to-image, and isd-parsing to TestCsmModel * Remove temporary csminit test changes * Updated variable name for clarity * add csm info to app docs for csminit and jigsaw * Csmbundle - remove SIP wrappers and deprecated formatBundleOutputString (#4526) * remove sip wrappers * remove deprecated formatBundleOutputString * remove more sip code and formatBundleOutputString * Fix functional tests to work with updated TestCsmModel (#4534) * Tests + test data for CSM jigsaw (#4530) * Removed debug couts * Added csmnetwork test fixture * Added a test for CSM test network * Adjusted trig functions + added deg/rad conversions * Initial CSMNetwork data * Uncommented code * Removed network path and control network from CSMNetwork fixture * Removed temporary path from csv comparison * Adjusted spacing + responded to PR feedback Co-authored-by: Austin Sanders <arsanders@ugs.gov> * Added the ability to update CSM model state in jigsaw (#4529) * Added the ability to update CSM model state in jigsaw * Added missing function docs * Updated CSM jigsaw test to check apply * Wrangled up an F * Added changelog entry * General clean-up * Changed Camera local photometric calculations to not use bodyrotation * Changed csm camera to save look on non-intersection * Fixed docs typos Co-authored-by: Kristin Berry <kberry@gyro.wr.usgs.gov> Co-authored-by: Kristin Berry <kberry@usgs.gov> Co-authored-by: Amy Stamile <74275278+amystamile-usgs@users.noreply.github.com> Co-authored-by: Tim Giroux <62255438+tgiroux@users.noreply.github.com> Co-authored-by: Tim Giroux <tgiroux@contractor.usgs.gov> Co-authored-by: AustinSanders <arsanders@usgs.gov> Co-authored-by: Austin Sanders <arsanders@ugs.gov>

jessemapel added 2 commits April 25, 2021 17:12

Now compiling

1015f50

Updated CSMCamera tests and docs

62bd5f8

jessemapel requested a review from krlberry April 26, 2021 15:06

jessemapel changed the base branch from dev to csmbundle April 26, 2021 15:07

jessemapel commented Apr 26, 2021

View reviewed changes

krlberry approved these changes Apr 26, 2021

View reviewed changes

krlberry merged commit 22f75b6 into DOI-USGS:csmbundle Apr 26, 2021

jessemapel mentioned this pull request May 5, 2021

Add hooks for csm bundle settings to jigsaw #4438

Merged

13 tasks

tgiroux pushed a commit to tgiroux/ISIS3 that referenced this pull request Jun 8, 2021

Csmobservation (DOI-USGS#4419)

bdc15fa

* Now compiling * Updated CSMCamera tests and docs

tgiroux pushed a commit to tgiroux/ISIS3 that referenced this pull request Jun 8, 2021

Csmobservation (DOI-USGS#4419)

c294660

* Now compiling * Updated CSMCamera tests and docs

tgiroux pushed a commit to tgiroux/ISIS3 that referenced this pull request Jun 8, 2021

Csmobservation (DOI-USGS#4419)

6512244

* Now compiling * Updated CSMCamera tests and docs

tgiroux pushed a commit to tgiroux/ISIS3 that referenced this pull request Jun 9, 2021

Csmobservation (DOI-USGS#4419)

8a7347d

* Now compiling * Updated CSMCamera tests and docs

jessemapel added a commit that referenced this pull request Jun 17, 2021

Csmobservation (#4419)

85ab444

* Now compiling * Updated CSMCamera tests and docs

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Csmobservation #4419

Csmobservation #4419

jessemapel commented Apr 26, 2021

jessemapel Apr 26, 2021

jessemapel Apr 26, 2021

krlberry Apr 26, 2021

jessemapel Apr 26, 2021

jessemapel Apr 26, 2021

jessemapel Apr 26, 2021

jessemapel Apr 26, 2021

jessemapel Apr 26, 2021


		int numberParameters();

		const BundleObservationSolveSettingsQsp solveSettings();


		}

		#endif // CsmBundleObservationSolveSettings_h

Csmobservation #4419

Csmobservation #4419

Conversation

jessemapel commented Apr 26, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment