Skip to content

Commit

Permalink
Merge pull request #13 from pds-data-dictionaries/add_x_axis_pa
Browse files Browse the repository at this point in the history 
Add `<x_axis_position_angle>` attribute
  • Loading branch information
@acraugh
acraugh authored May 3, 2024
2 parents 90cd396 + f797d8d commit aaab5dc
Show file tree
Hide file tree
Showing 57 changed files with 1,460 additions and 194 deletions.
2 changes: 1 addition & 1 deletion ...abfb61ad1/1.19.0.0/PDS4_SB_1J00_1000.JSON → ...c05ec230f/1.19.0.0/PDS4_SB_1J00_1000.JSON
View file

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions ...aabfb61ad1/1.19.0.0/PDS4_SB_1J00_1000.csv → ...0c05ec230f/1.19.0.0/PDS4_SB_1J00_1000.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,10 @@
"sb:Geometry_Vector_Time:2 sb:time_at_Sun_UTC_JD:1 ","Attribute","time_at_Sun_UTC_JD","n/a","sb"," The sb:time_at_Sun_UTC_YMD attribute give the local UTC time for an observer at the Sun at the time for which the corresponding positions and/or vectors were calculated. The time is stated in Julian date format, and must be given with units of ""julian day"". ","sbn","ASCII_Real","0","1","0.0","1.7976931348623157e308","Unbounded","Unbounded","Units_of_Time","none","TBD_classConcept","REAL"
"sb:Geometry_Vector_Time:2 sb:time_at_target_UTC_YMD:1 ","Attribute","time_at_target_UTC_YMD","n/a","sb"," The sb:time_at_target_UTC_YMD attribute give the local UTC time for an observer at the target at the time for which the corresponding positions and/or vectors were calculated. The time is in the ISO standard YYYY-MM-DDThh:mm:ss.sssZ format. ","sbn","ASCII_Date_Time_YMD_UTC","0","1","Unbounded","Unbounded","Unbounded","Unbounded","Units_of_None","none","TBD_classConcept","SHORT_STRING"
"sb:Geometry_Vector_Time:2 sb:time_at_target_UTC_JD:1 ","Attribute","time_at_target_UTC_JD","n/a","sb"," The sb:time_at_Sun_UTC_YMD attribute give the local UTC time for an observer at the target at the time for which the corresponding positions and/or vectors were calculated. The time is stated in Julian date format, and must be given with units of ""julian day"". ","sbn","ASCII_Real","0","1","0.0","1.7976931348623157e308","Unbounded","Unbounded","Units_of_Time","none","TBD_classConcept","REAL"
"sb:Instrument_Position_Angles:1 ","Class","Instrument_Position_Angles","1.0.0.0","sb"," The sb:Instrument_Position_Angles class provide position angles for the axes of the boresight on the place of the image, measured with respect to the location of the celestial North pole (also projected onto the plane of the image). ","sbn","","","","","","","","","","",""
"sb:Instrument_Position_Angles:2 sb:y_axis_position_angle:1 ","Attribute","y_axis_position_angle","n/a","sb"," The sb:y_axis_position_angle provides the angle measured East from celestial North in the plane of an image to the +Y axis of the instrument boresight. The values are in the range 0-360 degrees. ","sbn","ASCII_Real","1","1","0.0","360.0","Unbounded","Unbounded","Units_of_Angle","none","TBD_classConcept","REAL"
"sb:Instrument_Position_Angles:2 sb:z_axis_position_angle:1 ","Attribute","z_axis_position_angle","n/a","sb"," The sb:z_axis_position_angle provides the angle measured East from celestial North in the plane of an image to the +Z axis of the instrument boresight. The values are in the range 0-360 degrees. ","sbn","ASCII_Real","1","1","0.0","360.0","Unbounded","Unbounded","Units_of_Angle","none","TBD_classConcept","REAL"
"sb:Instrument_Position_Angles:1 ","Class","Instrument_Position_Angles","1.0.0.0","sb"," The sb:Instrument_Position_Angles class provide position angles for the axes of the boresight on the place of the image, measured with respect to the location of the celestial North pole (also projected onto the plane of the image). Only two axes should be specified, with the third being the instrument's boresight. Note that the instrument frame's axis orientation is assumed to be right-handed, so the direction of the boresight axis (into or out of the image plane) can be inferred from the relative positions of the other two. ","sbn","","","","","","","","","","",""
"sb:Instrument_Position_Angles:2 sb:x_axis_position_angle:1 ","Attribute","x_axis_position_angle","n/a","sb"," The sb:x_axis_position_angle provides the angle measured East from celestial North in the plane of an image to the +X axis of the instrument boresight. The values are in the range 0-360 degrees. ","sbn","ASCII_Real","0","1","0.0","360.0","Unbounded","Unbounded","Units_of_Angle","none","TBD_classConcept","REAL"
"sb:Instrument_Position_Angles:2 sb:y_axis_position_angle:1 ","Attribute","y_axis_position_angle","n/a","sb"," The sb:y_axis_position_angle provides the angle measured East from celestial North in the plane of an image to the +Y axis of the instrument boresight. The values are in the range 0-360 degrees. ","sbn","ASCII_Real","0","1","0.0","360.0","Unbounded","Unbounded","Units_of_Angle","none","TBD_classConcept","REAL"
"sb:Instrument_Position_Angles:2 sb:z_axis_position_angle:1 ","Attribute","z_axis_position_angle","n/a","sb"," The sb:z_axis_position_angle provides the angle measured East from celestial North in the plane of an image to the +Z axis of the instrument boresight. The values are in the range 0-360 degrees. ","sbn","ASCII_Real","0","1","0.0","360.0","Unbounded","Unbounded","Units_of_Angle","none","TBD_classConcept","REAL"
"sb:Instrument_to_J2000_Quaternion:1","Class","Instrument_to_J2000_Quaternion","1.0.0.0","sb"," The sb:Instrument_to_J2000_Quaternion is provides the quaterion to rotate from coordinates from the intrument frame to the EME J2000 frame for a single specific frame of a "Frame Sequence" observation. ","sbn","","","","","","","","","","",""
"sb:Instrument_to_J2000_Quaternion:2 sb:qcos:1 ","Attribute","qcos","n/a","sb"," The sb:qcos attribute is the ""cos(theta/2)"" element of a pointing quaternion. ","sbn","ASCII_Real","1","1","-1.000","1.000","Unbounded","Unbounded","Units_of_None","none","TBD_classConcept","REAL"
"sb:Instrument_to_J2000_Quaternion:2 sb:qsin1:1 ","Attribute","qsin1","n/a","sb"," The sb:qsin1 attribute is the ""ax*sin(theta/2)"" element of a pointing quaternion. ","sbn","ASCII_Real","1","1","-1.7976931348623157e308","1.7976931348623157e308","Unbounded","Unbounded","Units_of_None","none","TBD_classConcept","REAL"
Expand Down
16 changes: 15 additions & 1 deletion ...aabfb61ad1/1.19.0.0/PDS4_SB_1J00_1000.sch → ...0c05ec230f/1.19.0.0/PDS4_SB_1J00_1000.sch
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- PDS4 Schematron for Name Space Id:sb Version:1.0.0.0 - Wed Dec 20 23:45:09 UTC 2023 -->
<!-- PDS4 Schematron for Name Space Id:sb Version:1.0.0.0 - Thu Mar 07 21:13:01 UTC 2024 -->
<!-- Generated from the PDS4 Information Model Version 1.19.0.0 - System Build 13.0 -->
<!-- *** This PDS4 schematron file is an operational deliverable. *** -->
<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
Expand Down Expand Up @@ -179,6 +179,20 @@
The attribute @unit must be equal to one of the following values 'day', 'hr', 'julian day', 'microseconds', 'min', 'ms', 'ns', 's', 'yr'.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sb:Instrument_Position_Angles">
<sch:assert test="if (count(*) = 2) then true() else false()">
<title>sb:Instrument_Position_Angles/Rule</title>
In sb:Instrument_Position_Angles, exactly two of sb:x_axis_position_angle, sb:y_axis_position_angle, or sb:z_axis_position_angle must be provided.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sb:Instrument_Position_Angles/sb:x_axis_position_angle">
<sch:assert test="@unit = ('arcmin', 'arcsec', 'deg', 'hr', 'mrad', 'rad')">
<title>sb:Instrument_Position_Angles/sb:x_axis_position_angle/sb:x_axis_position_angle</title>
The attribute @unit must be equal to one of the following values 'arcmin', 'arcsec', 'deg', 'hr', 'mrad', 'rad'.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sb:Instrument_Position_Angles/sb:y_axis_position_angle">
<sch:assert test="@unit = ('arcmin', 'arcsec', 'deg', 'hr', 'mrad', 'rad')">
Expand Down
27 changes: 20 additions & 7 deletions ...aabfb61ad1/1.19.0.0/PDS4_SB_1J00_1000.txt → ...0c05ec230f/1.19.0.0/PDS4_SB_1J00_1000.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Configuration:
LDD Discipline (T/F): true
LDD Namespace URL: http://pds.nasa.gov/pds4/
LDD URN Prefix: urn:nasa:pds:
Time Wed Dec 20 23:45:09 UTC 2023
Time Thu Mar 07 21:13:01 UTC 2024
Common Schema [PDS4_PDS_1J00.xsd]
Common Schematron [PDS4_PDS_1J00.sch]
IM Version Id: 1.19.0.0
Expand All @@ -30,8 +30,8 @@ Parameters:

Summary:
Classes 27
Attributes 46
Associations 103
Attributes 47
Associations 104
Error messages 0
Warning messages 0
Information messages 0
Expand All @@ -52,7 +52,7 @@ Parsed Input - Header:

The initials "ACR" in the "submitter" field indicate Anne Raugh.

Last Modification Time 2023-12-20
Last Modification Time 2024-03-07
PDS4 Merge Flag false

Parsed Input - Attributes:
Expand Down Expand Up @@ -313,6 +313,14 @@ Parsed Input - Attributes:
value data type ASCII_Date_Time_YMD_UTC
description The sb:time_at_target_UTC_YMD attribute give the local UTC time for an observer at the target at the time for which the corresponding positions and/or vectors were calculated. The time is in the ISO standard YYYY-MM-DDThh:mm:ss.sssZ format.

name x_axis_position_angle
version 1.19
value data type ASCII_Real
description The sb:x_axis_position_angle provides the angle measured East from celestial North in the plane of an image to the +X axis of the instrument boresight. The values are in the range 0-360 degrees.
minimum value 0.0
maximum value 360.0
unit of measure type Units_of_Angle

name y_axis_position_angle
version 1.19
value data type ASCII_Real
Expand Down Expand Up @@ -777,20 +785,25 @@ Parsed Input - Classes:
reference type attribute_of

name Instrument_Position_Angles
description The sb:Instrument_Position_Angles class provide position angles for the axes of the boresight on the place of the image, measured with respect to the location of the celestial North pole (also projected onto the plane of the image).
description The sb:Instrument_Position_Angles class provide position angles for the axes of the boresight on the place of the image, measured with respect to the location of the celestial North pole (also projected onto the plane of the image). Only two axes should be specified, with the third being the instrument's boresight. Note that the instrument frame's axis orientation is assumed to be right-handed, so the direction of the boresight axis (into or out of the image plane) can be inferred from the relative positions of the other two.
is abstract false
is choice false
subclass of USER

Associations

local identifier sb:x_axis_position_angle
minimum occurrences 0
maximum occurrences 1
reference type attribute_of

local identifier sb:y_axis_position_angle
minimum occurrences 1
minimum occurrences 0
maximum occurrences 1
reference type attribute_of

local identifier sb:z_axis_position_angle
minimum occurrences 1
minimum occurrences 0
maximum occurrences 1
reference type attribute_of

Expand Down
16 changes: 8 additions & 8 deletions ...aabfb61ad1/1.19.0.0/PDS4_SB_1J00_1000.xml → ...0c05ec230f/1.19.0.0/PDS4_SB_1J00_1000.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- PDS4 XML product label for PDS4 V1.19.0.0 Wed Dec 20 23:45:09 UTC 2023 -->
<!-- PDS4 XML product label for PDS4 V1.19.0.0 Thu Mar 07 21:13:01 UTC 2024 -->
<!-- Generated from the PDS4 Information Model V1.19.0.0 - System Build 13.0 -->
<!-- *** This PDS4 XML product label is an operational deliverable. *** -->
<?xml-model href="https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1J00.sch"
Expand All @@ -17,7 +17,7 @@
<product_class>Product_XML_Schema</product_class>
<Modification_History>
<Modification_Detail>
<modification_date>2023-12-20</modification_date>
<modification_date>2024-03-07</modification_date>
<version_id>1.25</version_id>
<description>This is the system generated PDS4 product label for PDS4 XML Schema and Schematron files.</description>
</Modification_Detail>
Expand All @@ -26,9 +26,9 @@
<File_Area_XML_Schema>
<File>
<file_name>PDS4_SB_1J00_1000.xsd</file_name>
<creation_date_time>2023-12-20T15:45:10</creation_date_time>
<file_size unit="byte">59018</file_size>
<records>1252</records>
<creation_date_time>2024-03-07T13:13:01</creation_date_time>
<file_size unit="byte">60277</file_size>
<records>1279</records>
</File>
<XML_Schema>
<name>PDS4_SB_1J00_1000.xsd</name>
Expand All @@ -40,9 +40,9 @@
<File_Area_XML_Schema>
<File>
<file_name>PDS4_SB_1J00_1000.sch</file_name>
<creation_date_time>2023-12-20T15:45:10</creation_date_time>
<file_size unit="byte">16285</file_size>
<records>266</records>
<creation_date_time>2024-03-07T13:13:01</creation_date_time>
<file_size unit="byte">17133</file_size>
<records>280</records>
</File>
<XML_Schema>
<name>PDS4_SB_1J00_1000.sch</name>
Expand Down
35 changes: 31 additions & 4 deletions ...aabfb61ad1/1.19.0.0/PDS4_SB_1J00_1000.xsd → ...0c05ec230f/1.19.0.0/PDS4_SB_1J00_1000.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- PDS4 XML/Schema for Name Space Id:sb Version:1.0.0.0 - Wed Dec 20 23:45:09 UTC 2023 -->
<!-- PDS4 XML/Schema for Name Space Id:sb Version:1.0.0.0 - Thu Mar 07 21:13:01 UTC 2024 -->
<!-- Generated from the PDS4 Information Model Version 1.19.0.0 - System Build 13.0 -->
<!-- *** This PDS4 product schema is an operational deliverable. *** -->
<!-- -->
Expand Down Expand Up @@ -306,11 +306,17 @@
position angles for the axes of the boresight on the place of
the image, measured with respect to the location of the
celestial North pole (also projected onto the plane of the
image). </xs:documentation>
image). Only two axes should be specified, with the third being
the instrument's boresight. Note that the instrument frame's
axis orientation is assumed to be right-handed, so the direction
of the boresight axis (into or out of the image plane) can be
inferred from the relative positions of the other two.
</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="y_axis_position_angle" type="sb:y_axis_position_angle" minOccurs="1" maxOccurs="1"> </xs:element>
<xs:element name="z_axis_position_angle" type="sb:z_axis_position_angle" minOccurs="1" maxOccurs="1"> </xs:element>
<xs:element name="x_axis_position_angle" type="sb:x_axis_position_angle" minOccurs="0" maxOccurs="1"> </xs:element>
<xs:element name="y_axis_position_angle" type="sb:y_axis_position_angle" minOccurs="0" maxOccurs="1"> </xs:element>
<xs:element name="z_axis_position_angle" type="sb:z_axis_position_angle" minOccurs="0" maxOccurs="1"> </xs:element>
</xs:sequence>
</xs:complexType>

Expand Down Expand Up @@ -1208,6 +1214,27 @@
</xs:restriction>
</xs:simpleType>

<xs:simpleType name="x_axis_position_angle_WO_Units">
<xs:restriction base="pds:ASCII_Real">
<xs:minInclusive value="0.0"/>
<xs:maxInclusive value="360.0"/>
</xs:restriction>
</xs:simpleType>

<xs:complexType name="x_axis_position_angle">
<xs:annotation>
<xs:documentation> The sb:x_axis_position_angle provides the angle
measured East from celestial North in the plane of an image to
the +X axis of the instrument boresight. The values are in the
range 0-360 degrees. </xs:documentation>
</xs:annotation>
<xs:simpleContent>
<xs:extension base="sb:x_axis_position_angle_WO_Units">
<xs:attribute name="unit" type="pds:Units_of_Angle" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>

<xs:simpleType name="y_axis_position_angle_WO_Units">
<xs:restriction base="pds:ASCII_Real">
<xs:minInclusive value="0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion ...abfb61ad1/1.20.0.0/PDS4_SB_1K00_1000.JSON → ...c05ec230f/1.20.0.0/PDS4_SB_1K00_1000.JSON
View file

Large diffs are not rendered by default.

Loading

0 comments on commit aaab5dc

Please sign in to comment.