Unverified Commit d2486e7f authored by Christine Kim's avatar Christine Kim Committed by GitHub
Browse files

Jigsaw Fixes (#5703) 

* Add some fixes

* Update changelog

* Require update

* Test fix
parent 7323599d

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ release. 
### Fixed

- Fixed kaguyatc2isis invalid BandBin values [#5629](https://github.com/DOI-USGS/ISIS3/issues/5629)

- Fixed SpiceClient to handle redirect requests.

- Fixed jigsaw to default OUTADJUSTMENTH5 option to false and allow this feature to run on read-only images [#5700](https://github.com/DOI-USGS/ISIS3/issues/5700)



## [9.0.0] - 09-25-2024

isis/src/control/apps/jigsaw/jigsaw.cpp

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ namespace Isis { 
        for (int i = 0; i < bundleAdjustment->numberOfImages(); i++) {

          Process p;

          CubeAttributeInput inAtt;

          Cube *c = p.SetInputCube(bundleAdjustment->fileName(i), inAtt, ReadWrite);

          Cube *c = p.SetInputCube(bundleAdjustment->fileName(i), inAtt, 0); // 0 for read only



          // Only for ISIS adjustment values

          if (!c->hasBlob("CSMState", "String")) {

isis/src/control/apps/jigsaw/jigsaw.xml

+6 −5
Original line number Diff line number Diff line
@@ -921,9 +921,6 @@ 
        <default>

          <item>No</item>

        </default>

        <exclusions>

          <item>ADJUSTMENT_INPUT</item>

        </exclusions>

      </parameter>



      <parameter name="OUTLIER_REJECTION">
@@ -1880,7 +1877,7 @@ 
          </description>

          <type>boolean</type>

          <default>

            <item>yes</item>

            <item>no</item>

          </default>

        </parameter>
@@ -1898,6 +1895,11 @@ 
          <filter>

            *.h5

          </filter>

          <inclusions>

            <item>

              UPDATE

            </item>

          </inclusions>

          <exclusions>

            <item>ONET</item>

            <item>CNET</item>
@@ -1907,7 +1909,6 @@ 
            <item>SCCONFIG</item>

            <item>OBSERVATIONS</item>

            <item>RADIUS</item>

            <item>UPDATE</item>

            <item>OUTLIER_REJECTION</item>

            <item>REJECTION_MULTIPLIER</item>

            <item>ERRORPROPAGATION</item>

isis/tests/FunctionalTestsJigsaw.cpp

+5 −4
Original line number Diff line number Diff line
@@ -1875,12 +1875,13 @@ TEST_F(LidarNetwork, FunctionalTestJigsawLidar) { 


TEST_F(ApolloNetwork, FunctionalTestJigsawSaveApplyValues) {

  QVector<QString> args = {"spsolve=position",

                            "update=yes",

                            "update=no",

                            "bundleout_txt=no",

                            "cnet="+controlNetPath,

                            "fromlist="+tempDir.path() + "/cubes.lis",

                            "onet="+tempDir.path()+"/apollo_out.net",

                            "file_prefix="+tempDir.path()+"/"};

                            "file_prefix="+tempDir.path()+"/",

                            "outadjustmenth5=yes"};



  UserInterface ui(APP_XML, args);
@@ -1888,7 +1889,7 @@ TEST_F(ApolloNetwork, FunctionalTestJigsawSaveApplyValues) { 


  // Check apollo_jigsaw.h5 was created

  QString bundleOutput = tempDir.path()+"/adjustment_out.h5";

  HighFive::File file(bundleOutput.toStdString(), HighFive::File::ReadWrite);

  HighFive::File file(bundleOutput.toStdString(), HighFive::File::ReadOnly);



  std::string datasetName = "/APOLLO15/METRIC/1971-08-01T15:37:39.428";

  QString cmatrixName = "InstrumentPointing";