Commit b8a2a5c1 authored by Ken Edmundson's avatar Ken Edmundson
Browse files

modified deltack app test to account for piecewise polynomials

parent d1d0a347
Loading
Loading
Loading
Loading
+21 −11
Original line number Diff line number Diff line
@@ -364,22 +364,32 @@ BundleSettingsQsp bundleSettings() {
  QList<BundleObservationSolveSettings> observationSolveSettingsList;
  BundleObservationSolveSettings observationSolveSettings;

  // use defaults
  //       pointing option sigmas -1.0
  //       ckDegree = ckSolveDegree = 2
  // using defaults for all arguments
  //       pointingSolveOption = BundleObservationSolveSettings::AnglesOnly
  //       solveTwist = false
  //       ckDegree = 2
  //       ckSolveDegree = 2
  //       pointingSegments = 1
  //       fitOverExisting = false
  //       angle sigma = angular velocity sigma = angular acceleration sigma = -1.0
  //       angle sigma = -1
  //       angular velocity sigma = -1
  //       angular acceleration sigma = -1
  observationSolveSettings.setInstrumentPointingSettings(
      BundleObservationSolveSettings::AnglesOnly, ui.GetBoolean("TWIST"));
  
  // NOTE: no need to set position sigmas or solve degrees since we are not solving for any
  // position factors
  //       position option sigmas default to -1.0
  //       spkDegree = spkSolveDegree = 2
  //       solveOverHermiteSpline = false
  //       position sigma = velocity sigma = acceleration sigma = -1.0
  // position factors, here we are using default values for all argumnents except the number
  // of position segments. The default is 1, here we use 0, since we aren't solving for position
  //       positionSolveOption = BundleObservationSolveSettings::NoPositionFactors (default)
  //       spkDegree = 2 (default)
  //       spkSolveDegree = 2 (default)
  //       positionSegments = 0 (default is 1)
  //       solveOverHermiteSpline = false (default)
  //       position sigma = -1 (default)
  //       velocity sigma = -1 (default)
  //       acceleration sigma = -1 (default)  
  observationSolveSettings.setInstrumentPositionSettings(
      BundleObservationSolveSettings::NoPositionFactors);
      BundleObservationSolveSettings::NoPositionFactors, 2, 2, 0, false, -1, -1, -1);  

  observationSolveSettingsList.append(observationSolveSettings);
  settings->setObservationSolveOptions(observationSolveSettingsList);
+6 −0
Original line number Diff line number Diff line
@@ -195,6 +195,12 @@
      BundleSolutionInfo object. Am also deleting this pointer because jigsaw.cpp takes
      ownership from BundleAdjust.
    </change>    
    <change name="Ken Edmundson" date="2018-11-13">
      Modified call to observationSolveSettings.setInstrumentPositionSettings to relect
      0 position segments, since we aren't solving for position. Also, for clarity,
      modified the method call to explicitly show the argument values, whether or not
      they are default. Made the comment above the call more clear.
    </change>    
  </history>

  <groups>
+0 −1
Original line number Diff line number Diff line
../../objs/ControlMeasure/ControlMeasure.cpp
 No newline at end of file
+0 −1
Original line number Diff line number Diff line
../../objs/ControlMeasure/ControlMeasure.h
 No newline at end of file