Commit 2cb0b8d5 authored by Adam Goins's avatar Adam Goins
Browse files

additonal changes

parent 14736c12
Loading
Loading
Loading
Loading
+37 −5
Original line number Original line Diff line number Diff line
@@ -33,16 +33,16 @@
using namespace std;
using namespace std;
namespace Isis {
namespace Isis {
  /**
  /**
   * Constructor for the Kaguya MI Camera Model
   * Constructor for the Kaguya TC Camera Model
   *
   *
   * @param lab Pvl Label to create the camera model from
   * @param lab Pvl Label to create the camera model from
   *
   *
   * @internal
   * @internal
   *   @history 2012-06-14 Orrin Thomas - original version
   *   @history 2018-10-02 Adam Goins & Jeannie Backer - Original Version
   */
   */
  KaguyaTcCamera::KaguyaTcCamera(Cube &cube) : FramingCamera(cube) {
  KaguyaTcCamera::KaguyaTcCamera(Cube &cube) : FramingCamera(cube) {
    m_instrumentNameLong = " ";
    m_instrumentNameLong  = "Terrain Camera";
    m_instrumentNameShort = " ";
    m_instrumentNameShort = "TC";
    m_spacecraftNameLong  = "Kaguya";
    m_spacecraftNameLong  = "Kaguya";
    m_spacecraftNameShort = "Kaguya";
    m_spacecraftNameShort = "Kaguya";


@@ -97,6 +97,38 @@ namespace Isis {
                                                        double exposureDuration) {
                                                        double exposureDuration) {
    return FramingCamera::ShutterOpenCloseTimes(time, exposureDuration);
    return FramingCamera::ShutterOpenCloseTimes(time, exposureDuration);
  }
  }


  /**
   * CK frame ID -  - Instrument Code from spacit run on CK
   *
   * @return @b int The appropriate instrument code for the "Camera-matrix"
   *         Kernel Frame ID
   */
  int KaguyaTcCamera::CkFrameId() const {
     return (-40000);
    }

  /**
   * CK Reference ID - J2000
   *
   * @return @b int The appropriate instrument code for the "Camera-matrix"
   *         Kernel Reference ID
   */
  int KaguyaTcCamera::CkReferenceId() const {
    return (1);
  }

  /**
   * SPK Reference ID - J2000
   *
   * @return @b int The appropriate instrument code for the Spacecraft
   *         Kernel Reference ID
   */
  int KaguyaTcCamera::SpkReferenceId() const { 
    return (1);
  }

}
}




+3 −21
Original line number Original line Diff line number Diff line
@@ -32,29 +32,11 @@ namespace Isis {
      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
      virtual std::pair <iTime, iTime> ShutterOpenCloseTimes(double time,
                                                             double exposureDuration);
                                                             double exposureDuration);


      /**
       virtual int CkFrameId() const;
       * CK frame ID -  - Instrument Code from spacit run on CK
       virtual int CkReferenceId() const;
       *
       virtual int SpkReferenceId() const;
       * @return @b int The appropriate instrument code for the "Camera-matrix"
       *         Kernel Frame ID
       */
      virtual int CkFrameId() const { return (-40000); }


      /**
       * CK Reference ID - J2000
       *
       * @return @b int The appropriate instrument code for the "Camera-matrix"
       *         Kernel Reference ID
       */
      virtual int CkReferenceId() const { return (1); }


      /**
       * SPK Reference ID - J2000
       *
       * @return @b int The appropriate instrument code for the Spacecraft
       *         Kernel Reference ID
       */
      virtual int SpkReferenceId() const { return (1); }
  };
  };
};
};
#endif
#endif