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

Partial merge from v006LibrariesV2 branch to ipce branch. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7132 41f8697f-d340-4b68-9986-7bafba869bb8
parent d5571180

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

+13 −12
Original line number Diff line number Diff line
@@ -72,11 +72,12 @@ namespace Isis { 
    // Setup focal plane map

    CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode());

    

    focalMap->SetDetectorOrigin(

      Spice::getDouble("INS" + toString(naifIkCode()) +

                       "_BORESIGHT_SAMPLE"),

      Spice::getDouble("INS" + toString(naifIkCode()) +

                       "_BORESIGHT_LINE"));

    // lines and samples added to the pvl in the order you

    // call getDouble()

    double bLines = Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_LINE");

    double bSamples = Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_SAMPLE");



    focalMap->SetDetectorOrigin(bSamples, bLines);



    // Setup detector map

    CameraDetectorMap *detMap =  new CameraDetectorMap(this);

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

+15 −12
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ namespace Isis { 
   *   @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument

   *                           members and methods and removed implementation of these methods

   *                           since Camera now handles this. References #2335.

   *   @history 2016-09-14 Kelvin Rodriguez - Enforced the order in which BORESIGHT_LINE and

   *                           BORESIGHT_SAMPLE are added to the PVL. Part of porting to

   *                           OSX 10.11 

   */

  class AmicaCamera : public FramingCamera {

    public: