Updated ADRON to ADRON-RM (9ccae02e) · Commits · Alessandro Frigeri / MaMISSspice

kernels/fk/emrsp_rm_v005.tf→kernels/fk/emrsp_rm_v006.tf

+21 −17

Original line number	Diff line number	Diff line
		@@ -12,6 +12,10 @@ ExoMarsRSP Rosalind Franklin Rover Module (RM) Frames Kernel
		Version and Date
		------------------------------------------------------------------------

		Version 0.0.6 -- June 1, 2019 -- Marc Costa Sitja, ESAC/ESA

		Corrected FRAME_RM_MAST_ZERO frame definition

		Version 0.0.5 -- December 20, 2019 -- Marc Costa Sitja, ESAC/ESA

		Corrected FRAME_RM_MAST_ZERO frame definition
		@@ -205,9 +209,9 @@ RM NAIF ID Codes -- Summary Section

		RM_ISEM -174200

		ADRON name/IDs:
		ADRON-RM name/IDs:

		RM_ADRON -174300
		RM_ADRON-RM -174300

		WISDOM name/IDs:

		@@ -293,9 +297,9 @@ RM Frames
		------------------------------------------------
		RM_ISEM RM_PB FIXED -174200

		ADRON frames:
		ADRON-RM frames:
		------------------------------------------------
		RM_ADRON RM_ROVER FIXED -174300
		RM_ADRON-RM RM_ROVER FIXED -174300

		WISDOM frames:
		------------------------------------------------
		@@ -2040,15 +2044,15 @@ ISEM Frame Definition
		\begintext


		ADRON Frames
		ADRON-RM Frames
		------------------------------------------------------------------------

		This section of the file contains the definitions of the Autonomous
		Detector of Radiation of Neutrons Onboard Rover (ADRON) frames.
		Detector of Radiation of Neutrons Onboard Rover (ADRON-RM) frames.


		ADRON Frame Tree
		~~~~~~~~~~~~~~~~
		ADRON-RM Frame Tree
		~~~~~~~~~~~~~~~~~~~

		The diagram below shows the ADRON frame hierarchy.

		@@ -2062,10 +2066,10 @@ ADRON Frame Tree
		----------


		ADRON Frame Definition
		ADRON-RM Frame Definition
		~~~~~~~~~~~~~~~~~~~~~~

		The ISEM reference frame -- RM_ADRON -- is attached to the ADRON
		The ISEM reference frame -- RM_ADRON-RM -- is attached to the ADRON-RM
		instrument and is fixed with respect to the rover frame -- RM_ROVER --, and
		defined as follows:

		@@ -2078,7 +2082,7 @@ ADRON Frame Definition
		- the origin is located on the instrument center.


		The following diagram describes the RM_ADRON reference frame:
		The following diagram describes the RM_ADRON-RM reference frame:

		-Y Rover side view:
		-------------------
		@@ -2107,8 +2111,8 @@ ADRON Frame Definition

		\begindata

		FRAME_RM_ADRON = -174300
		FRAME_-174300_NAME = 'RM_ADRON'
		FRAME_RM_ADRON-RM = -174300
		FRAME_-174300_NAME = 'RM_ADRON-RM'
		FRAME_-174300_CLASS = 4
		FRAME_-174300_CLASS_ID = -174300
		FRAME_-174300_CENTER = -174
		@@ -2207,7 +2211,7 @@ WISDOM Frame Definitions:
		`-..-' `-..-' `-..-'


		These sets of keywords define the ADRON frame:
		These sets of keywords define the WISDOM frame:

		\begindata

		@@ -2781,16 +2785,16 @@ RM NAIF ID Codes -- Definitions

		\begintext

		ADRON:
		ADRON-RM:
		-----------
		RM_ADRON -174300
		RM_ADRON-RM -174300

		The mappings summarised in this table are implemented by the keywords
		below.

		\begindata

		NAIF_BODY_NAME += ( 'RM_ADRON' )
		NAIF_BODY_NAME += ( 'RM_ADRON-RM' )
		NAIF_BODY_CODE += ( -174300 )

		\begintext

kernels/ik/aareadme.txt

+5 −4

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ ExoMarsRSP IK files
		This ``aareadme.txt'' file describes the contents of the kernels/ik
		directory of the ExoMarsRSP SPICE data server.

		It was last modified on April 28, 2020 by Marc Costa Sitja, ESAC/ESA.
		It was last modified on May 26, 2020 by Marc Costa Sitja, ESAC/ESA.


		Brief Summary
		@@ -36,7 +36,7 @@ File naming conventions
		isem for ISEM
		clupi for CLUPI
		moma for MOMA
		adron for ADRON-RM
		adron-rm for ADRON-RM
		loccam for LocCam
		navcam for NavCam
		wisdom for WISDOM
		@@ -57,11 +57,12 @@ File naming conventions
		Current IK Kernels Set
		--------------------------------------------------------

		emrsp_rm_adron_vNNN.ti
		emrsp_rm_adron-rm_vNNN.ti

		SPICE IK file providing optics, detector, and field-of-view (FOV)
		parameters for the Rover Module Autonomous Detector of Radiation of
		Neutrons Onboard Rover (ADRON). Created by the ESA SPICE Service (ESS).
		Neutrons Onboard Rover (ADRON-RM). Created by the ESA SPICE
		Service (ESS).


		emrsp_rm_clupi_vNNN.ti

kernels/ik/emrsp_rm_adron_v000.ti→kernels/ik/emrsp_rm_adron-rm_v000.ti

+13 −13

Original line number	Diff line number	Diff line
		KPL/IK

		ADRON Instrument kernel
		ADRON-RM Instrument kernel
		===============================================================================

		This instrument kernel (I-kernel) contains the Autonomous Detector of
		Radiation of Neutrons Onboard Rover (ADRON) optics, detector, and
		Radiation of Neutrons Onboard Rover (ADRON-RM) optics, detector, and
		field-of-view parameters.


		@@ -81,16 +81,16 @@ Naming Conventions and Conventions for Specifying Data
		Data items are specified using ``keyword=value'' assignments [1].
		All keywords referencing values in this I-kernel start with the
		characters `INS' followed by the NAIF RM instrument ID code.
		The ADRON instrument IDs are defined in [1] as follows:
		The ADRON-RM instrument IDs are defined in [1] as follows:

		Instrument name ID
		-------------------- -------
		RM_ADRON -174300
		RM_ADRON-RM -174300


		The remainder of the keyword is an underscore character followed by
		the unique name of the data item. For example, the boresight of
		the RM_ADRON is specified by
		the RM_ADRON-RM is specified by

		INS-174300_BORESIGHT

		@@ -110,13 +110,13 @@ Overview
		Apparent FOV Layout
		---------------------------------------------------------------------------

		This section provides a diagram illustrating the ADRON apparent FOVs
		This section provides a diagram illustrating the ADRON-RM apparent FOVs
		layout in the corresponding reference frame.

		According to [3] the ADRON spatial resolution is a circular area with a
		According to [3] the ADRON-RM spatial resolution is a circular area with a
		radius of about 1.5m at distance of 0.8 meters.

		The ADRON surface slit creates a circular field of view with half cone
		The ADRON-RM surface slit creates a circular field of view with half cone
		angle of 43.15 degrees. The following diagrams illustrate the above field of
		view in the instrument frame:

		@@ -146,7 +146,7 @@ Mounting Alignment
		-------------------------------------------------------------------------------

		Refer to the latest version of the RM Frames Definition Kernel
		(FK) [1] for the ADRON reference frames definitions and
		(FK) [1] for the ADRON-RM reference frames definitions and
		mounting alignment information.


		@@ -159,19 +159,19 @@ Optical Parameters
		FOV Definitions
		-------------------------------------------------------------------------------

		This section contains definitions for the ADRON FOVs. These definitions
		This section contains definitions for the ADRON-RM FOVs. These definitions
		are provided in the format required by the SPICE (CSPICE) function GETFOV
		(getfov_c).

		Please note that the FOV reference anlges are defined with halfangle values.
		The FoV definition corresponds to the NAIF Body Name: RM_ADRON.
		The FoV definition corresponds to the NAIF Body Name: RM_ADRON-RM.


		\begindata

		INS-174300_NAME = 'RM_ADRON'
		INS-174300_NAME = 'RM_ADRON-RM'
		INS-174300_BORESIGHT = ( 0.000 0.0000 -1.000 )
		INS-174300_FOV_FRAME = 'RM_ADRON'
		INS-174300_FOV_FRAME = 'RM_ADRON-RM'
		INS-174300_FOV_SHAPE = 'CIRCLE'
		INS-174300_FOV_CLASS_SPEC = 'ANGLES'
		INS-174300_FOV_REF_VECTOR = ( 1.000 0.000 0.0000 )

kernels/mk/emrsp_test_rec_0003_v001.tm

+2 −2

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ Implementation Notes

		KERNELS_TO_LOAD = (

		'$KERNELS/fk/emrsp_rm_v005.tf'
		'$KERNELS/fk/emrsp_rm_v006.tf'
		'$KERNELS/fk/emrsp_dsk_surfaces_v000.tf'
		'$KERNELS/fk/emrsp_sp_v004.tf'

		@@ -75,7 +75,7 @@ Implementation Notes
		'$KERNELS/ik/emrsp_rm_pancam_v001.ti'
		'$KERNELS/ik/emrsp_rm_loccam_v000.ti'
		'$KERNELS/ik/emrsp_rm_isem_v000.ti'
		'$KERNELS/ik/emrsp_rm_adron_v000.ti'
		'$KERNELS/ik/emrsp_rm_adron-rm_v000.ti'
		'$KERNELS/ik/emrsp_rm_wisdom_v000.ti'
		'$KERNELS/ik/emrsp_rm_clupi_v000.ti'
		'$KERNELS/ik/emrsp_sp_ts_v000.ti'

kernels/mk/emrsp_test_tlm_0003_v001.tm

+2 −2

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ Implementation Notes

		KERNELS_TO_LOAD = (

		'$KERNELS/fk/emrsp_rm_v005.tf'
		'$KERNELS/fk/emrsp_rm_v006.tf'
		'$KERNELS/fk/emrsp_dsk_surfaces_v000.tf'
		'$KERNELS/fk/emrsp_sp_v004.tf'

		@@ -75,7 +75,7 @@ Implementation Notes
		'$KERNELS/ik/emrsp_rm_pancam_v001.ti'
		'$KERNELS/ik/emrsp_rm_loccam_v000.ti'
		'$KERNELS/ik/emrsp_rm_isem_v000.ti'
		'$KERNELS/ik/emrsp_rm_adron_v000.ti'
		'$KERNELS/ik/emrsp_rm_adron-rm_v000.ti'
		'$KERNELS/ik/emrsp_rm_wisdom_v000.ti'
		'$KERNELS/ik/emrsp_rm_clupi_v000.ti'
		'$KERNELS/ik/emrsp_sp_ts_v000.ti'