Commit 99d5e419 authored by chrisryancombs's avatar chrisryancombs
Browse files

Merge branch 'temp_ccombs_m04970' of https://github.com/USGS-Astrogeology/ISIS3 into m04970

parents efb1c186 d5217357

isis/src/cassini/apps/ciss2isis/ciss2isis.xml

+9 −0
Original line number Diff line number Diff line
@@ -105,6 +105,12 @@ 
          Use this parameter to select the Cassini PDS Image Label. The file must

          contain PDS labels for Cassini ISS data.  This can be a detached label file with

          pointer to the cube data.

          

          <strong>NOTE:</strong> While we support most Cassini ISS Targets for ingestion, some of 

          these targets do not currently have support for being spiced. The current list is : ANTHE, 

          AEGAEON, BERGELMIR, BESTLA, ERRIAPO, ERRIAPUS, FORNJOT, GREIP, HATI, HYROKKIN, IJIRAQ, 

          JARNSAXA, K07S4, KARI, KIVIUQ, LOGE, MUNDILFARI, NARVI, PAALIAQ, SIARNAQ, SKADI, SKATHI,

          SKOLL, SURTUR, SUTTUNG, SUTTUNGR, TARVOS, TARQEQ, THRYM, THRYMR, YMIR. 

        </description>

        <filter>

          *.lbl *.LBL
@@ -119,6 +125,9 @@ 
         </brief>

         <description>

           Use this parameter to select the output filename

           

           <strong>NOTE:</strong> The following TARGET_NAMEs will be translated to 'Sky' in the

           output cube's PVL: SKY, DARK SKY, S8_2004, S12_2004, S13_2004, S14_2004, S18_2004.

         </description>

         <filter>

           *.cub

isis/src/system/apps/kerneldbgen/kerneldbgen.xml

+3 −9
Original line number Diff line number Diff line
@@ -148,10 +148,6 @@ 
      Added three additional decimal places to the output of the TIME keyword in output

      kernel database file.  Fixes #2236.

    </change>

    <change name="Christopher Combs" date="2018-01-11">

      Added STARTOFFSET and ENDOFFSET parameters to allow for slight editing to start and end times.

      Fixes #5272.

    </change>

  </history>



  <groups>
@@ -329,6 +325,7 @@ 
        </default>

      </parameter>

    </group>

<<<<<<< HEAD

    <group name="Offset">

      <parameter name="STARTOFFSET">

        <type>double</type>
@@ -363,6 +360,8 @@ 
        </default>

      </parameter>

    </group>

=======

>>>>>>> d52173579efb95b60629a85b407d372b767fd706

    <!-- Removed because NADIR kerels are not specifed by files, instead NADIR pointing is caluculated as normal to the surface from the current spacecraft position

    <group name="Nadir">

      <parameter name="NADIRDIR">
@@ -649,10 +648,5 @@ 
        </dataFile>

      </dataFiles>

    </example>











  </examples>

</application>