Commit 2bc8460b authored by Kris Becker's avatar Kris Becker
Browse files

Added support for subimages and pixel binning to the Hayabusa AMICA camera model. Fixes #2180 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6080 41f8697f-d340-4b68-9986-7bafba869bb8
parent abe70e78

isis/src/hayabusa/objs/AmicaCamera/AmicaCamera.cpp

+10 −3
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ namespace Isis { 


    iTime centerTime = shuttertimes.first.Et() + exposureDuration / 2.0;



    // Setup detector map

    new CameraDetectorMap(this);



    // Setup focal plane map

    CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode());
@@ -76,6 +73,16 @@ namespace Isis { 
      Spice::getDouble("INS" + toString(naifIkCode()) +

                       "_BORESIGHT_LINE"));



    // Setup detector map

    CameraDetectorMap *detMap =  new CameraDetectorMap(this);

    detMap->SetStartingDetectorSample((int) inst["FirstSample"] + 1);

    detMap->SetStartingDetectorLine((int) inst["FirstLine"] + 1);

     

    // Handle summing

    int binning = inst["Binning"];

    detMap->SetDetectorLineSumming(binning);

    detMap->SetDetectorSampleSumming(binning);



    // Setup distortion map

    CameraDistortionMap *dmap = new CameraDistortionMap(this);

    dmap->SetDistortion(-130102);

isis/src/hayabusa/objs/AmicaCamera/AmicaCamera.h

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ namespace Isis { 
   *

   * @internal 

   *   @history 2013-11-27 Kris Becker - Original version

   *   @history 2015-02-26 Kris Becker - Implement starting detector specs; add

   *                         summing and AlphaCube support.

   */

  class AmicaCamera : public FramingCamera {

    public: