Skip to content

Commit

Permalink
PDS4 Information Model Release 1.21.0.0 (#33)
Browse files Browse the repository at this point in the history
* Prep for tagging PDS4 Release 1.21.0.0

* Auto-generated LDDs by PDSEN CI Bot

* Update pds4_versions.txt

remove 1 build versions

* Auto-generated LDDs by PDSEN CI Bot

* Update PDS4_MSN_IngestLDD.xml

add ephemeris_start_time and ephemeris_stop_time to have available at the mission MSN discipline level. We understand that similar attributes are also available under nucspec dictionary.

* Add logs from failed LDD generation

* Update PDS4_MSN_IngestLDD.xml

revert the removal of instrument_start/stop_time

* Auto-generated LDDs by PDSEN CI Bot

---------

Co-authored-by: PDSEN Ops <[email protected]>
Co-authored-by: PDSEN CI Bot <[email protected]>
Co-authored-by: Trent Hare <[email protected]>
  • Loading branch information
4 people authored Nov 13, 2023
1 parent 5de74ba commit 125d775
Show file tree
Hide file tree
Showing 90 changed files with 6,707 additions and 367 deletions.
17 changes: 11 additions & 6 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,14 @@ jobs:
if: github.actor != 'pdsen-ci'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}

- name: Set up Python 3
uses: actions/setup-python@v4
with:
python-version: '3.9'

- name: Install dependencies
run: |
Expand All @@ -48,32 +53,32 @@ jobs:
make github
cd ..
- name: Setup Pages
uses: actions/configure-pages@v2
uses: actions/configure-pages@v3

- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v2
with:
# Upload entire repository
path: '.'

- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@v2

pdfgen: # job 1
name: 'Build PDF'
runs-on: ubuntu-latest
if: github.actor != 'pdsen-ci'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}

- name: Set up Python 3
uses: actions/setup-python@v4
with:
python-version: '3.7'
python-version: '3.9'

- name: Install dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-ldd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
ssh-key: ${{ secrets.SSH_KEY }}
Expand All @@ -50,7 +50,7 @@ jobs:
matrix: ${{fromJson(needs.get_versions.outputs.matrix)}}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
ssh-key: ${{ secrets.SSH_KEY }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/submod-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
ssh-key: ${{ secrets.SSH_KEY }}
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
matrix: ${{fromJson(needs.get_versions.outputs.matrix)}}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
ssh-key: ${{ secrets.SSH_KEY }}
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
if: ${{ failure() && github.actor != 'pdsen-ci' }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
ssh-key: ${{ secrets.SSH_KEY }}
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
if: ${{ github.actor != 'pdsen-ci' }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
ssh-key: ${{ secrets.SSH_KEY }}
Expand Down

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
Expand Up @@ -11,6 +11,8 @@
"msn:Mission_Information:2 msn:instrument_clock_stop:1 ","Attribute","instrument_clock_stop","n/a","msn","The value of the clock returned by the instrument at the end of the observation. This may differ from the spacecraft clock due to several factors such as clock drift, or differences in definition of stop time, or differences in the time epoch between the instrument and the main spacecraft. ","img","ASCII_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","SHORT_STRING"
"msn:Mission_Information:2 msn:instrument_start_time:1 ","Attribute","instrument_start_time","n/a","msn","This is instrument_clock_start converted to UTC","img","ASCII_Date_Time_YMD_UTC","0","1","Unbounded","Unbounded","Unbounded","Unbounded","Units_of_None","none","TBD_classConcept","SHORT_STRING"
"msn:Mission_Information:2 msn:instrument_stop_time:1 ","Attribute","instrument_stop_time","n/a","msn","This is instrument_clock_stop converted to UTC","img","ASCII_Date_Time_YMD_UTC","0","1","Unbounded","Unbounded","Unbounded","Unbounded","Units_of_None","none","TBD_classConcept","SHORT_STRING"
"msn:Mission_Information:2 msn:ephemeris_start_time:1 ","Attribute","ephemeris_start_time","n/a","msn"," The time of data acquisition of the leading edge of the detector array. Value given in spacecraft event time (SCET), ET format. ","img","ASCII_Real","0","1","-1.7976931348623157e308","1.7976931348623157e308","Unbounded","Unbounded","Units_of_Time","none","TBD_classConcept","REAL"
"msn:Mission_Information:2 msn:ephemeris_stop_time:1 ","Attribute","ephemeris_stop_time","n/a","msn","The time of the end of data acquisition. This is often calculated from the start time and image duration. Value given in spacecraft event time (SCET), ET format. ","img","ASCII_Real","0","1","-1.7976931348623157e308","1.7976931348623157e308","Unbounded","Unbounded","Units_of_Time","none","TBD_classConcept","REAL"
"msn:Orbital_Mission:1 ","Class","Orbital_Mission","1.0.0.0","msn","The Orbital_Mission class provides information about an orbital mission.","img","","","","","","","","","","",""
"msn:Orbital_Mission:2 msn:start_orbit_number:1 ","Attribute","start_orbit_number","n/a","msn","The start_orbit_number attribute provides the first in a series of numbers that represent a set of orbital revolutions of one body around another.","img","ASCII_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","SHORT_STRING"
"msn:Orbital_Mission:2 msn:stop_orbit_number:1 ","Attribute","stop_orbit_number","n/a","msn","The stop_orbit_number attribute provides the last in a series of numbers that represent s set of orbital revolutions of one body around another.","img","ASCII_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","SHORT_STRING"
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:msn Version:1.3.0.2 - Wed Nov 01 15:58:20 UTC 2023 -->
<!-- PDS4 Schematron for Name Space Id:msn Version:1.3.0.3 - Wed Nov 08 21:52:59 UTC 2023 -->
<!-- Generated from the PDS4 Information Model Version 1.18.0.0 - System Build 12.1 -->
<!-- *** This PDS4 schematron file is an operational deliverable. *** -->
<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
Expand All @@ -18,6 +18,20 @@
<!-- lists. These two types of rules have been -->
<!-- merged together in the rules below. -->
<!-- ================================================ -->
<sch:pattern>
<sch:rule context="msn:Mission_Information/msn:ephemeris_start_time">
<sch:assert test="@unit = ('day', 'hr', 'julian day', 'microseconds', 'min', 'ms', 'ns', 's', 'yr')">
<title>msn:Mission_Information/msn:ephemeris_start_time/msn:ephemeris_start_time</title>
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="msn:Mission_Information/msn:ephemeris_stop_time">
<sch:assert test="@unit = ('day', 'hr', 'julian day', 'microseconds', 'min', 'ms', 'ns', 's', 'yr')">
<title>msn:Mission_Information/msn:ephemeris_stop_time/msn:ephemeris_stop_time</title>
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="msn:Mission_Information/msn:product_type_name">
</sch:rule>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ PDS4 Local Data Dictionary Processing Report

Configuration:
LDDTool Version 14.3.0
LDD Version Id: 1.3.0.2
LDD Version Id: 1.3.0.3
LDD Label Version Id: 1.24
LDD Discipline (T/F): true
LDD Namespace URL: http://pds.nasa.gov/pds4/
LDD URN Prefix: urn:nasa:pds:
Time Wed Nov 01 15:58:20 UTC 2023
Time Wed Nov 08 21:52:59 UTC 2023
Common Schema [PDS4_PDS_1I00.xsd]
Common Schematron [PDS4_PDS_1I00.sch]
IM Version Id: 1.18.0.0
Expand All @@ -30,8 +30,8 @@ Parameters:

Summary:
Classes 4
Attributes 28
Associations 31
Attributes 30
Associations 33
Error messages 0
Warning messages 0
Information messages 0
Expand All @@ -40,7 +40,7 @@ Detailed validation messages

Parsed Input - Header:
LDD Name Mission Information Commons
LDD Version 1.3.0.2
LDD Version 1.3.0.3
Full Name Trent Hare
Steward img
Namespace Id msn
Expand Down Expand Up @@ -70,8 +70,13 @@ Parsed Input - Header:
- add instrument_clock_stop and instrument_stop_time
- mission_phase_name and mission_phase_identifier to unbounded (multi)

1.3.0.3
- add ephemeris_start_time and ephemeris_stop_time to have available at the mission level.
We do understand et_start and et_stop are also available from the nucspec dictionary but
this is required by THEMIS which is not a nucspec instrument.


Last Modification Time 2020-11-01T08:48:00
Last Modification Time 2023-11-08T09:00:00Z
PDS4 Merge Flag false

Parsed Input - Attributes:
Expand Down Expand Up @@ -101,22 +106,6 @@ Parsed Input - Attributes:
description The product_type_name identifies a group of data products within a collection that have some property in common, such as processing level, resolution, or instrument-specific setting.
nillable true

name start_orbit_number
version 1.18
value data type ASCII_Short_String_Collapsed
description The start_orbit_number attribute provides the first in a series of numbers that represent a set of orbital revolutions of one body around another.
nillable true
minimum characters 1
maximum characters 255

name stop_orbit_number
version 1.18
value data type ASCII_Short_String_Collapsed
description The stop_orbit_number attribute provides the last in a series of numbers that represent s set of orbital revolutions of one body around another.
nillable true
minimum characters 1
maximum characters 255

name spacecraft_clock_start
version 1.18
value data type ASCII_Short_String_Collapsed
Expand Down Expand Up @@ -166,6 +155,36 @@ Parsed Input - Attributes:
description This is instrument_clock_stop converted to UTC
nillable true

name ephemeris_start_time
version 1.18
value data type ASCII_Real
description The time of data acquisition of the leading edge of the detector array. Value given in spacecraft event time (SCET), ET format.
nillable true
unit of measure type Units_of_Time

name ephemeris_stop_time
version 1.18
value data type ASCII_Real
description The time of the end of data acquisition. This is often calculated from the start time and image duration. Value given in spacecraft event time (SCET), ET format.
nillable true
unit of measure type Units_of_Time

name start_orbit_number
version 1.18
value data type ASCII_Short_String_Collapsed
description The start_orbit_number attribute provides the first in a series of numbers that represent a set of orbital revolutions of one body around another.
nillable true
minimum characters 1
maximum characters 255

name stop_orbit_number
version 1.18
value data type ASCII_Short_String_Collapsed
description The stop_orbit_number attribute provides the last in a series of numbers that represent s set of orbital revolutions of one body around another.
nillable true
minimum characters 1
maximum characters 255

name start_sol_number
version 1.18
value data type ASCII_Integer
Expand Down Expand Up @@ -329,6 +348,16 @@ Parsed Input - Classes:
maximum occurrences 1
reference type attribute_of

local identifier msn:ephemeris_start_time
minimum occurrences 0
maximum occurrences 1
reference type attribute_of

local identifier msn:ephemeris_stop_time
minimum occurrences 0
maximum occurrences 1
reference type attribute_of

local identifier msn:Orbital_Mission
minimum occurrences 0
maximum occurrences 1
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.18.0.0 Wed Nov 01 15:58:20 UTC 2023 -->
<!-- PDS4 XML product label for PDS4 V1.18.0.0 Wed Nov 08 21:52:59 UTC 2023 -->
<!-- Generated from the PDS4 Information Model V1.18.0.0 - System Build 12.1 -->
<!-- *** This PDS4 XML product label is an operational deliverable. *** -->
<?xml-model href="https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1I00.sch"
Expand All @@ -10,42 +10,42 @@
xsi:schemaLocation="http://pds.nasa.gov/pds4/pds/v1
https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1I00.xsd">
<Identification_Area>
<logical_identifier>urn:nasa:pds:system_bundle:xml_schema:msn-xml_schema_1.18.0.0_1.3.0.2</logical_identifier>
<logical_identifier>urn:nasa:pds:system_bundle:xml_schema:msn-xml_schema_1.18.0.0_1.3.0.3</logical_identifier>
<version_id>1.24</version_id>
<title>PDS4 XML Schema - MSN V1.3.0.2</title>
<title>PDS4 XML Schema - MSN V1.3.0.3</title>
<information_model_version>1.18.0.0</information_model_version>
<product_class>Product_XML_Schema</product_class>
<Modification_History>
<Modification_Detail>
<modification_date>2023-11-01</modification_date>
<modification_date>2023-11-08</modification_date>
<version_id>1.24</version_id>
<description>This is the system generated PDS4 product label for PDS4 XML Schema and Schematron files.</description>
</Modification_Detail>
</Modification_History>
</Identification_Area>
<File_Area_XML_Schema>
<File>
<file_name>PDS4_MSN_1I00_1302.xsd</file_name>
<creation_date_time>2023-11-01T08:58:20</creation_date_time>
<file_size unit="byte">24282</file_size>
<records>527</records>
<file_name>PDS4_MSN_1I00_1303.xsd</file_name>
<creation_date_time>2023-11-08T13:52:59</creation_date_time>
<file_size unit="byte">26548</file_size>
<records>577</records>
</File>
<XML_Schema>
<name>PDS4_MSN_1I00_1302.xsd</name>
<name>PDS4_MSN_1I00_1303.xsd</name>
<offset unit="byte">0</offset>
<parsing_standard_id>XML Schema Version 1.1</parsing_standard_id>
<description>This is a PDS4 XML Schema file for the declared namespace.</description>
</XML_Schema>
</File_Area_XML_Schema>
<File_Area_XML_Schema>
<File>
<file_name>PDS4_MSN_1I00_1302.sch</file_name>
<creation_date_time>2023-11-01T08:58:20</creation_date_time>
<file_size unit="byte">1691</file_size>
<records>32</records>
<file_name>PDS4_MSN_1I00_1303.sch</file_name>
<creation_date_time>2023-11-08T13:52:59</creation_date_time>
<file_size unit="byte">2662</file_size>
<records>46</records>
</File>
<XML_Schema>
<name>PDS4_MSN_1I00_1302.sch</name>
<name>PDS4_MSN_1I00_1303.sch</name>
<offset unit="byte">0</offset>
<parsing_standard_id>Schematron ISO/IEC 19757-3:2006</parsing_standard_id>
<description>This is the PDS4 Schematron file for the declared namespace. Schematron provides rule-based validation for XML Schema.</description>
Expand Down
Loading

0 comments on commit 125d775

Please sign in to comment.