Commit ef3375a7 authored by Stuart Sides's avatar Stuart Sides Committed by Adam Paquette
Browse files

Simple edits (#3979)

parent aa275da5

isis/src/hayabusa2/apps/hyb2onccal/Hyb2OncCalUtils.h

+2 −3
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static int binning(1); //!< The number of samples/lines which are binned 
static double g_compfactor(1.0);  // Default if OutputMode = LOSS-LESS; 16.0 for LOSSY



static QString g_calStep("IOF");  //!< Which calibrations step should we stop at?

static double g_calibrationScale = 1.0; //!< Radiance or I/F conversion factor

static double g_calibrationScale = 1.0; //!< DN, Radiance or I/F conversion factor



// I/F variables

static double g_solarDist(1.0);
@@ -282,8 +282,7 @@ namespace Isis { 
        }

      }



      // I/F or Radiance Conversion (or g_calibrationScale might = 1, 

      // in which case the output will be in DNs)

      // DN, Radiance, or I/F Conversion 

      imageOut[i] *= g_calibrationScale;

    }

    return;

isis/src/hayabusa2/apps/hyb2onccal/hyb2onccal.cpp

+6 −3
Original line number Diff line number Diff line
@@ -272,17 +272,20 @@ namespace Isis { 
    QString calfile = loadCalibrationVariables(ui.GetAsString("CONFIG"));

    g_timeRatio = g_Tvct/(g_texp + g_Tvct);



    // Output units of DN

    QString units = "DN";



    // Output units of radiance

    if (g_calStep == "RADIANCE") {

      // Units of RADIANCE

      g_calibrationScale = 1.0 / (g_texp * g_sensitivity);

      units = "W / (m**2 micrometer sr)";

    }



    // Output units of I/F

    else if (g_calStep == "IOF") {

      // Units of I/F

      // Included this line because we need to convert to radiance before I/F.

      // Convert to radiance

      g_calibrationScale = 1.0 / (g_texp * g_sensitivity);

      // Convert to reflectance

      g_calibrationScale *= (Isis::PI * (g_solarDist * g_solarDist)) / g_solarFlux;

      units = "I over F";

    }

isis/src/hayabusa2/apps/hyb2onccal/hyb2onccal.xml

+2 −9
Original line number Diff line number Diff line
@@ -5,10 +5,7 @@ 
xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Application/application.xsd">

  <brief>

    Calibrates Hayabusa 2 ONC-T images. Calibration includes bias and dark current correction as

    well as flat-field correction. No smear or point spread is being currently corrected (lack of

    models to correct for this currently). Also, since no radiance calibration paramters could not

    be determined for the individual filters, the output will be DNs (not radiance or I/F).

    The wide-angle instruments, ONC-W1 and ONC-W2, do not have flat-field correction.

    well as flat-field correction.

  </brief>



  <description>
@@ -77,9 +74,6 @@ xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Applica 
    pixel in the flat-field image.

  </p>









  <p>

    <h1><a id="References">References:</a></h1>

    <ol>
@@ -99,7 +93,6 @@ xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Applica 


  </p>





  </description>



  <category>
@@ -176,7 +169,7 @@ xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Applica 
           the parameters as needed.

        </description>

        <filter>*.trn</filter>

        <default><item>/usgs/cpkgs/isis3/datalocal/hayabusa2/calibration/onc/hyb2oncCalibration????.trn</item></default>

        <default><item>$hayabusa2/calibration/onc/hyb2oncCalibration????.trn</item></default>

      </parameter>

      

    </group>