Commit 870d7bb6 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

Updated from trunk. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@6759 41f8697f-d340-4b68-9986-7bafba869bb8
parents 0ccc8fde 75213aa4

isis/src/apollo/apps/apollocal/apollocal.cpp

+6 −3
Original line number Diff line number Diff line 
#include "Isis.h"

#include "SpecialPixel.h"



#include "CubeAttribute.h"

#include "ProcessByTile.h"

#include "Pvl.h"

#include "CubeAttribute.h"

#include "PvlTranslationTable.h"

#include "SpecialPixel.h"



using namespace std;

using namespace Isis;
@@ -41,6 +42,7 @@ void IsisMain() { 
  p.EndProcess();

}





void cal(vector<Buffer *> &in, vector<Buffer *> &out) {

  Buffer &inp = *in[0];      // Input Cube

  Buffer &fff = *in[1];      // Flat Field File
@@ -56,7 +58,8 @@ void cal (vector<Buffer *> &in, vector<Buffer *> &out) { 
      outp[i] = Null;

    }

    else {

      outp[i] = 65535.0*(1.0 - log(65536 - inp[i])/log(2.0)/16.0);    // Log Filter the film negative (and multiply by 2^16/16 to maintain the range of values)

      // Log Filter the film negative (and multiply by 2^16/16 to maintain the range of values)

      outp[i] = 65535.0*(1.0 - log(65536 - inp[i])/log(2.0)/16.0);

      outp[i] -=  1300.0;    // subtract dark current

      outp[i] /= fff[i];    // divide flat field to remove vignetting effects

    }

isis/src/apollo/apps/apollocal/apollocal.xml

+67 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<application name="apollocal" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">

  <brief>

    Radiometric correction of Apollo Planetary images

    Calibration of Apollo 15 metric images.

  </brief>



  <description>

    This program will perform radiometric corrections on apollo plenetary

    images.

    This program will perform calibrations on images from the Apollo 15 mission's metric camera.

    Two calibrations are performed. First, dark current is subtracted. Then, the image is divided

    by the flat field image to remove vignetting effects.

  </description>



  <category>
@@ -23,6 +24,10 @@ 
    <change name="Jacob Danton" date="2007-05-09">

      Original version

    </change>

    <change name="Curtis Rose" date="2016-04-20">

      Fixed typo and improved documentation by clarifying information and

      adding examples. Added image data to test. Fixes #2410.

    </change>

  </history>



  <groups>
@@ -31,7 +36,7 @@ 
        <type>cube</type>

        <fileMode>input</fileMode>

        <brief>

          Input cube file name

          Input cube file name.

        </brief>

        <description>

          The cube to be calibrated.
@@ -46,7 +51,7 @@ 
        <pixelType>real</pixelType>

        <fileMode>output</fileMode>

        <brief>

          Output cube

          Output cube.

        </brief>

        <description>

          The resultant cube containing the calibrated data.
@@ -58,4 +63,61 @@ 
    </group>

  </groups>



  <examples>

    <example>

      <brief>

        Cube callibrated.

      </brief>

      <description>

        This example shows how to calibrate an Apollo cube.

      </description>

      <terminalInterface>

        <commandLine>

          from=../inputCube.cub to=../outputCube.cub

        </commandLine>

        <description>

          Run the <strong>apollocal</strong> application to calibrate the cube.

        </description>

      </terminalInterface>

      <guiInterfaces>

        <guiInterface>

          <image width="1900" height="1000" src="./assets/ApollocalGUI.png">

            <brief>Example Gui</brief>

            <description>

              This is an example of the GUI for apollocal with parameters entered.            

            </description>

            <thumbnail width="180" height="200" caption="Apollocal GUI example." src="./assets/ApollocalGUI.png" />

          </image>

        </guiInterface>

      </guiInterfaces>

       <inputImages>

        <image width="1900" height="1000" src="./assets/InputCub.png">

          <brief>

            Input image

          </brief>

          <description>

            This is the example apollo image used for the input.

          </description>

          <thumbnail width="180" height="200" src="./assets/InputCub.png" caption="Input image."/>

          <parameterName>

            FROM

          </parameterName>

        </image>

      </inputImages>

      <outputImages>

        <image width="1900" height="1000" src="./assets/OutputCub.png">

          <brief>

            Output image

          </brief>

          <description>

            This is the example output image after apollocal is run.

          </description>

          <thumbnail width="180" height="200" src="./assets/OutputCub.png" caption="Output image."/>

          <parameterName>

            TO

          </parameterName>

        </image>

      </outputImages>

    </example>

  </examples>

</application>

isis/src/apollo/apps/apollocal/assets/ApollocalGUI.png

0 → 100644
+26.7 KiB
Loading image diff...

isis/src/apollo/apps/apollocal/assets/InputCub.png

0 → 100644
+251 KiB
Loading image diff...

isis/src/apollo/apps/apollocal/assets/OutputCub.png

0 → 100644
+318 KiB
Loading image diff...