Skip to content

Commit

Permalink
Merge pull request #37 from pds-data-dictionaries/release/1.22.0.0
Browse files Browse the repository at this point in the history
PDS4 Information Model Release 1.22.0.0
  • Loading branch information
acraugh authored Jun 6, 2024
2 parents 668ceeb + d0f93ab commit b6b0b78
Show file tree
Hide file tree
Showing 156 changed files with 30,950 additions and 938 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
make github
cd ..
- name: Setup Pages
uses: actions/configure-pages@v4
uses: actions/configure-pages@v5

- name: Upload artifact
uses: actions/upload-pages-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ldd-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
lddtool_development_release: ${{ matrix.lddtool_development_release }}
test_path: ${{ env.REGRESSION_TEST_PATH }}
logs_path: ${{ env.LOGS_PATH }}
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
token: ${{ secrets.ADMIN_GITHUB_TOKEN || github.token }}

- name: Check logs
run: |
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"Sort Key","Type","Name","Version","Name Space Id","Description","Steward","Value Type","Minimum Cardinality","Maximum Cardinality","Minimum Value","Maximum Value","Minimum Characters","Maximum Characters","Unit of Measure Type","Specified Unit Id","Attribute Concept","Conceptual Domain"
"Sort Key","Type","Name","Version","Name Space Id","Description","Steward","Value Type","Minimum Cardinality","Maximum Cardinality","Minimum Value","Maximum Value","Minimum Characters","Maximum Characters","Unit of Measure Type","Specified Unit Id","Attribute Concept","Conceptual Domain"
"sp:Filter:1 ","Class","Filter","1.0.0.0","sp"," The Filter class identifies the filter associated with a specific band or bin along a spectral axis in an Array object. The filter may be identified by either name, identifier, or number or some combination of these. ","sbn","","","","","","","","","","",""
"sp:Filter:2 sp:filter_name:1 ","Attribute","filter_name","n/a","sp"," The filter_name attribute provides the commonly-used name of the instrument filter through which an image or measurement was acquired or which is associated with a given instrument mode. ","sbn","ASCII_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","SHORT_STRING"
"sp:Filter:2 sp:filter_number:1 ","Attribute","filter_number","n/a","sp"," The filter_number attribute provides the numeric identifier of an instrument filter through which an image or measurement was acquired or which is associated with a given instrument mode. Within the bin class of a spectral data object, it identifies the filter through which data in the given band were acquired. ","sbn","ASCII_NonNegative_Integer","0","1","0","18446744073709551615","Unbounded","Unbounded","Units_of_None","none","TBD_classConcept","INTEGER"
Expand Down
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:sp Version:1.3.2.0 - Tue Apr 02 23:20:02 UTC 2024 -->
<!-- PDS4 Schematron for Name Space Id:sp Version:1.3.2.0 - Fri May 24 20:12:44 UTC 2024 -->
<!-- Generated from the PDS4 Information Model Version 1.16.0.0 - System Build 11.1 -->
<!-- *** This PDS4 schematron file is an operational deliverable. *** -->
<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
Expand Down Expand Up @@ -216,39 +216,13 @@
The attribute @unit must be equal to one of the following values '1/cm', '1/m', '1/nm', 'cm**-1', 'm**-1', 'nm**-1'.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sp:Bin_Wavenumber/sp:bin_width_wavenumber" role="warning">
<sch:assert test="@unit != 'cm**-1'">
<title>sp:Bin_Wavenumber/sp:bin_width_wavenumber role="warning"/sp:bin_width_wavenumber</title>
The unit value cm**-1 is deprecated and should not be used.</sch:assert>
<sch:assert test="@unit != 'm**-1'">
<title>sp:Bin_Wavenumber/sp:bin_width_wavenumber role="warning"/sp:bin_width_wavenumber</title>
The unit value m**-1 is deprecated and should not be used.</sch:assert>
<sch:assert test="@unit != 'nm**-1'">
<title>sp:Bin_Wavenumber/sp:bin_width_wavenumber role="warning"/sp:bin_width_wavenumber</title>
The unit value nm**-1 is deprecated and should not be used.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sp:Bin_Wavenumber/sp:center_wavenumber">
<sch:assert test="@unit = ('1/cm', '1/m', '1/nm', 'cm**-1', 'm**-1', 'nm**-1')">
<title>sp:Bin_Wavenumber/sp:center_wavenumber/sp:center_wavenumber</title>
The attribute @unit must be equal to one of the following values '1/cm', '1/m', '1/nm', 'cm**-1', 'm**-1', 'nm**-1'.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sp:Bin_Wavenumber/sp:center_wavenumber" role="warning">
<sch:assert test="@unit != 'cm**-1'">
<title>sp:Bin_Wavenumber/sp:center_wavenumber role="warning"/sp:center_wavenumber</title>
The unit value cm**-1 is deprecated and should not be used.</sch:assert>
<sch:assert test="@unit != 'm**-1'">
<title>sp:Bin_Wavenumber/sp:center_wavenumber role="warning"/sp:center_wavenumber</title>
The unit value m**-1 is deprecated and should not be used.</sch:assert>
<sch:assert test="@unit != 'nm**-1'">
<title>sp:Bin_Wavenumber/sp:center_wavenumber role="warning"/sp:center_wavenumber</title>
The unit value nm**-1 is deprecated and should not be used.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sp:Bin_Width_Constant">
<sch:let name="spectype" value="string(ancestor::sp:Spectral_Characteristics/sp:spectral_bin_type)"/>
Expand Down Expand Up @@ -294,19 +268,6 @@
The attribute @unit must be equal to one of the following values '1/cm', '1/m', '1/nm', 'cm**-1', 'm**-1', 'nm**-1'.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sp:Bin_Width_Constant/sp:bin_width_wavenumber" role="warning">
<sch:assert test="@unit != 'cm**-1'">
<title>sp:Bin_Width_Constant/sp:bin_width_wavenumber role="warning"/sp:bin_width_wavenumber</title>
The unit value cm**-1 is deprecated and should not be used.</sch:assert>
<sch:assert test="@unit != 'm**-1'">
<title>sp:Bin_Width_Constant/sp:bin_width_wavenumber role="warning"/sp:bin_width_wavenumber</title>
The unit value m**-1 is deprecated and should not be used.</sch:assert>
<sch:assert test="@unit != 'nm**-1'">
<title>sp:Bin_Width_Constant/sp:bin_width_wavenumber role="warning"/sp:bin_width_wavenumber</title>
The unit value nm**-1 is deprecated and should not be used.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sp:Bin_Width_Lookup">
<sch:assert test="count(*) = 1">
Expand Down Expand Up @@ -465,19 +426,6 @@
The attribute @unit must be equal to one of the following values '1/cm', '1/m', '1/nm', 'cm**-1', 'm**-1', 'nm**-1'.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sp:Observation_Parameters/sp:resolution_limit_wavenumber" role="warning">
<sch:assert test="@unit != 'cm**-1'">
<title>sp:Observation_Parameters/sp:resolution_limit_wavenumber role="warning"/sp:resolution_limit_wavenumber</title>
The unit value cm**-1 is deprecated and should not be used.</sch:assert>
<sch:assert test="@unit != 'm**-1'">
<title>sp:Observation_Parameters/sp:resolution_limit_wavenumber role="warning"/sp:resolution_limit_wavenumber</title>
The unit value m**-1 is deprecated and should not be used.</sch:assert>
<sch:assert test="@unit != 'nm**-1'">
<title>sp:Observation_Parameters/sp:resolution_limit_wavenumber role="warning"/sp:resolution_limit_wavenumber</title>
The unit value nm**-1 is deprecated and should not be used.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sp:Rectangular_FOV/sp:body_positive_pole_position_angle">
<sch:assert test="@unit = ('arcmin', 'arcsec', 'deg', 'hr', 'mrad', 'rad')">
Expand Down Expand Up @@ -843,79 +791,27 @@
The attribute @unit must be equal to one of the following values '1/cm', '1/m', '1/nm', 'cm**-1', 'm**-1', 'nm**-1'.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sp:Uniformly_Sampled_Wavenumber/sp:bin_width_wavenumber" role="warning">
<sch:assert test="@unit != 'cm**-1'">
<title>sp:Uniformly_Sampled_Wavenumber/sp:bin_width_wavenumber role="warning"/sp:bin_width_wavenumber</title>
The unit value cm**-1 is deprecated and should not be used.</sch:assert>
<sch:assert test="@unit != 'm**-1'">
<title>sp:Uniformly_Sampled_Wavenumber/sp:bin_width_wavenumber role="warning"/sp:bin_width_wavenumber</title>
The unit value m**-1 is deprecated and should not be used.</sch:assert>
<sch:assert test="@unit != 'nm**-1'">
<title>sp:Uniformly_Sampled_Wavenumber/sp:bin_width_wavenumber role="warning"/sp:bin_width_wavenumber</title>
The unit value nm**-1 is deprecated and should not be used.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sp:Uniformly_Sampled_Wavenumber/sp:first_center_wavenumber">
<sch:assert test="@unit = ('1/cm', '1/m', '1/nm', 'cm**-1', 'm**-1', 'nm**-1')">
<title>sp:Uniformly_Sampled_Wavenumber/sp:first_center_wavenumber/sp:first_center_wavenumber</title>
The attribute @unit must be equal to one of the following values '1/cm', '1/m', '1/nm', 'cm**-1', 'm**-1', 'nm**-1'.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sp:Uniformly_Sampled_Wavenumber/sp:first_center_wavenumber" role="warning">
<sch:assert test="@unit != 'cm**-1'">
<title>sp:Uniformly_Sampled_Wavenumber/sp:first_center_wavenumber role="warning"/sp:first_center_wavenumber</title>
The unit value cm**-1 is deprecated and should not be used.</sch:assert>
<sch:assert test="@unit != 'm**-1'">
<title>sp:Uniformly_Sampled_Wavenumber/sp:first_center_wavenumber role="warning"/sp:first_center_wavenumber</title>
The unit value m**-1 is deprecated and should not be used.</sch:assert>
<sch:assert test="@unit != 'nm**-1'">
<title>sp:Uniformly_Sampled_Wavenumber/sp:first_center_wavenumber role="warning"/sp:first_center_wavenumber</title>
The unit value nm**-1 is deprecated and should not be used.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sp:Uniformly_Sampled_Wavenumber/sp:last_center_wavenumber">
<sch:assert test="@unit = ('1/cm', '1/m', '1/nm', 'cm**-1', 'm**-1', 'nm**-1')">
<title>sp:Uniformly_Sampled_Wavenumber/sp:last_center_wavenumber/sp:last_center_wavenumber</title>
The attribute @unit must be equal to one of the following values '1/cm', '1/m', '1/nm', 'cm**-1', 'm**-1', 'nm**-1'.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sp:Uniformly_Sampled_Wavenumber/sp:last_center_wavenumber" role="warning">
<sch:assert test="@unit != 'cm**-1'">
<title>sp:Uniformly_Sampled_Wavenumber/sp:last_center_wavenumber role="warning"/sp:last_center_wavenumber</title>
The unit value cm**-1 is deprecated and should not be used.</sch:assert>
<sch:assert test="@unit != 'm**-1'">
<title>sp:Uniformly_Sampled_Wavenumber/sp:last_center_wavenumber role="warning"/sp:last_center_wavenumber</title>
The unit value m**-1 is deprecated and should not be used.</sch:assert>
<sch:assert test="@unit != 'nm**-1'">
<title>sp:Uniformly_Sampled_Wavenumber/sp:last_center_wavenumber role="warning"/sp:last_center_wavenumber</title>
The unit value nm**-1 is deprecated and should not be used.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sp:Uniformly_Sampled_Wavenumber/sp:sampling_interval_wavenumber">
<sch:assert test="@unit = ('1/cm', '1/m', '1/nm', 'cm**-1', 'm**-1', 'nm**-1')">
<title>sp:Uniformly_Sampled_Wavenumber/sp:sampling_interval_wavenumber/sp:sampling_interval_wavenumber</title>
The attribute @unit must be equal to one of the following values '1/cm', '1/m', '1/nm', 'cm**-1', 'm**-1', 'nm**-1'.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sp:Uniformly_Sampled_Wavenumber/sp:sampling_interval_wavenumber" role="warning">
<sch:assert test="@unit != 'cm**-1'">
<title>sp:Uniformly_Sampled_Wavenumber/sp:sampling_interval_wavenumber role="warning"/sp:sampling_interval_wavenumber</title>
The unit value cm**-1 is deprecated and should not be used.</sch:assert>
<sch:assert test="@unit != 'm**-1'">
<title>sp:Uniformly_Sampled_Wavenumber/sp:sampling_interval_wavenumber role="warning"/sp:sampling_interval_wavenumber</title>
The unit value m**-1 is deprecated and should not be used.</sch:assert>
<sch:assert test="@unit != 'nm**-1'">
<title>sp:Uniformly_Sampled_Wavenumber/sp:sampling_interval_wavenumber role="warning"/sp:sampling_interval_wavenumber</title>
The unit value nm**-1 is deprecated and should not be used.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="sp:Uniformly_Sampled_Wavenumber/sp:sampling_scale">
<sch:assert test=". = ('Linear', 'Logarithmic')">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
PDS4 Local Data Dictionary Processing Report

Configuration:
LDDTool Version 14.3.0
LDDTool Version 15.1.0
LDD Version Id: 1.3.2.0
LDD Label Version Id: 1.22
LDD Discipline (T/F): true
LDD Namespace URL: http://pds.nasa.gov/pds4/
LDD URN Prefix: urn:nasa:pds:
Time Tue Apr 02 23:20:02 UTC 2024
Time Fri May 24 20:12:44 UTC 2024
Common Schema [PDS4_PDS_1G00.xsd]
Common Schematron [PDS4_PDS_1G00.sch]
IM Version Id: 1.16.0.0
IM Namespace Id: pds
IM Label Version Id: 1.22
IM Object Model [UpperModel.pont]
IM Data Dictionary [dd11179.pins]
IM Configuration File [MDPTNConfigClassDisp.xml]
IM Glossary [Glossary.pins]
IM Document Spec [DMDocument.pins]

Expand Down
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.16.0.0 Tue Apr 02 23:20:02 UTC 2024 -->
<!-- PDS4 XML product label for PDS4 V1.16.0.0 Fri May 24 20:12:44 UTC 2024 -->
<!-- Generated from the PDS4 Information Model V1.16.0.0 - System Build 11.1 -->
<!-- *** This PDS4 XML product label is an operational deliverable. *** -->
<?xml-model href="https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1G00.sch"
Expand All @@ -17,7 +17,7 @@
<product_class>Product_XML_Schema</product_class>
<Modification_History>
<Modification_Detail>
<modification_date>2024-04-02</modification_date>
<modification_date>2024-05-24</modification_date>
<version_id>1.22</version_id>
<description>This is the system generated PDS4 product label for PDS4 XML Schema and Schematron files.</description>
</Modification_Detail>
Expand All @@ -26,7 +26,7 @@
<File_Area_XML_Schema>
<File>
<file_name>PDS4_SP_1G00_1320.xsd</file_name>
<creation_date_time>2024-04-02T16:20:02</creation_date_time>
<creation_date_time>2024-05-24T13:12:44</creation_date_time>
<file_size unit="byte">71175</file_size>
<records>1488</records>
</File>
Expand All @@ -40,9 +40,9 @@
<File_Area_XML_Schema>
<File>
<file_name>PDS4_SP_1G00_1320.sch</file_name>
<creation_date_time>2024-04-02T16:20:02</creation_date_time>
<file_size unit="byte">74072</file_size>
<records>926</records>
<creation_date_time>2024-05-24T13:12:44</creation_date_time>
<file_size unit="byte">67153</file_size>
<records>822</records>
</File>
<XML_Schema>
<name>PDS4_SP_1G00_1320.sch</name>
Expand Down
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:sp Version:1.3.2.0 - Tue Apr 02 23:20:02 UTC 2024 -->
<!-- PDS4 XML/Schema for Name Space Id:sp Version:1.3.2.0 - Fri May 24 20:12:44 UTC 2024 -->
<!-- Generated from the PDS4 Information Model Version 1.16.0.0 - System Build 11.1 -->
<!-- *** This PDS4 product schema is an operational deliverable. *** -->
<!-- -->
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"Sort Key","Type","Name","Version","Name Space Id","Description","Steward","Value Type","Minimum Cardinality","Maximum Cardinality","Minimum Value","Maximum Value","Minimum Characters","Maximum Characters","Unit of Measure Type","Specified Unit Id","Attribute Concept","Conceptual Domain"
"Sort Key","Type","Name","Version","Name Space Id","Description","Steward","Value Type","Minimum Cardinality","Maximum Cardinality","Minimum Value","Maximum Value","Minimum Characters","Maximum Characters","Unit of Measure Type","Specified Unit Id","Attribute Concept","Conceptual Domain"
"sp:Filter:1 ","Class","Filter","1.0.0.0","sp"," The Filter class identifies the filter associated with a specific band or bin along a spectral axis in an Array object. The filter may be identified by either name, identifier, or number or some combination of these. ","sbn","","","","","","","","","","",""
"sp:Filter:2 sp:filter_name:1 ","Attribute","filter_name","n/a","sp"," The filter_name attribute provides the commonly-used name of the instrument filter through which an image or measurement was acquired or which is associated with a given instrument mode. ","sbn","ASCII_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","SHORT_STRING"
"sp:Filter:2 sp:filter_number:1 ","Attribute","filter_number","n/a","sp"," The filter_number attribute provides the numeric identifier of an instrument filter through which an image or measurement was acquired or which is associated with a given instrument mode. Within the bin class of a spectral data object, it identifies the filter through which data in the given band were acquired. ","sbn","ASCII_NonNegative_Integer","0","1","0","18446744073709551615","Unbounded","Unbounded","Units_of_None","none","TBD_classConcept","INTEGER"
Expand Down
Loading

0 comments on commit b6b0b78

Please sign in to comment.