Commit 745c346f authored by Marc Costa's avatar Marc Costa
Browse files

Fixed merge conflicts

parents 38f1c5c6 273ab86d

kernels/ck/emrsp_rm_surf_test_interp-tlm_0003_v001.bc→kernels/ck/emrsp_rm_surf_test_interp-tlm_0003_v002.bc

+10 KiB (548 KiB)

File changed and moved.

No diff preview for this file type.

View original file
View changed file

kernels/fk/emrsp_rm_v006.tf

+2 −2
Original line number Diff line number Diff line
@@ -2396,7 +2396,7 @@ Wheel Frame definitions 
      TKFRAME_-1740850_AXES           = (      1,      2,     3 )

      TKFRAME_-1740850_ANGLES         = (    0.0,    0.0,   0.0 )



      FRAME_RM_WHEEL_LR_STR           = -17408551

      FRAME_RM_WHEEL_LR_STR           = -1740851

      FRAME_-1740851_NAME             = 'RM_WHEEL_LR_FIX'

      FRAME_-1740851_CLASS            =  3

      FRAME_-1740851_CLASS_ID         = -1740851
@@ -2423,7 +2423,7 @@ Wheel Frame definitions 
      TKFRAME_-1740860_AXES           = (      1,      2,     3 )

      TKFRAME_-1740860_ANGLES         = (    0.0,    0.0,   0.0 )



      FRAME_RM_WHEEL_RR_STR           = -17408561

      FRAME_RM_WHEEL_RR_STR           = -1740861

      FRAME_-1740861_NAME             = 'RM_WHEEL_RR_FIX'

      FRAME_-1740861_CLASS            =  3

      FRAME_-1740861_CLASS_ID         = -1740861

kernels/mk/emrsp_test_rec_0003_v002.tm→kernels/mk/emrsp_test_rec_0003_v003.tm

+3 −3
Original line number Diff line number Diff line 
KPL/MK



Meta-kernel for ExoMarsRSP Dataset v070 -- Reconstruction 20200603_001

Meta-kernel for ExoMarsRSP Dataset v071 -- Reconstruction 20200603_001

==========================================================================



   This meta-kernel lists the ExoMarsRSP Operational SPICE kernels
@@ -48,7 +48,7 @@ Implementation Notes 


-------------------



   This file was created on June 3, 2020 by Marc Costa Sitja ESA/ESAC.

   This file was created on October 14, 2020 by Marc Costa Sitja ESA/ESAC.





   \begindata
@@ -80,7 +80,7 @@ Implementation Notes 
                           '$KERNELS/ik/emrsp_rm_clupi_v000.ti'

                           '$KERNELS/ik/emrsp_sp_ts_v000.ti'



                           '$KERNELS/ck/emrsp_rm_surf_test_interp-tlm_0003_v001.bc'

                           '$KERNELS/ck/emrsp_rm_surf_test_interp-tlm_0003_v002.bc'

                           '$KERNELS/ck/emrsp_rm_surf_test_rec_0003_v001.bc'

                           '$KERNELS/ck/emrsp_sp_surf_20200318_v001.bc'

kernels/mk/emrsp_test_tlm_0003_v002.tm→kernels/mk/emrsp_test_tlm_0003_v003.tm

+2 −4
Original line number Diff line number Diff line 
KPL/MK



Meta-kernel for ExoMarsRSP Dataset v070 -- Telemetry 20209603_001

Meta-kernel for ExoMarsRSP Dataset v071 -- Telemetry 20201014_001

==========================================================================



   This meta-kernel lists the ExoMarsRSP Operational SPICE kernels
@@ -80,13 +80,11 @@ Implementation Notes 
                           '$KERNELS/ik/emrsp_rm_clupi_v000.ti'

                           '$KERNELS/ik/emrsp_sp_ts_v000.ti'



                           '$KERNELS/ck/emrsp_rm_surf_test_interp-tlm_0003_v001.bc'

                           '$KERNELS/ck/emrsp_rm_surf_test_rec_0003_v001.bc'

                           '$KERNELS/ck/emrsp_rm_surf_test_interp-tlm_0003_v002.bc'

                           '$KERNELS/ck/emrsp_sp_surf_20200318_v001.bc'



                           '$KERNELS/spk/emrsp_ls-plan_v001.bsp'

                           '$KERNELS/spk/emrsp_rm_test_interp-tlm_0003_v001.bsp'

                           '$KERNELS/spk/emrsp_rm_test_rec_0003_v001.bsp'

                           '$KERNELS/spk/emrsp_rm_sites_v001.bsp'

                           '$KERNELS/spk/emrsp_rm_struct_v001.bsp'

                           '$KERNELS/spk/emrsp_sp_struct_v002.bsp'