Commit e275807d authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Added changes requested by Lucille Le Corre, Hayabusa.

parent fe18233a

isis/src/hayabusa/apps/amicacal/amicacal.cpp

+8 −4
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ void IsisMain() { 


  g_timeRatio = g_tvct / (g_exposureTime + g_tvct);

  g_darkCurrent = g_d0 * exp(g_d1 * g_temperature);

  g_calibrationScale = 1.0;

  QString g_units = "DN";



  if ( !sunDistanceAU(startTime, target, g_solarDist) ) {
@@ -303,7 +304,12 @@ void IsisMain() { 
                      _FILEINFO_);

  }



  if ( QString::compare(g_iofCorrection, "dn", Qt::CaseInsensitive) != 0 ) {

  //  Add DN/S as an output option

  if ( QString::compare(g_iofCorrection, "dn/s", Qt::CaseInsensitive) == 0 ) {

      g_calibrationScale = 1.0 / g_exposureTime;

      g_units = "DN/S";

  }

  else if ( QString::compare(g_iofCorrection, "dn", Qt::CaseInsensitive) != 0 ) {

    /* Note - this radiance calibration scaling factor is applied to both radiance and iof

     * 

     * Units of RADIANCE
@@ -776,10 +782,8 @@ void calibrate(vector<Buffer *>& in, vector<Buffer *>& out) { 
    imageOut[i] = pow(imageOut[i], g_gamma) + g_L0 * imageOut[i] * exp(g_L1 * imageOut[i]);





    // 3) DARK Current - Currently negligible and removed

#if 0

    // 3) DARK Current

      imageOut[i] = imageOut[i] - g_darkCurrent;

#endif



    // 4) HOT Pixel Removal

isis/src/hayabusa/apps/amicacal/amicacal.xml

+15 −2
Original line number Diff line number Diff line
@@ -536,11 +536,15 @@ xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Applica 
    </change>

    <change name="Jeannie Backer" date="2017-11-28 ">

       Updated radiance calibration to divide by exposure duration, as done with reflectance. 

       Updated amicaCalibration????.trn file with latest radiance scale factor for sz 

       Updated amicaCalibration????.trn file with latest radiance scale factor for zs

       (value provided by L. Le Corre, PSI).

       Updated to use filter V solar flux on all calculations. 

       Brought code closer to ISIS3 coding standards. Fixes #5243

    </change>

    <change name="Lucille Le Corre" date="2018-01-30">

        Added DN/S as an output option. Apply dark current current as it was disabled

        in earlier versions.

    </change>

  </history>



  <groups>
@@ -641,6 +645,15 @@ xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Applica 
            </description>

          </option>



          <option value="DN/S">

            <brief>

              Convert to DN/S units 

            </brief> 

            <description>

                Raw DNs are divided by the exposure time, in seconds.

            </description>

          </option>



          <option value="RADIANCE">

            <brief>

              Convert to radiance unit