Unverified Commit 77ae86d2 authored by jcwbacker's avatar jcwbacker Committed by GitHub
Browse files

Merge pull request #437 from AstroKEW78/osiris_summing 

Rosetta Osiris summing
parents 3cc97130 07859a0b

isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.cpp

+10 −2
Original line number Diff line number Diff line
@@ -42,10 +42,12 @@ namespace Isis { 
   *

   * @param cube The image cube.

   *

   * @author Stuart Sides

   * @author ????-??-?? Stuart Sides

   *

   * @internal

   * @history modified by Sasha Brownsberger

   *   @history ????-??-?? Stuart Sides - Original version. 

   *   @history ????-??-?? Sasha Brownsberger 

   *   @history 2018-09-24 Kaj Williams - Added binning support.

   */



  RosettaOsirisCamera::RosettaOsirisCamera(Cube &cube) : FramingCamera(cube) {
@@ -86,6 +88,12 @@ namespace Isis { 
    // the first line on the label is actually the last line.

    detectorMap->SetStartingDetectorLine(2050 - cube.lineCount() - (double) inst["FirstLine"]);



    //Read the pixel averaging width/height and update the detector map:

    double pixelAveragingWidth=(double) inst["PixelAveragingWidth"];

    double pixelAveragingHeight=(double) inst["PixelAveragingHeight"];

    detectorMap->SetDetectorSampleSumming(pixelAveragingWidth);

    detectorMap->SetDetectorLineSumming(pixelAveragingHeight);



    RosettaOsirisCameraDistortionMap* distortionMap = new RosettaOsirisCameraDistortionMap(this);



    // Setup the ground and sky map

isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ namespace Isis { 
   *   @history 2015-05-21 Sasha Brownsberger - Original Version.

   *   @history 2017-06-02 Jesse Mapel - Added a distortion map Fixes #4496.

   *   @history 2017-04-11 Jesse Mapel - Added subwindowing. Fixes #5394.

   *   @history 2018-09-25 Kaj Williams - Added binning. Due to the difficulty in obtaining test images which are binned, this is currently untested.

   */

  class RosettaOsirisCamera : public FramingCamera {

    public: