Merge pull request #18 from pds-data-dictionaries/alice+lorri_additions

Add Alice+LORRI calibration processes + documentation

build/development/b946dad203281616f47fadbd046e160c05ec230f/1.19.0.0/PDS4_SB_1J00_1000.sch → build/development/f98c7729bb294d38dba228ad75ede3c8e1054a8d/1.19.0.0/PDS4_SB_1J00_1100.sch

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-  <!-- PDS4 Schematron for Name Space Id:sb  Version:1.0.0.0 - Thu Mar 07 21:13:01 UTC 2024 -->
+  <!-- PDS4 Schematron for Name Space Id:sb  Version:1.1.0.0 - Mon Jun 24 05:36:22 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">
@@ -67,6 +67,20 @@
         In sb:Dark_Field/pds:Internal_Reference, pds:reference_type must be "image_to_dark_field_file".</sch:assert>
     </sch:rule>
   </sch:pattern>
+  <sch:pattern>
+    <sch:rule context="sb:Desmear_Matrix/pds:Internal_Reference">
+      <sch:assert test="pds:reference_type eq 'image_to_desmear_matrix'">
+        <title>sb:Desmear_Matrix/pds:Internal_Reference/Rule</title>
+        In sb:Desmear_Matrix/pds:Internal_Reference, pds:reference_type must be "image_to_desmear_matrix"</sch:assert>
+    </sch:rule>
+  </sch:pattern>
+  <sch:pattern>
+    <sch:rule context="sb:Effective_Area_Table/pds:Internal_Reference">
+      <sch:assert test="pds:reference_type eq 'image_to_effective_area_file'">
+        <title>sb:Effective_Area_Table/pds:Internal_Reference/Rule</title>
+        In sb:Effective_Area_Table/pds:Internal_Reference, pds:reference_type must be "image_to_effective_area_file".</sch:assert>
+    </sch:rule>
+  </sch:pattern>
   <sch:pattern>
     <sch:rule context="sb:Error_Estimates_Map/pds:Local_Internal_Reference">
       <sch:assert test="pds:local_reference_type eq 'image_to_error_map'">
@@ -277,4 +291,11 @@
         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:Wavelength_Solution/pds:Internal_Reference">
+      <sch:assert test="pds:reference_type eq 'image_to_wavelength_solution_file'">
+        <title>sb:Wavelength_Solution/pds:Internal_Reference/Rule</title>
+        In sb:Wavelength_Solution/pds:Internal_Reference, pds:reference_type must be "image_to_wavelength_solution_file".</sch:assert>
+    </sch:rule>
+  </sch:pattern>
 </sch:schema>

build/development/b946dad203281616f47fadbd046e160c05ec230f/1.19.0.0/PDS4_SB_1J00_1000.txt → build/development/f98c7729bb294d38dba228ad75ede3c8e1054a8d/1.19.0.0/PDS4_SB_1J00_1100.txt

@@ -1,21 +1,20 @@
 PDS4 Local Data Dictionary Processing Report
 
 Configuration:
-   LDDTool Version        14.3.0
-   LDD Version Id:        1.0.0.0
+   LDDTool Version        15.1.0
+   LDD Version Id:        1.1.0.0
    LDD Label Version Id:  1.25
    LDD Discipline (T/F):  true
    LDD Namespace URL:     http://pds.nasa.gov/pds4/
    LDD URN Prefix:        urn:nasa:pds:
-   Time                   Thu Mar 07 21:13:01 UTC 2024
+   Time                   Mon Jun 24 05:36:22 UTC 2024
    Common Schema          [PDS4_PDS_1J00.xsd]
    Common Schematron      [PDS4_PDS_1J00.sch]
    IM Version Id:         1.19.0.0
    IM Namespace Id:       pds
    IM Label Version Id:   1.25
    IM Object Model        [UpperModel.pont]
    IM Data Dictionary     [dd11179.pins]
-   IM Configuration File  [MDPTNConfigClassDisp.xml]
    IM Glossary            [Glossary.pins]
    IM Document Spec       [DMDocument.pins]
 
@@ -29,9 +28,9 @@ Parameters:
    Merge with Master      false
 
 Summary:
-   Classes                27
-   Attributes             47
-   Associations           104
+   Classes                30
+   Attributes             51
+   Associations           120
    Error messages         0
    Warning messages       0
    Information messages   0
@@ -40,7 +39,7 @@ Detailed validation messages
 
 Parsed Input - Header:
    LDD Name               Small Bodies Studies
-   LDD Version            1.0.0.0
+   LDD Version            1.1.0.0
    Full Name              Anne Raugh
    Steward                sbn
    Namespace Id           sb
@@ -51,8 +50,22 @@ Parsed Input - Header:
     provided in other discipline namespaces, which is expected to be present.
 
     The initials "ACR" in the "submitter" field indicate Anne Raugh.
+
+    version 1.1.0 2024-06-23
+     - Added dead_time_correction, effective_area_correction, smear_removal_applied, and
+       wavelength_solution_applied attributes, which are boolean checks that should be
+       present if their respective calibration steps have been applied to the data product.
+     - Updated Calibration_Applied class to allow for the above attributes.
+     - Added Desmear_Matrix, Effective_Area_Table, and Wavelength_Solution classes, which
+       are containers providing a file_name and Internal_Reference to the calibration
+       product associated with a particular calibration process.
+     - Updated Calibration_Reference_File class to allow for the above classes.
+     - Added schematron rules specifying the reference_type used in pds:Internal_Reference
+       for the above classes.
+     - Added x_axis_position_angle attribute to Instrument_Position_Angles class along
+       with schematron rules requiring exactly 2 of the 3 attributes in that class.
 
-   Last Modification Time 2024-03-07
+   Last Modification Time 2024-06-23
    PDS4 Merge Flag        false
 
 Parsed Input - Attributes:
@@ -102,13 +115,23 @@ Parsed Input - Attributes:
    value data type        ASCII_Boolean
    description             The sb:dark_current_removal attribute should be present and contain the value "true" if dark current removal has been performed as part of the processing applied to the data comprising the product. 
 
+   name                   dead_time_correction
+   version                1.19
+   value data type        ASCII_Boolean
+   description             The sb:dead_time_correction attribute should be present and contain the value "true" if deadtime correction has been performed as part of the processing applied to the data comprising the product. 
+
    name                   delta_time_from_sequence_start
    version                1.19
    value data type        ASCII_Real
    description             The sb:delta_time_from_sequence_start attribute provide the offset of a time of interest in the current frame (as indicated by the containing class) from the start of the sequence in a "Frame Sequence" observation. It is specified as a floating point number of the specified units of time. 
    minimum value          0.0
    unit of measure type   Units_of_Time
 
+   name                   effective_area_correction
+   version                1.19
+   value data type        ASCII_Boolean
+   description             The sb:effective_area_correction attribute should be present and contain the value "true" if effective area correction based on the calculated effective area of the instrument due to varying sensitivity has been performed as part of the processing applied to the data comprising the product. 
+
    name                   exposure_description
    version                1.19
    value data type        UTF8_Text_Preserved
@@ -258,6 +281,11 @@ Parsed Input - Attributes:
    minimum value          0.0
    unit of measure type   Units_of_Length
 
+   name                   smear_removal_applied
+   version                1.19
+   value data type        ASCII_Boolean
+   description             The sb:smear_removal_applied attribute should be present and contain the value "true" if a smear removal correction algorithm to remove readout smear generated as charge is transferred across the CCD has been applied as part of the processing of the data comprising the product. 
+
    name                   standard_filter_identification
    version                1.19
    value data type        ASCII_Short_String_Collapsed
@@ -313,6 +341,11 @@ 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                   wavelength_solution_applied
+   version                1.19
+   value data type        ASCII_Boolean
+   description             The sb:wavelength_solution_applied attribute should be present and contain the value "true" if a wavelength solution corresponding to the spectral dimension of the detector has been determined as part of the processing applied to the data comprising the product. 
+
    name                   x_axis_position_angle
    version                1.19
    value data type        ASCII_Real
@@ -492,6 +525,16 @@ Parsed Input - Classes:
       maximum occurrences   1
       reference type        attribute_of
 
+      local identifier      sb:dead_time_correction
+      minimum occurrences   0
+      maximum occurrences   1
+      reference type        attribute_of
+
+      local identifier      sb:effective_area_correction
+      minimum occurrences   0
+      maximum occurrences   1
+      reference type        attribute_of
+
       local identifier      sb:flat_field_applied
       minimum occurrences   0
       maximum occurrences   1
@@ -502,6 +545,16 @@ Parsed Input - Classes:
       maximum occurrences   1
       reference type        attribute_of
 
+      local identifier      sb:smear_removal_applied
+      minimum occurrences   0
+      maximum occurrences   1
+      reference type        attribute_of
+
+      local identifier      sb:wavelength_solution_applied
+      minimum occurrences   0
+      maximum occurrences   1
+      reference type        attribute_of
+
       local identifier      sb:conversion_to_physical_units
       minimum occurrences   0
       maximum occurrences   1
@@ -563,17 +616,78 @@ Parsed Input - Classes:
       maximum occurrences   *
       reference type        component_of
 
+      local identifier      sb:Desmear_Matrix
+      minimum occurrences   0
+      maximum occurrences   *
+      reference type        component_of
+
+      local identifier      sb:Effective_Area_Table
+      minimum occurrences   0
+      maximum occurrences   *
+      reference type        component_of
+
       local identifier      sb:Flat_Field
       minimum occurrences   0
       maximum occurrences   *
       reference type        component_of
 
+      local identifier      sb:Wavelength_Solution
+      minimum occurrences   0
+      maximum occurrences   *
+      reference type        component_of
+
    name                   Dark_Field
    description             The sb:Dark_Field class identifies the PDS archive product containing the dark field used to calibrate the data in the product. 
    is abstract            false
    is choice              false
    subclass of            USER
 
+   Associations
+
+      local identifier      sb:file_name
+      minimum occurrences   0
+      maximum occurrences   1
+      reference type        attribute_of
+
+      local identifier      sb:comment
+      minimum occurrences   0
+      maximum occurrences   1
+      reference type        attribute_of
+
+      local identifier      pds.Internal_Reference
+      minimum occurrences   1
+      maximum occurrences   1
+      reference type        component_of
+
+   name                   Desmear_Matrix
+   description             The sb:Desmear_Matrix class identifies the PDS archive product containing the desmear matrix used to calibrate the data in the product. A desmear matrix is used to remove readout smear generated as charge is transferred across the CCD. 
+   is abstract            false
+   is choice              false
+   subclass of            USER
+
+   Associations
+
+      local identifier      sb:file_name
+      minimum occurrences   0
+      maximum occurrences   1
+      reference type        attribute_of
+
+      local identifier      sb:comment
+      minimum occurrences   0
+      maximum occurrences   1
+      reference type        attribute_of
+
+      local identifier      pds.Internal_Reference
+      minimum occurrences   1
+      maximum occurrences   1
+      reference type        component_of
+
+   name                   Effective_Area_Table
+   description             The sb:Effective_Area_Table class identifies the PDS archive product containing the effective area table used to calibrate the data in the product. An effective area table lists the calculated effected area of the detector at particular wavelengths. 
+   is abstract            false
+   is choice              false
+   subclass of            USER
+
    Associations
 
       local identifier      sb:file_name
@@ -1052,6 +1166,29 @@ Parsed Input - Classes:
       maximum occurrences   1
       reference type        attribute_of
 
+   name                   Wavelength_Solution
+   description             The sb:Wavelength_Solution class identifies the PDS archive product containing the wavelength solution used to calibrate the data in the product. A wavelength solution is a row of data representing the wavelengths corresponding to the spectral dimension of the detector. 
+   is abstract            false
+   is choice              false
+   subclass of            USER
+
+   Associations
+
+      local identifier      sb:file_name
+      minimum occurrences   0
+      maximum occurrences   1
+      reference type        attribute_of
+
+      local identifier      sb:comment
+      minimum occurrences   0
+      maximum occurrences   1
+      reference type        attribute_of
+
+      local identifier      pds.Internal_Reference
+      minimum occurrences   1
+      maximum occurrences   1
+      reference type        component_of
+
    name                   SB_Metadata
    description             The SBS_Metadata class provides metadata specific to the techniques and processes of small bodies research. In some cases the metadata is supplemental to more general metadata contained in other namespaces (metadata that should also be present in the product label). 
    is abstract            false

build/development/b946dad203281616f47fadbd046e160c05ec230f/1.19.0.0/PDS4_SB_1J00_1000.xml → build/development/f98c7729bb294d38dba228ad75ede3c8e1054a8d/1.19.0.0/PDS4_SB_1J00_1100.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-  <!-- PDS4 XML product label for PDS4 V1.19.0.0  Thu Mar 07 21:13:01 UTC 2024 -->
+  <!-- PDS4 XML product label for PDS4 V1.19.0.0  Mon Jun 24 05:36:22 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"
@@ -10,42 +10,42 @@
     xsi:schemaLocation="http://pds.nasa.gov/pds4/pds/v1
     https://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1J00.xsd">
     <Identification_Area>
-        <logical_identifier>urn:nasa:pds:system_bundle:xml_schema:sb-xml_schema_1.19.0.0_1.0.0.0</logical_identifier>
+        <logical_identifier>urn:nasa:pds:system_bundle:xml_schema:sb-xml_schema_1.19.0.0_1.1.0.0</logical_identifier>
         <version_id>1.25</version_id>
-        <title>PDS4 XML Schema - SB V1.0.0.0</title>
+        <title>PDS4 XML Schema - SB V1.1.0.0</title>
         <information_model_version>1.19.0.0</information_model_version>
         <product_class>Product_XML_Schema</product_class>
         <Modification_History>
             <Modification_Detail>
-                <modification_date>2024-03-07</modification_date>
+                <modification_date>2024-06-23</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>
         </Modification_History>
     </Identification_Area>
     <File_Area_XML_Schema>
         <File>
-            <file_name>PDS4_SB_1J00_1000.xsd</file_name>
-            <creation_date_time>2024-03-07T13:13:01</creation_date_time>
-            <file_size unit="byte">60277</file_size>
-            <records>1279</records>
+            <file_name>PDS4_SB_1J00_1100.xsd</file_name>
+            <creation_date_time>2024-06-23T22:36:22</creation_date_time>
+            <file_size unit="byte">66363</file_size>
+            <records>1394</records>
         </File>
         <XML_Schema>
-            <name>PDS4_SB_1J00_1000.xsd</name>
+            <name>PDS4_SB_1J00_1100.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_SB_1J00_1000.sch</file_name>
-            <creation_date_time>2024-03-07T13:13:01</creation_date_time>
-            <file_size unit="byte">17133</file_size>
-            <records>280</records>
+            <file_name>PDS4_SB_1J00_1100.sch</file_name>
+            <creation_date_time>2024-06-23T22:36:22</creation_date_time>
+            <file_size unit="byte">18329</file_size>
+            <records>301</records>
         </File>
         <XML_Schema>
-            <name>PDS4_SB_1J00_1000.sch</name>
+            <name>PDS4_SB_1J00_1100.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>