Skip to content

Commit

Permalink
Merge pull request #10 from pds-data-dictionaries/v0.6
Browse files Browse the repository at this point in the history 
v0.6.0.0
  • Loading branch information
@matthewtiscareno
matthewtiscareno authored Jul 19, 2023
2 parents f00a5c4 + ec887b2 commit a1f28d6
Show file tree
Hide file tree
Showing 17 changed files with 172 additions and 116 deletions.
30 changes: 21 additions & 9 deletions ...edd7ac2a/1.16.0.0/PDS4_VGR_1G00_0500.JSON → ...dd9106d0/1.16.0.0/PDS4_VGR_1G00_0600.JSON
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"dataDictionary": {
"Title": "PDS4 Data Dictionary" ,
"IM Version": "1.16.0.0" ,
"LDD Version": "0.5.0.0" ,
"Date": "2023-07-18T03:42:24Z" ,
"LDD Version": "0.6.0.0" ,
"Date": "2023-07-19T18:28:56Z" ,
"Description": "This document is a dump of the contents of the PDS4 Data Dictionary" ,
"namespaces": ["pds:", "vgr:"] ,
"classDictionary": [
Expand Down Expand Up @@ -1094,7 +1094,7 @@
"nameSpaceId": "vgr" ,
"steward": "rings" ,
"versionId": "1.16" ,
"description": "Edit mode of the camera, indicates amount of data read from the vidicon. '1:1' indicates the full-resolution of the vidicon. Other values include '3:4', '1:2', '1:3', '1:5', and '1:10'. Source Data Product Origin: Keyword EDIT_MODE_ID" ,
"description": "Edit mode of the camera, indicates amount of data read from the vidicon. '1:1' indicates the full-resolution of the vidicon. Other values include '3:5', '3:4', '1:2', '1:3', '1:5', and '1:10'. Source Data Product Origin: Keyword EDIT_MODE_ID" ,
"isNillable": "false" ,
"isEnumerated": "true" ,
"isDeprecated": "false" ,
Expand Down Expand Up @@ -1158,6 +1158,12 @@
"isDeprecated": "false"
}
}
, {"PermissibleValue": {
"value": "3:5" ,
"valueMeaning": "Vidicon readout was at three-fifths resolution." ,
"isDeprecated": "false"
}
}
]
}
}
Expand Down Expand Up @@ -2398,6 +2404,12 @@
"isDeprecated": "false"
}
}
, {"PermissibleValue": {
"value": "IM-Q" ,
"valueMeaning": "From original label. Meaning unclear." ,
"isDeprecated": "false"
}
}
, {"PermissibleValue": {
"value": "IM-S" ,
"valueMeaning": "From original label. Meaning unclear." ,
Expand Down Expand Up @@ -2981,12 +2993,12 @@
"isNillable": "false" ,
"isEnumerated": "false" ,
"isDeprecated": "false" ,
"dataType": "ASCII_Integer" ,
"dataTypeId": "0001_NASA_PDS_1.pds.ASCII_Integer" ,
"minimumCharacters": "Unbounded" ,
"maximumCharacters": "Unbounded" ,
"minimumValue": "-9223372036854775808" ,
"maximumValue": "9223372036854775807" ,
"dataType": "ASCII_Short_String_Collapsed" ,
"dataTypeId": "0001_NASA_PDS_1.pds.ASCII_Short_String_Collapsed" ,
"minimumCharacters": "1" ,
"maximumCharacters": "255" ,
"minimumValue": "Unbounded" ,
"maximumValue": "Unbounded" ,
"pattern": "null" ,
"unitOfMeasure": "null" ,
"unitOfMeasureId": "null" ,
Expand Down
6 changes: 4 additions & 2 deletions ...0edd7ac2a/1.16.0.0/PDS4_VGR_1G00_0500.csv → ...3dd9106d0/1.16.0.0/PDS4_VGR_1G00_0600.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"vgr:ISS:2 vgr:gain_mode_id:1 ","Attribute","gain_mode_id","n/a","vgr","The gain state of an instrument. Gain is a constant value, set by the observer, that indicates the approximate number of photon-excited electrons registered by the detector that correlate to one ""data number"" (DN). Source Data Product Origin: Keyword GAIN_MODE_ID","rings","ASCII_Short_String_Collapsed","1","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","SHORT_STRING"
"vgr:ISS:2 vgr:gain_mode_id:2 Value:High","Value","High","","","The higher of the two gain states for Voyager ISS"
"vgr:ISS:2 vgr:gain_mode_id:2 Value:Low","Value","Low","","","The lower of the two gain states for Voyager ISS"
"vgr:ISS:2 vgr:edit_mode_id:1 ","Attribute","edit_mode_id","n/a","vgr","Edit mode of the camera, indicates amount of data read from the vidicon. '1:1' indicates the full-resolution of the vidicon. Other values include '3:4', '1:2', '1:3', '1:5', and '1:10'. Source Data Product Origin: Keyword EDIT_MODE_ID","rings","ASCII_Short_String_Collapsed","1","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","SHORT_STRING"
"vgr:ISS:2 vgr:edit_mode_id:1 ","Attribute","edit_mode_id","n/a","vgr","Edit mode of the camera, indicates amount of data read from the vidicon. '1:1' indicates the full-resolution of the vidicon. Other values include '3:5', '3:4', '1:2', '1:3', '1:5', and '1:10'. Source Data Product Origin: Keyword EDIT_MODE_ID","rings","ASCII_Short_String_Collapsed","1","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","SHORT_STRING"
"vgr:ISS:2 vgr:edit_mode_id:2 Value:0:0","Value","0:0","","","The source data product from which this data product is being migrated has edit_mode_id of this value, indicating that the edit mode of the camera is unknown."
"vgr:ISS:2 vgr:edit_mode_id:2 Value:1:1","Value","1:1","","","Vidicon readout was at full resolution."
"vgr:ISS:2 vgr:edit_mode_id:2 Value:1:10","Value","1:10","","","Vidicon readout was at one-tenth resolution."
Expand All @@ -31,6 +31,7 @@
"vgr:ISS:2 vgr:edit_mode_id:2 Value:1:5","Value","1:5","","","Vidicon readout was at one-fifth resolution."
"vgr:ISS:2 vgr:edit_mode_id:2 Value:2:3","Value","2:3","","","Vidicon readout was at two-thirds resolution."
"vgr:ISS:2 vgr:edit_mode_id:2 Value:3:4","Value","3:4","","","Vidicon readout was at three-quarters resolution."
"vgr:ISS:2 vgr:edit_mode_id:2 Value:3:5","Value","3:5","","","Vidicon readout was at three-fifths resolution."
"vgr:ISS:2 vgr:filter_name:1 ","Attribute","filter_name","n/a","vgr","Optical filter used for the image. Source Data Product Origin: Keyword FILTER_NAME","rings","ASCII_Short_String_Collapsed","1","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","SHORT_STRING"
"vgr:ISS:2 vgr:filter_name:2 Value:Blue","Value","Blue","","","NAC Filter #2 or WAC Filter #1, spanning portions of the Visible spectrum from 0.43 to 0.53 microns"
"vgr:ISS:2 vgr:filter_name:2 Value:CH4/JS","Value","CH4/JS","","","WAC Filter #0, spanning portions of the Visible spectrum from 0.614 to 0.624 microns. Also called CH4_JS or METHANE-JST."
Expand Down Expand Up @@ -82,6 +83,7 @@
"vgr:ISS_Legacy_Label:2 vgr:legacy_label_telemetry_mode:2 Value:IM-9","Value","IM-9","","","From original label. Meaning unclear."
"vgr:ISS_Legacy_Label:2 vgr:legacy_label_telemetry_mode:2 Value:IM-K","Value","IM-K","","","From original label. Meaning unclear."
"vgr:ISS_Legacy_Label:2 vgr:legacy_label_telemetry_mode:2 Value:IM-O","Value","IM-O","","","From original label. Meaning unclear."
"vgr:ISS_Legacy_Label:2 vgr:legacy_label_telemetry_mode:2 Value:IM-Q","Value","IM-Q","","","From original label. Meaning unclear."
"vgr:ISS_Legacy_Label:2 vgr:legacy_label_telemetry_mode:2 Value:IM-S","Value","IM-S","","","From original label. Meaning unclear."
"vgr:ISS_Legacy_Label:2 vgr:legacy_label_telemetry_mode:2 Value:None","Value","None","","","This keyword had no value in the original label. Meaning unclear."
"vgr:ISS_Legacy_Label:2 vgr:legacy_label_telemetry_mode:2 Value:OC-3","Value","OC-3","","","From original label. Meaning unclear."
Expand Down Expand Up @@ -157,7 +159,7 @@
"vgr:ISS_Legacy_Label:2 vgr:legacy_label_wa_shutter_exposure:2 Value:Open","Value","Open","","","Unknown"
"vgr:ISS_Legacy_Label:2 vgr:legacy_label_wa_shutter_exposure:2 Value:Start Long","Value","Start Long","","","Unknown"
"vgr:Voyager_Telemetry:1 ","Class","Voyager_Telemetry","1.0.0.0","vgr","Container for elements describing the process of transferring Voyager data from the spacecraft to Earth.","rings","","","","","","","","","","",""
"vgr:Voyager_Telemetry:2 vgr:edr_tape_id:1 ","Attribute","edr_tape_id","n/a","vgr","Tape ID on which the image was originally stored Source Data Product Origin: EDR_TAPE_ID","rings","ASCII_Integer","0","1","-9223372036854775808","9223372036854775807","Unbounded","Unbounded","Units_of_None","none","TBD_classConcept","INTEGER"
"vgr:Voyager_Telemetry:2 vgr:edr_tape_id:1 ","Attribute","edr_tape_id","n/a","vgr","Tape ID on which the image was originally stored Source Data Product Origin: EDR_TAPE_ID","rings","ASCII_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","SHORT_STRING"
"vgr:Voyager_Telemetry:2 vgr:edr_file_number:1 ","Attribute","edr_file_number","n/a","vgr","File number within the tape where the image was originally stored Source Data Product Origin: EDR_FILE_NUMBER","rings","ASCII_Integer","0","1","-9223372036854775808","9223372036854775807","Unbounded","Unbounded","Units_of_None","none","TBD_classConcept","INTEGER"
"vgr:Voyager_Telemetry:2 vgr:dsn_station_number:1 ","Attribute","dsn_station_number","n/a","vgr","Numeric ID of DSN station where the image was received Source Data Product Origin: DSN_STATION_NUMBER","rings","ASCII_Integer","0","1","-9223372036854775808","9223372036854775807","Unbounded","Unbounded","Units_of_None","none","TBD_classConcept","INTEGER"
"vgr:Voyager_Telemetry:2 vgr:dsn_station_name:1 ","Attribute","dsn_station_name","n/a","vgr","Name of the DSN station where the image was received Source Data Product Origin: DSN_STATION_NAME","rings","ASCII_Short_String_Collapsed","0","1","Unbounded","Unbounded","1","255","Units_of_None","none","TBD_classConcept","SHORT_STRING"
Expand Down
10 changes: 5 additions & 5 deletions ...0edd7ac2a/1.16.0.0/PDS4_VGR_1G00_0500.sch → ...3dd9106d0/1.16.0.0/PDS4_VGR_1G00_0600.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:vgr Version:0.5.0.0 - Tue Jul 18 03:42:24 UTC 2023 -->
<!-- PDS4 Schematron for Name Space Id:vgr Version:0.6.0.0 - Wed Jul 19 18:28:56 UTC 2023 -->
<!-- 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 All @@ -20,9 +20,9 @@
<!-- ================================================ -->
<sch:pattern>
<sch:rule context="vgr:ISS/vgr:edit_mode_id">
<sch:assert test=". = ('0:0', '1:1', '1:10', '1:2', '1:3', '1:5', '2:3', '3:4')">
<sch:assert test=". = ('0:0', '1:1', '1:10', '1:2', '1:3', '1:5', '2:3', '3:4', '3:5')">
<title>vgr:ISS/vgr:edit_mode_id/vgr:edit_mode_id</title>
The attribute vgr:ISS/vgr:edit_mode_id must be equal to one of the following values '0:0', '1:1', '1:10', '1:2', '1:3', '1:5', '2:3', '3:4'.</sch:assert>
The attribute vgr:ISS/vgr:edit_mode_id must be equal to one of the following values '0:0', '1:1', '1:10', '1:2', '1:3', '1:5', '2:3', '3:4', '3:5'.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
Expand Down Expand Up @@ -146,9 +146,9 @@
</sch:pattern>
<sch:pattern>
<sch:rule context="vgr:ISS_Legacy_Label/vgr:legacy_label_telemetry_mode">
<sch:assert test=". = ('GS-2', 'GS-4', 'IM-10', 'IM-11', 'IM-12', 'IM-13', 'IM-15', 'IM-2', 'IM-20', 'IM-22', 'IM-23', 'IM-24', 'IM-25', 'IM-26', 'IM-2C', 'IM-2W', 'IM-2X', 'IM-3', 'IM-4', 'IM-5', 'IM-6', 'IM-7', 'IM-9', 'IM-K', 'IM-O', 'IM-S', 'None', 'OC-3')">
<sch:assert test=". = ('GS-2', 'GS-4', 'IM-10', 'IM-11', 'IM-12', 'IM-13', 'IM-15', 'IM-2', 'IM-20', 'IM-22', 'IM-23', 'IM-24', 'IM-25', 'IM-26', 'IM-2C', 'IM-2W', 'IM-2X', 'IM-3', 'IM-4', 'IM-5', 'IM-6', 'IM-7', 'IM-9', 'IM-K', 'IM-O', 'IM-Q', 'IM-S', 'None', 'OC-3')">
<title>vgr:ISS_Legacy_Label/vgr:legacy_label_telemetry_mode/vgr:legacy_label_telemetry_mode</title>
The attribute vgr:ISS_Legacy_Label/vgr:legacy_label_telemetry_mode must be equal to one of the following values 'GS-2', 'GS-4', 'IM-10', 'IM-11', 'IM-12', 'IM-13', 'IM-15', 'IM-2', 'IM-20', 'IM-22', 'IM-23', 'IM-24', 'IM-25', 'IM-26', 'IM-2C', 'IM-2W', 'IM-2X', 'IM-3', 'IM-4', 'IM-5', 'IM-6', 'IM-7', 'IM-9', 'IM-K', 'IM-O', 'IM-S', 'None', 'OC-3'.</sch:assert>
The attribute vgr:ISS_Legacy_Label/vgr:legacy_label_telemetry_mode must be equal to one of the following values 'GS-2', 'GS-4', 'IM-10', 'IM-11', 'IM-12', 'IM-13', 'IM-15', 'IM-2', 'IM-20', 'IM-22', 'IM-23', 'IM-24', 'IM-25', 'IM-26', 'IM-2C', 'IM-2W', 'IM-2X', 'IM-3', 'IM-4', 'IM-5', 'IM-6', 'IM-7', 'IM-9', 'IM-K', 'IM-O', 'IM-Q', 'IM-S', 'None', 'OC-3'.</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
Expand Down
16 changes: 10 additions & 6 deletions ...0edd7ac2a/1.16.0.0/PDS4_VGR_1G00_0500.txt → ...3dd9106d0/1.16.0.0/PDS4_VGR_1G00_0600.txt
View file
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.2.4
LDD Version Id: 0.5.0.0
LDD Version Id: 0.6.0.0
LDD Label Version Id: 1.22
LDD Discipline (T/F): false
LDD Namespace URL: http://pds.nasa.gov/pds4/
LDD URN Prefix: urn:nasa:pds:
Time Tue Jul 18 03:42:24 UTC 2023
Time Wed Jul 19 18:28:56 UTC 2023
Common Schema [PDS4_PDS_1G00.xsd]
Common Schematron [PDS4_PDS_1G00.sch]
IM Version Id: 1.16.0.0
Expand Down Expand Up @@ -40,7 +40,7 @@ Detailed validation messages

Parsed Input - Header:
LDD Name Voyager Mission Dictionary
LDD Version 0.5.0.0
LDD Version 0.6.0.0
Full Name Matthew Tiscareno
Steward rings
Namespace Id vgr
Expand Down Expand Up @@ -76,8 +76,12 @@ Parsed Input - Header:
Updated value_data_type and removed pattern for fds_scet_epoch_1, fds_scet_epoch_2, fds_scet_epoch_3, fds_scet_epoch_4, and spacecraft_clock_count_partition.
Updated nillable_flag for earth_received_time.
Added enumerated values for edit_mode_id, legacy_label_na_exposure_type, and legacy_label_wa_exposure_type.

v0.6.0.0 2023-07-19
Updated value_data_type for edr_tape_id.
Added enumerated values for edit_mode_id and legacy_label_telemetry_mode.

Last Modification Time 2023-07-17
Last Modification Time 2023-07-19
PDS4 Merge Flag false

Parsed Input - Attributes:
Expand Down Expand Up @@ -111,7 +115,7 @@ Parsed Input - Attributes:
name edit_mode_id
version 1.16
value data type ASCII_Short_String_Collapsed
description Edit mode of the camera, indicates amount of data read from the vidicon. '1:1' indicates the full-resolution of the vidicon. Other values include '3:4', '1:2', '1:3', '1:5', and '1:10'. Source Data Product Origin: Keyword EDIT_MODE_ID
description Edit mode of the camera, indicates amount of data read from the vidicon. '1:1' indicates the full-resolution of the vidicon. Other values include '3:5', '3:4', '1:2', '1:3', '1:5', and '1:10'. Source Data Product Origin: Keyword EDIT_MODE_ID

name edr_file_number
version 1.16
Expand All @@ -120,7 +124,7 @@ Parsed Input - Attributes:

name edr_tape_id
version 1.16
value data type ASCII_Integer
value data type ASCII_Short_String_Collapsed
description Tape ID on which the image was originally stored Source Data Product Origin: EDR_TAPE_ID

name exposure_duration
Expand Down
26 changes: 13 additions & 13 deletions ...0edd7ac2a/1.16.0.0/PDS4_VGR_1G00_0500.xml → ...3dd9106d0/1.16.0.0/PDS4_VGR_1G00_0600.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.16.0.0 Tue Jul 18 03:42:24 UTC 2023 -->
<!-- PDS4 XML product label for PDS4 V1.16.0.0 Wed Jul 19 18:28:56 UTC 2023 -->
<!-- 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 @@ -10,42 +10,42 @@
xsi:schemaLocation="http://pds.nasa.gov/pds4/pds/v1
https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1G00.xsd">
<Identification_Area>
<logical_identifier>urn:nasa:pds:system_bundle:xml_schema:vgr-xml_schema_1.16.0.0_0.5.0.0</logical_identifier>
<logical_identifier>urn:nasa:pds:system_bundle:xml_schema:vgr-xml_schema_1.16.0.0_0.6.0.0</logical_identifier>
<version_id>1.22</version_id>
<title>PDS4 XML Schema - VGR V0.5.0.0</title>
<title>PDS4 XML Schema - VGR V0.6.0.0</title>
<information_model_version>1.16.0.0</information_model_version>
<product_class>Product_XML_Schema</product_class>
<Modification_History>
<Modification_Detail>
<modification_date>2023-07-17</modification_date>
<modification_date>2023-07-19</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>
</Modification_History>
</Identification_Area>
<File_Area_XML_Schema>
<File>
<file_name>PDS4_VGR_1G00_0500.xsd</file_name>
<creation_date_time>2023-07-17T20:42:24</creation_date_time>
<file_size unit="byte">44942</file_size>
<records>936</records>
<file_name>PDS4_VGR_1G00_0600.xsd</file_name>
<creation_date_time>2023-07-19T11:28:56</creation_date_time>
<file_size unit="byte">45090</file_size>
<records>940</records>
</File>
<XML_Schema>
<name>PDS4_VGR_1G00_0500.xsd</name>
<name>PDS4_VGR_1G00_0600.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_VGR_1G00_0500.sch</file_name>
<creation_date_time>2023-07-17T20:42:24</creation_date_time>
<file_size unit="byte">14494</file_size>
<file_name>PDS4_VGR_1G00_0600.sch</file_name>
<creation_date_time>2023-07-19T11:28:56</creation_date_time>
<file_size unit="byte">14524</file_size>
<records>224</records>
</File>
<XML_Schema>
<name>PDS4_VGR_1G00_0500.sch</name>
<name>PDS4_VGR_1G00_0600.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 a1f28d6

Please sign in to comment.