Commit 38e7b45d authored by Kim Oyama's avatar Kim Oyama
Browse files

In deltack, added check for history group in input cube. If it's there, add a... 

In deltack, added check for history group in input cube. If it's there, add a new entry. If not, add a new history group. Added an app test. Fixes #1350.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@5747 41f8697f-d340-4b68-9986-7bafba869bb8
parent 32086bda

isis/src/control/apps/deltack/deltack.cpp

+13 −4
Original line number Diff line number Diff line
@@ -139,12 +139,21 @@ void IsisMain() { 
    //cmatrix.Label().findObject("Table",Pvl::Traverse).addKeyword(description);



    // Update the cube history

    History hist = History("IsisCube");

    try {

      // read history from cube, if it exists.

      c.read(hist);

    }

    catch(IException &e) {

      // if the history does not exist in the cube, the cube's write method will add it.

    }

      c.write(cmatrix); 

    History h("IsisCube");

    c.read(h);

    h.AddEntry();

    c.write(h);

      hist.AddEntry();

      c.write(hist);



    // clean up

    c.close();



    PvlGroup gp("DeltackResults");

    gp += PvlKeyword("Status", "Camera pointing updated");

    Application::Log(gp);

isis/src/control/apps/deltack/deltack.xml

+13 −10
Original line number Diff line number Diff line
@@ -82,6 +82,10 @@ 
        only one or two points.  The information is already listed

        in bundleout.txt.

    </change>

    <change name="Kimberly Oyama" date="2014-03-28">

       Added check for history group in input cube. If it's there, add a new entry. If not, add a

       new history group. Added an app test. Fixes #1350.

    </change>

  </history>



  <groups>
@@ -93,8 +97,8 @@ 
          Input camera cube

        </brief>

        <description>

  	   The file specification for the input cube.   The cube will have

           its camera pointing updated.

  	   The file specification for the input cube. The cube will have its camera pointing

           updated.

        </description>

        <filter>

          *.cub
@@ -106,8 +110,8 @@ 
      <parameter name="SIGMA0">

        <brief>Standard deviation of unit weight</brief>

        <description>

           Convergence is reached when the solution parameters change by 

           less than Sigma0.  Units:  unitless.

           Convergence is reached when the solution parameters change by less than Sigma0.

           Units:  unitless.

        </description>

        <type>double</type>

        <default><item>1.0e-10</item></default>
@@ -124,9 +128,9 @@ 
        <brief>Solve for camera twist</brief>

        <default><item>False</item></default>

        <description>

          In addition to angle1 and angle2, if this parameter is set the program 

          will solve for the camera twist.  This requires input of a second 

          fixed coordinate (SAMP2,LINE2) and (LAT2,LON2)

          In addition to angle1 and angle2, if this parameter is set the program will solve for

          the camera twist.  This requires input of a second fixed coordinate (SAMP2,LINE2) and

          (LAT2,LON2)

        </description>

        <inclusions>

          <item>LINE2</item>
@@ -243,9 +247,8 @@ 
       <brief>Radius, point #2</brief>

       <internalDefault>Computed</internalDefault>

       <description>

         Radius at the image coordinate (SAMP2,LINE2).  It will 

         be automatically computed using the shape model that was 

         initialized in the "spiceinit" application.  Units:  meters.

         Radius at the image coordinate (SAMP2,LINE2). It will be automatically computed using the

         shape model that was initialized in the "spiceinit" application.  Units:  meters.

       </description>

       <minimum inclusive="no">0.0</minimum>

       <inclusions>

isis/src/control/apps/deltack/tsts/hist/Makefile

0 → 100644
+16 −0
Original line number Diff line number Diff line 
APPNAME  = deltack



include $(ISISROOT)/make/isismake.tsts



commands:

	$(CP) $(INPUT)/*.cub $(OUTPUT);              \

	$(APPNAME) from=$(OUTPUT)/vik.cub            \

	  twist=false                                \

	  maxit=10                                   \

	  samp1=731.875                              \

	  line1=669.375                              \

	  lat1=-26.439008370134                      \

	  lon1= 352.19745020451 > /dev/null;         \

	cathist from=$(OUTPUT)/vik.cub > $(OUTPUT)/pvlTruth.pvl;\

	$(RM) $(OUTPUT)/vik.cub;

	  
 No newline at end of file