Updated from trunk (651593ef) · Commits · aflab / astrogeology / ISIS3

isis/src/galileo/apps/gllssi2isis/gllssi2isis.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,8 @@
		</change>
		<change name="Tyler Wilson" date="2015-10-02">
		Added the fixPvl function that fixes Pvl files from orbit I24 which have
		a comment tag that is not closed off. #Ref 2344
		a comment tag that is not closed off. Also a new test pvlFix to test this
		change. #Ref 2344.
		</change>

isis/src/galileo/apps/gllssi2isis/tsts/pvlFix/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -3,6 +3,6 @@ APPNAME = gllssi2isis
		include $(ISISROOT)/make/isismake.tsts

		commands:
		$(APPNAME) FROM=$(INPUT)/4911s.lbl \
		$(APPNAME) FROM=$(INPUT)/4911s.pvl \
		TO=$(OUTPUT)/4911s.cub > /dev/null;
		catlab FROM=$(OUTPUT)/4911s.cub to=$(OUTPUT)/4911s.txt > /dev/null;
		catlab FROM=$(OUTPUT)/4911s.cub to=$(OUTPUT)/4911s.pvl > /dev/null;

isis/src/galileo/apps/gllssi2isis/tsts/pvlFix/input/4911s.lbl

deleted100644 → 0

+0 −151

Original line number	Diff line number	Diff line
		CCSD3ZF0000100000001NJPL3IF0PDS200000001 = SFDU_LABEL

		/* File Format and Length */
		RECORD_TYPE = FIXED_LENGTH
		RECORD_BYTES = 800
		FILE_RECORDS = 803

		/* Pointers to Data Objects */
		^IMAGE_HEADER = ("4911S.IMG",1)
		^IMAGE = ("4911S.IMG",4)

		/* Description/Catalog Keywords */
		DATA_SET_ID = "GO-J/JSA-SSI-4-REDR-V1.0"
		SPACECRAFT_NAME = "GALILEO ORBITER"
		INSTRUMENT_NAME = "SOLID STATE IMAGING SYSTEM"

		/* Time tags and observation descriptors */
		SPACECRAFT_CLOCK_CNT_PARTITION = 1
		SPACECRAFT_CLOCK_START_COUNT = "05207949.11"
		IMAGE_TIME = 1999-10-11T04:51:12.894Z
		IMAGE_ID = "24I0068"
		ORBIT_NUMBER = 24
		OBSERVATION_ID = "24ISCOLCHS02"
		TARGET_NAME = "IO"
		NTV_TIME_FROM_CLOSEST_APPROACH = "000T02:49:11Z"
		NTV_SAT_TIME_FROM_CLOSEST_APRH = "000T00:19:07Z"
		NOTE = "RECONSTRUCTED IMAGE, NOT IN PDS-COMPLIANT REDR FORMAT"

		/* Camera and spacecraft state parameters */
		FILTER_NAME = "CLEAR"
		FILTER_NUMBER = 0
		EXPOSURE_DURATION = 6.25
		GAIN_MODE_ID = "400K"
		FRAME_DURATION = 2.333
		LIGHT_FLOOD_STATE_FLAG = "OFF"
		EXPOSURE_TYPE = "NORMAL"
		BLEMISH_PROTECTION_FLAG = "OFF"
		INVERTED_CLOCK_STATE_FLAG = "NOT INVERTED"
		ON_CHIP_MOSAIC_FLAG = "N"
		COMPRESSION_TYPE = "HUFFMAN"
		ENTROPY = 0.000
		TELEMETRY_FORMAT_ID = "AI8"
		OBSTRUCTION_ID = "NOT POSSIBLE"
		INSTRUMENT_MODE_ID = "N/A"

		/* Viewing Geometry */
		/* Note: These viewing geometry parameters are best estimates */
		/* at the time this picture label was generated. */
		POSITIVE_LONGITUDE_DIRECTION = WEST

		/* Spacecraft Geometry */
		TARGET_CENTER_DISTANCE = 8.965335e+03
		CENTRAL_BODY_DISTANCE = 4.294315e+05
		SUB_SPACECRAFT_LATITUDE = 1.281
		SUB_SPACECRAFT_LONGITUDE = 150.758
		SUB_SPACECRAFT_LINE = -1101.302
		SUB_SPACECRAFT_LINE_SAMPLE = 10012.448
		SUB_SPACECRAFT_AZIMUTH = 352.490

		/* Camera and Lighting Geometry */
		/* Resolution of HORIZONTAL_PIXEL_SCALE, */
		/* VERTICAL_PIXEL_SCALE, and SLANT_DISTANCE */
		/* is calculated from the light source values in */
		/* INTERCEPT_POINT_LATITUDE, INTERCEPT_POINT_LONGITUDE,*/
		/* INTERCEPT_POINT_LINE and INTERCEPT_POINT_LINE_SAMPLE keywords */
		/* If the target is a Ring keyword RING_RADIUS */
		/* is substituted for INTERCEPT_POINT_LATITUDE */
		/* If the TARGET_NAME = J RINGS, viewing geometry was */
		/* calculated using Jupiter as the target. */
		TWIST_ANGLE = 295.478
		CONE_ANGLE = 157.529
		RIGHT_ASCENSION = 49.905
		DECLINATION = 19.751
		NORTH_AZIMUTH = 259.903
		SMEAR_AZIMUTH = "UNK"
		SMEAR_MAGNITUDE = "UNK"
		HORIZONTAL_PIXEL_SCALE = 6.414920e+02
		VERTICAL_PIXEL_SCALE = 1.874650e+02
		SLANT_DISTANCE = 8.312450e+03
		SOLAR_DISTANCE = 7.410850e+08
		SUB_SOLAR_LATITUDE = 2.991
		SUB_SOLAR_LONGITUDE = 163.341
		SUB_SOLAR_AZIMUTH = 346.384
		INCIDENCE_ANGLE = 51.333
		EMISSION_ANGLE = 75.343
		PHASE_ANGLE = 24.049
		LOCAL_HOUR_ANGLE = 128.608
		INTERCEPT_POINT_LATITUDE = 2.661
		INTERCEPT_POINT_LONGITUDE = 214.741
		INTERCEPT_POINT_LINE = 200.0
		INTERCEPT_POINT_LINE_SAMPLE = 200.0

		/* Target radii */
		A_AXIS_RADIUS = 1.830000e+03
		B_AXIS_RADIUS = 1.818700e+03
		C_AXIS_RADIUS = 1.815300e+03

		/* Processing parameters */
		MEAN_RADIANCE = "N/A"
		MEAN_REFLECTANCE = "N/A"
		REFLECTANCE_SCALING_FACTOR = "N/A"
		RADIANCE_SCALING_FACTOR = "N/A"
		UNEVEN_BIT_WEIGHT_CORR_FLAG = "N/A"
		DARK_CURRENT_FILE_NAME = "N/A"
		SLOPE_FILE_NAME = "N/A"
		BLEMISH_FILE_NAME = "N/A"
		SHUTTER_OFFSET_FILE_NAME = "N/A"
		DATA_TYPE = LSB_UNSIGNED_INTEGER
		SOURCE_PRODUCT_ID = {"S000105A.BSP","S000105A.BSP","N/A","CKI24AGE.PLT","NULL"
		}
		PROCESSING_HISTORY_TEXT = "VICAR programs run: "
		PRODUCT_TYPE = "REDR"


		/* HUFFMAN Lossless compression */
		ENCODING_COMPRESSION_RATIO = 1.591
		ENCODING_MIN_COMPRESSION_RATIO = 1.393
		ENCODING_MAX_COMPRESSION_RATIO = 1.631
		HUFFMAN_TABLE_TYPE = "UNIFORM"
		CUT_OUT_WINDOW = {1,1,800,800}
		PRODUCT_VERSION_ID = 0

		/* VICAR IMAGE HEADER Object */
		OBJECT = IMAGE_HEADER
		INTERCHANGE_FORMAT = BINARY
		HEADER_TYPE = VICAR2
		BYTES = 2400
		RECORDS = 3
		^DESCRIPTION = "VICAR2.TXT"
		END_OBJECT

		/* Image Object */
		OBJECT = IMAGE
		LINES = 800
		LINE_SAMPLES = 800
		SAMPLE_BITS = 8
		SAMPLE_TYPE = UNSIGNED_INTEGER
		INVALID_CONSTANT = "N/A"
		LINE_PREFIX_BYTES = 0
		^LINE_PREFIX_STRUCTURE = ""
		END_OBJECT
		END

		END


		END



		END

isis/src/galileo/apps/gllssi2isis/tsts/pvlFix/truth/4911s.txt

deleted100644 → 0

+0 −76

Original line number	Diff line number	Diff line
		Object = IsisCube
		Object = Core
		StartByte = 65537
		Format = Tile
		TileSamples = 800
		TileLines = 800

		Group = Dimensions
		Samples = 800
		Lines = 800
		Bands = 1
		End_Group

		Group = Pixels
		Type = UnsignedByte
		ByteOrder = Lsb
		Base = 0.0
		Multiplier = 1.0
		End_Group
		End_Object

		Group = Instrument
		SpacecraftName = "Galileo Orbiter"
		InstrumentId = "SOLID STATE IMAGING SYSTEM"
		TargetName = IO
		SpacecraftClockStartCount = 05207949.11
		StartTime = 1999-10-11T04:51:12.894
		ExposureDuration = 0.00625 <seconds>
		GainModeId = 400000
		TelemetryFormat = AI8
		LightFloodStateFlag = OFF
		InvertedClockStateFlag = "NOT INVERTED"
		BlemishProtectionFlag = OFF
		ExposureType = NORMAL
		ReadoutMode = Contiguous
		FrameDuration = 2.333 <seconds>
		Summing = 1
		FrameModeId = FULL
		End_Group

		Group = Archive
		DataSetId = GO-J/JSA-SSI-4-REDR-V1.0
		ProductId = 24I0068
		ObservationId = 24ISCOLCHS02
		DataType = RADIANCE
		CalTargetCode = 24
		End_Group

		Group = BandBin
		FilterName = CLEAR
		FilterNumber = 0
		Center = 0.611 <micrometers>
		Width = .44 <micrometers>
		End_Group

		Group = Kernels
		NaifFrameCode = -77001
		End_Group
		End_Object

		Object = Label
		Bytes = 65536
		End_Object

		Object = History
		Name = IsisCube
		StartByte = 705537
		Bytes = 588
		End_Object

		Object = OriginalLabel
		Name = IsisCube
		StartByte = 706125
		Bytes = 6302
		End_Object
		End

isis/src/qisis/apps/qnet/qnet.xml

+15 −6

Original line number	Diff line number	Diff line
		@@ -177,7 +177,8 @@
		chosen from the combo-boxes under the labels "Left Measure" and
		"Right Measure". Only the control measure in the right view can be
		moved, so if you want to move the reference measure, you must display it
		in the right view.
		in the right view. You can select the previous or next right measure with the
		shortcuts <strong>PageUp</strong> and <strong>PageDown</strong>, respectively.
		</p>
		<h4>Changing Measure Locations</h4>
		<p>
		@@ -211,23 +212,26 @@
		and the keyboard arrow keys may be used to move the right view while
		blinking.</li>
		<li><strong>Find:</strong> Center the right view so that the same latitude /
		longitude is under the crosshair as the left view.</li>
		longitude is under the crosshair as the left view. <strong>Shortcut: F</strong></li>
		</ul>
		<p>Below the right view:</p>
		<ul>
		<li><strong>Register:</strong> Sub-pixel register the the right view to
		the left view.</li>
		the left view. <strong>Shortcut: R</strong></li>
		<li><strong>Undo Registration:</strong> Undo the sub-pixel registration.
		<strong>Shortcut: U</strong></li>
		<li><strong>Save Measure:</strong> Save the control measure under the
		right view to the edit control point.</li>
		right view to the edit control point. <strong>Shortcut: M</strong></li>
		</ul>
		<p>Along the bottom:</p>
		<ul>
		<li><strong>Add Measure(s) to Point:</strong> Add control measure(s) to the
		current control point. A dialog will show all cubes in the network with
		those that fall at this control point's latitude and longitude highlighted.
		All cubes chosen will be added as control measures to this control point.</li>
		All cubes chosen will be added as control measures to this control point.
		<strong>Shortcut: A</strong></li>
		<li><strong>Save Point:</strong> Save the edit control point to the control
		network.</li>
		network. <strong>Shortcut: P</strong></li>
		</ul>
		<h3>Measure Table window</h3>
		<p>This window will show all control measure data for the current edit control
		@@ -538,5 +542,10 @@
		<change name="Ian Humphrey" date="2015-10-07">
		Updated icons. Fixes #1041.
		</change>
		<change name="Ian Humphrey" date="2015-11-19">
		Added shortcuts to Qnet Tool window for selecting right measures, registration, saving
		measures, saving a point, adding a new measure, find, and saving the control network. Fixes
		#2324.
		</change>
		</history>
		</application>