Unverified Commit 9a4e0dc7 authored by Jesse Mapel's avatar Jesse Mapel Committed by GitHub
Browse files

[DO NOT MERGE] OREX socetframsettings changes Fixes #5235 (#476) 

* Update socetframesettings:  fix OSIRIS-REx; rename variables; cleanup.

N.B. This work was originally done in a custome socetframesettings-only
     Github repo branch here:

     https://github.com/drbitboy/isis_socetframesettings/tree/20171116/cleanup

Corrected ORX MapCam and ORX PolyCam isiscamToSocetcam matrix; other cleanup

- Add exception for non-MapCam, non-PolyCam ORX inputs; added many comments

Change variable names so the each name accurately describes the variable

Other cleanup:

- Use consistent naming for concepts
  - Ocentric; not Ocentric or BodyFixed
- Use SpiceDouble instead of double
- Use macros to initialize vectors and matrices
- Use twovec_c to calculate matrix instead of combinations of sin/cos-Lat/Lon
- Remove whitespace from blank lines
- Improve comments
- Remove else-if from assignments to isisFocalPlane2SocetPlate matrix; check
  that result is a rotation matrix
- Use vscl_c instead of loop to convert km to meters
- Eliminate radii variable
- Fix typo:  call to focalMap->DetectorLineOrigin() should be
  a call to focalMap->DetectorSampleOrigin()
- Add dummy function to to eliminate warning

* Modified socetframesettings for formatting

* Added socetframesettings mapcam test

* Added socetframesetting OREX PolyCam test
parent 8ca463ce

isis/src/socet/apps/socetframesettings/socetframesettings.cpp

+505 −124

File changed.

Preview size limit exceeded, changes collapsed.

isis/src/socet/apps/socetframesettings/socetframesettings.xml

+15 −7
Original line number Diff line number Diff line
@@ -70,6 +70,14 @@ 
      Added support for OSIRIS-REx instrument and updated documentation to reflect the

      changes. Fixes #3898.

    </change>

    <change name="Brian Carcich" date="2018-03-07">

      Fixed rotations for OSIRIS-REX instruments. Added documentation and cleaned up

      variable names. References #5235.

    </change>

    <change name="Jesse Mapel" date="2018-10-11">

      Changes to better match coding standards and clarify

      documentation. Added OREX test cases. References #5235.

    </change>



</history>

isis/src/socet/apps/socetframesettings/tsts/orexMapCam/Makefile

0 → 100644
+18 −0
Original line number Diff line number Diff line 
APPNAME = socetframesettings



include $(ISISROOT)/make/isismake.tsts



#Use sed to lower output precision to 5 decimal places in output txt files



commands:

#Test Celemintine, UVVIS

	$(APPNAME) from=$(INPUT)/20170923T000306S549_map_iofL2b_V002.cub \

	  to=$(OUTPUT)/20170923T000306S549_map_iofL2b_V002.set \

	  ss_project=D:\\data\\TEST \

	  ss_img_loc=TEST \

	  ss_input_path=E:\\IMAGES\\TEST\\ \

	  ss_cam_calib_path=C:\\SOCET_SET_5.6.0\\internal_dbs\\CAM\\ > /dev/null;

	cat $(OUTPUT)/20170923T000306S549_map_iofL2b_V002.set | \

	 sed 's/\([0-9]\.[0-9][0-9][0-9][0-9][0-9]\)\([0-9]*\)/\1/g' > \

	 $(OUTPUT)/sed_20170923T000306S549_map_iofL2b_V002_settings.txt

	$(RM) $(OUTPUT)/20170923T000306S549_map_iofL2b_V002.set

isis/src/socet/apps/socetframesettings/tsts/orexPolyCam/Makefile

0 → 100644
+18 −0
Original line number Diff line number Diff line 
APPNAME = socetframesettings



include $(ISISROOT)/make/isismake.tsts



#Use sed to lower output precision to 5 decimal places in output txt files



commands:

#Test Celemintine, UVVIS

	$(APPNAME) from=$(INPUT)/20190329T183101S0400_pol_iofL2pan.cub \

	  to=$(OUTPUT)/20190329T183101S0400_pol_iofL2pan.set \

	  ss_project=D:\\data\\TEST \

	  ss_img_loc=TEST \

	  ss_input_path=E:\\IMAGES\\TEST\\ \

	  ss_cam_calib_path=C:\\SOCET_SET_5.6.0\\internal_dbs\\CAM\\ > /dev/null;

	cat $(OUTPUT)/20190329T183101S0400_pol_iofL2pan.set | \

	 sed 's/\([0-9]\.[0-9][0-9][0-9][0-9][0-9]\)\([0-9]*\)/\1/g' > \

	 $(OUTPUT)/sed_20190329T183101S0400_pol_iofL2pan_settings.txt

	$(RM) $(OUTPUT)/20190329T183101S0400_pol_iofL2pan.set