Merge pull request #811 from NASA-PDS/240828_Create_Array_1D_Spectrum

Add Array_1D_Spectrum to File_Area_Ancillary, File_Area_Browse, and File_Area_Observational_Supplemental

model-ontology/src/ontology/Data/UpperModel.pins

@@ -1,4 +1,4 @@
-; Wed Aug 14 12:29:19 EDT 2024
+; Wed Aug 28 09:43:08 EDT 2024
 ; 
 ;+ (version "3.5")
 ;+ (build "Build 663")

model-ontology/src/ontology/Data/UpperModel.pont

@@ -1,4 +1,4 @@
-; Wed Aug 14 12:29:18 EDT 2024
+; Wed Aug 28 09:43:08 EDT 2024
 ; 
 ;+ (version "3.5")
 ;+ (build "Build 663")
@@ -5268,6 +5268,10 @@
 ;+		(cardinality 1 1)
 		(create-accessor read-write)))
 
+(defclass Array_1D_Spectrum "The Array 1D Spectrum class is an extension of the Array 1D class and defines a one dimensional spectrum."
+	(is-a Array_1D)
+	(role concrete))
+
 (defclass File "The File class consists of attributes that describe a file in a data store."
 	(is-a Tagged_Digital_Object)
 	(role concrete)
@@ -10177,7 +10181,7 @@
 	(multislot has_tagged_data_object
 ;+		(comment "The has_tagged_data_object association is a relationship to any tagged_digital_object or tagged_nondigital_object.")
 		(type INSTANCE)
-;+		(allowed-classes Array_2D_Map Array_2D_Image Stream_Text Array_2D_Spectrum Array_3D_Image Table_Binary Array_3D_Movie Array_3D_Spectrum Table_Character Header Table_Delimited Encoded_Header Array_3D Array_2D XSChoice%23 Array_1D Array Encoded_Audio Encoded_Video)
+;+		(allowed-classes Array_2D_Map Array_2D_Image Stream_Text Array_2D_Spectrum Array_3D_Image Table_Binary Array_3D_Movie Array_3D_Spectrum Table_Character Header Table_Delimited Encoded_Header Array_3D Array_2D XSChoice%23 Array_1D Array Encoded_Audio Encoded_Video Array_1D_Spectrum)
 		(cardinality 1 ?VARIABLE)
 		(create-accessor read-write))
 	(single-slot has_composite_structure
@@ -10215,7 +10219,7 @@
 	(multislot has_tagged_data_object
 ;+		(comment "The has_tagged_data_object association is a relationship to any tagged_digital_object or tagged_nondigital_object.")
 		(type INSTANCE)
-;+		(allowed-classes Array_2D_Map Array_2D_Image Stream_Text Array_2D_Spectrum Array_3D_Image Table_Binary Array_3D_Movie Array_3D_Spectrum Encoded_Image Table_Character Header Encoded_Header Table_Delimited Array_2D Array_3D XSChoice%23 Array_1D Array Encoded_Audio Encoded_Video)
+;+		(allowed-classes Array_2D_Map Array_2D_Image Stream_Text Array_2D_Spectrum Array_3D_Image Table_Binary Array_3D_Movie Array_3D_Spectrum Encoded_Image Table_Character Header Encoded_Header Table_Delimited Array_2D Array_3D XSChoice%23 Array_1D Array Encoded_Audio Encoded_Video Array_1D_Spectrum)
 		(cardinality 1 ?VARIABLE)
 		(create-accessor read-write))
 	(single-slot has_File
@@ -10294,7 +10298,7 @@
 	(multislot has_tagged_data_object
 ;+		(comment "The has_tagged_data_object association is a relationship to any tagged_digital_object or tagged_nondigital_object.")
 		(type INSTANCE)
-;+		(allowed-classes Parsable_Byte_Stream Encoded_Byte_Stream Array_3D_Movie Array_2D_Spectrum Array_2D Array_3D Array_2D_Image Array_2D_Map Array_3D_Image Array_3D_Spectrum Stream_Text Table_Delimited Header Table_Binary Table_Character Encoded_Header Encoded_Image Encoded_Binary XSChoice%23 Array_1D Array Table_Delimited_Source_Product_Internal Table_Delimited_Source_Product_External Encoded_Audio Encoded_Video)
+;+		(allowed-classes Parsable_Byte_Stream Encoded_Byte_Stream Array_3D_Movie Array_2D_Spectrum Array_2D Array_3D Array_2D_Image Array_2D_Map Array_3D_Image Array_3D_Spectrum Stream_Text Table_Delimited Header Table_Binary Table_Character Encoded_Header Encoded_Image Encoded_Binary XSChoice%23 Array_1D Array Table_Delimited_Source_Product_Internal Table_Delimited_Source_Product_External Encoded_Audio Encoded_Video Array_1D_Spectrum)
 		(cardinality 1 ?VARIABLE)
 		(create-accessor read-write))
 	(single-slot has_composite_structure
@@ -10386,7 +10390,7 @@
 	(multislot has_tagged_data_object
 ;+		(comment "The has_tagged_data_object association is a relationship to any tagged_digital_object or tagged_nondigital_object.")
 		(type INSTANCE)
-;+		(allowed-classes Table_Binary Table_Delimited Table_Character XSChoice%23 Array_3D_Movie Array_2D_Spectrum Array_2D Array_3D Array Array_2D_Image Array_2D_Map Array_3D_Image Array_3D_Spectrum Stream_Text Encoded_Image Header Encoded_Header Checksum_Manifest Array_1D Encoded_Audio Encoded_Video)
+;+		(allowed-classes Table_Binary Table_Delimited Table_Character XSChoice%23 Array_3D_Movie Array_2D_Spectrum Array_2D Array_3D Array Array_2D_Image Array_2D_Map Array_3D_Image Array_3D_Spectrum Stream_Text Encoded_Image Header Encoded_Header Checksum_Manifest Array_1D Encoded_Audio Encoded_Video Array_1D_Spectrum)
 		(cardinality 1 ?VARIABLE)
 		(create-accessor read-write))
 	(single-slot has_File

model-ontology/src/ontology/Data/UpperModel.pprj

@@ -1,15 +1,15 @@
-; Wed Aug 14 12:29:19 EDT 2024
+; Wed Aug 28 09:43:08 EDT 2024
 ; 
 ;+ (version "3.5")
 ;+ (build "Build 663")
 
 ([BROWSER_SLOT_NAMES] of  Property_List
 
 	(properties
-		[UpperModel_ProjectKB_Class123]
-		[UpperModel_ProjectKB_Class124]
-		[UpperModel_ProjectKB_Class125]
-		[UpperModel_ProjectKB_Class126]))
+		[UpperModel_ProjectKB_Class69]
+		[UpperModel_ProjectKB_Class70]
+		[UpperModel_ProjectKB_Class71]
+		[UpperModel_ProjectKB_Class72]))
 
 ([CLSES_TAB] of  Widget
 
@@ -423,7 +423,7 @@
 	(x 0)
 	(y 120))
 
-([KB_414268_Class0] of  Map
+([KB_307747_Class0] of  Map
 )
 
 ([KB_663782_Class0] of  Map
@@ -850,26 +850,6 @@
 ([UpperModel_ProjectKB_Class12] of  Property_List
 )
 
-([UpperModel_ProjectKB_Class123] of  String
-
-	(name "ChangeLog")
-	(string_value "date"))
-
-([UpperModel_ProjectKB_Class124] of  String
-
-	(name ":INSTANCE-ANNOTATION")
-	(string_value "%3AANNOTATION-TEXT"))
-
-([UpperModel_ProjectKB_Class125] of  String
-
-	(name ":PAL-CONSTRAINT")
-	(string_value "%3APAL-NAME"))
-
-([UpperModel_ProjectKB_Class126] of  String
-
-	(name ":META-CLASS")
-	(string_value "%3ANAME"))
-
 ([UpperModel_ProjectKB_Class13] of  Widget
 
 	(is_hidden TRUE)
@@ -1143,12 +1123,32 @@
 ([UpperModel_ProjectKB_Class68] of  Property_List
 )
 
+([UpperModel_ProjectKB_Class69] of  String
+
+	(name "ChangeLog")
+	(string_value "date"))
+
 ([UpperModel_ProjectKB_Class7] of  Widget
 
 	(is_hidden TRUE)
 	(property_list [UpperModel_ProjectKB_Class8])
 	(widget_class_name "edu.stanford.smi.protegex.widget.pal.PalQueriesTab"))
 
+([UpperModel_ProjectKB_Class70] of  String
+
+	(name ":INSTANCE-ANNOTATION")
+	(string_value "%3AANNOTATION-TEXT"))
+
+([UpperModel_ProjectKB_Class71] of  String
+
+	(name ":PAL-CONSTRAINT")
+	(string_value "%3APAL-NAME"))
+
+([UpperModel_ProjectKB_Class72] of  String
+
+	(name ":META-CLASS")
+	(string_value "%3ANAME"))
+
 ([UpperModel_ProjectKB_Class8] of  Property_List
 )
 

model-ontology/src/ontology/Data/dd11179.pins

@@ -1,4 +1,4 @@
-; Mon Jun 24 20:35:04 EDT 2024
+; Wed Aug 28 09:56:34 EDT 2024
 ; 
 ;+ (version "3.5")
 ;+ (build "Build 663")
@@ -19491,6 +19491,11 @@
 	(definitionText "The axes attribute provides a count of the axes.")
 	(isPreferred TRUE))
 
+([DEF.0001_NASA_PDS_1.pds.Array_1D_Spectrum] of  Definition
+
+	(definitionText "The Array 1D Spectrum class is an extension of the Array 1D class and defines a one dimensional spectrum.")
+	(isPreferred TRUE))
+
 ([DEF.0001_NASA_PDS_1.pds.Array_2D] of  Definition
 
 	(definitionText "The Array 2D class is the parent class for all two dimensional array based classes.")
@@ -27176,6 +27181,11 @@
 	(designationName "axes")
 	(isPreferred TRUE))
 
+([DES.0001_NASA_PDS_1.pds.Array_1D_Spectrum] of  Designation
+
+	(designationName "Array_1D_Spectrum")
+	(isPreferred TRUE))
+
 ([DES.0001_NASA_PDS_1.pds.Array_2D] of  Designation
 
 	(designationName "Array_2D")
@@ -59516,6 +59526,27 @@
 	(used "Y")
 	(versionIdentifier "1.0.0.0"))
 
+([OC.0001_NASA_PDS_1.pds.Array_1D_Spectrum] of  ObjectClass
+
+	(administrationRecord [DD_1.23.0.0])
+	(dataIdentifier "OC.0001_NASA_PDS_1.pds.Array_1D_Spectrum")
+	(isDataType "false")
+	(isDeprecated "false")
+	(isInactive "false")
+	(isRegistryClass "false")
+	(isSchema1Class "false")
+	(isTDO "true")
+	(isUnitOfMeasure "false")
+	(isVacuous "false")
+	(nameSpaceIdNC "pds")
+	(registeredBy [RA_0001_NASA_PDS_1])
+	(registrationAuthorityIdentifier [0001_NASA_PDS_1])
+	(section "#09")
+	(steward [pds])
+	(terminologicalEntry [TE.0001_NASA_PDS_1.pds.Array_1D_Spectrum])
+	(used "Y")
+	(versionIdentifier "1.0.0.0"))
+
 ([OC.0001_NASA_PDS_1.pds.Array_2D] of  ObjectClass
 
 	(administrationRecord [DD_1.23.0.0])
@@ -68159,7 +68190,7 @@
 ([PR.0001_NASA_PDS_1.pds.Array_1D.pds.axes] of  Property
 
 	(administrationRecord [DD_1.23.0.0])
-	(classOrder "9999")
+	(classOrder "1010")
 	(dataIdentifier "PR.0001_NASA_PDS_1.pds.Array_1D.pds.axes")
 	(registeredBy [RA_0001_NASA_PDS_1])
 	(registrationAuthorityIdentifier [0001_NASA_PDS_1])
@@ -68168,7 +68199,7 @@
 ([PR.0001_NASA_PDS_1.pds.Array_1D.pds.has_Axis_Array.Axis_Array] of  Property
 
 	(administrationRecord [DD_1.23.0.0])
-	(classOrder "9999")
+	(classOrder "1020")
 	(dataIdentifier "PR.0001_NASA_PDS_1.pds.Array_1D.pds.has_Axis_Array.Axis_Array")
 	(registeredBy [RA_0001_NASA_PDS_1])
 	(registrationAuthorityIdentifier [0001_NASA_PDS_1])
@@ -73241,6 +73272,15 @@
 	(registrationAuthorityIdentifier [0001_NASA_PDS_1])
 	(versionIdentifier "1.23"))
 
+([PR.0001_NASA_PDS_1.pds.File_Area_Ancillary.pds.has_tagged_data_object.Array_1D_Spectrum] of  Property
+
+	(administrationRecord [DD_1.23.0.0])
+	(classOrder "1020")
+	(dataIdentifier "PR.0001_NASA_PDS_1.pds.File_Area_Ancillary.pds.has_tagged_data_object.Array_1D_Spectrum")
+	(registeredBy [RA_0001_NASA_PDS_1])
+	(registrationAuthorityIdentifier [0001_NASA_PDS_1])
+	(versionIdentifier "1.23"))
+
 ([PR.0001_NASA_PDS_1.pds.File_Area_Ancillary.pds.has_tagged_data_object.Array_2D] of  Property
 
 	(administrationRecord [DD_1.23.0.0])
@@ -73448,6 +73488,15 @@
 	(registrationAuthorityIdentifier [0001_NASA_PDS_1])
 	(versionIdentifier "1.23"))
 
+([PR.0001_NASA_PDS_1.pds.File_Area_Browse.pds.has_tagged_data_object.Array_1D_Spectrum] of  Property
+
+	(administrationRecord [DD_1.23.0.0])
+	(classOrder "1020")
+	(dataIdentifier "PR.0001_NASA_PDS_1.pds.File_Area_Browse.pds.has_tagged_data_object.Array_1D_Spectrum")
+	(registeredBy [RA_0001_NASA_PDS_1])
+	(registrationAuthorityIdentifier [0001_NASA_PDS_1])
+	(versionIdentifier "1.23"))
+
 ([PR.0001_NASA_PDS_1.pds.File_Area_Browse.pds.has_tagged_data_object.Array_2D] of  Property
 
 	(administrationRecord [DD_1.23.0.0])
@@ -73781,6 +73830,15 @@
 	(registrationAuthorityIdentifier [0001_NASA_PDS_1])
 	(versionIdentifier "1.23"))
 
+([PR.0001_NASA_PDS_1.pds.File_Area_Observational.pds.has_tagged_data_object.Array_1D_Spectrum] of  Property
+
+	(administrationRecord [DD_1.23.0.0])
+	(classOrder "1020")
+	(dataIdentifier "PR.0001_NASA_PDS_1.pds.File_Area_Observational.pds.has_tagged_data_object.Array_1D_Spectrum")
+	(registeredBy [RA_0001_NASA_PDS_1])
+	(registrationAuthorityIdentifier [0001_NASA_PDS_1])
+	(versionIdentifier "1.23"))
+
 ([PR.0001_NASA_PDS_1.pds.File_Area_Observational.pds.has_tagged_data_object.Array_2D] of  Property
 
 	(administrationRecord [DD_1.23.0.0])
@@ -73961,6 +74019,15 @@
 	(registrationAuthorityIdentifier [0001_NASA_PDS_1])
 	(versionIdentifier "1.23"))
 
+([PR.0001_NASA_PDS_1.pds.File_Area_Observational_Supplemental.pds.has_tagged_data_object.Array_1D_Spectrum] of  Property
+
+	(administrationRecord [DD_1.23.0.0])
+	(classOrder "1020")
+	(dataIdentifier "PR.0001_NASA_PDS_1.pds.File_Area_Observational_Supplemental.pds.has_tagged_data_object.Array_1D_Spectrum")
+	(registeredBy [RA_0001_NASA_PDS_1])
+	(registrationAuthorityIdentifier [0001_NASA_PDS_1])
+	(versionIdentifier "1.23"))
+
 ([PR.0001_NASA_PDS_1.pds.File_Area_Observational_Supplemental.pds.has_tagged_data_object.Array_2D] of  Property
 
 	(administrationRecord [DD_1.23.0.0])
@@ -96168,6 +96235,13 @@
 	(designation [DES.0001_NASA_PDS_1.pds.Array_1D.pds.axes])
 	(sectionLanguage [LI_English]))
 
+([TE.0001_NASA_PDS_1.pds.Array_1D_Spectrum] of  TerminologicalEntry
+
+	(administeredItemContext [NASA_PDS])
+	(definition [DEF.0001_NASA_PDS_1.pds.Array_1D_Spectrum])
+	(designation [DES.0001_NASA_PDS_1.pds.Array_1D_Spectrum])
+	(sectionLanguage [LI_English]))
+
 ([TE.0001_NASA_PDS_1.pds.Array_2D] of  TerminologicalEntry
 
 	(administeredItemContext [NASA_PDS])

model-ontology/src/ontology/Data/dd11179.pont

@@ -1,4 +1,4 @@
-; Mon Jun 24 20:35:04 EDT 2024
+; Wed Aug 28 09:56:34 EDT 2024
 ; 
 ;+ (version "3.5")
 ;+ (build "Build 663")

model-ontology/src/ontology/Data/dd11179.pprj

@@ -1,4 +1,4 @@
-; Mon Jun 24 20:35:04 EDT 2024
+; Wed Aug 28 09:56:34 EDT 2024
 ; 
 ;+ (version "3.5")
 ;+ (build "Build 663")
@@ -20,9 +20,9 @@
 ([BROWSER_SLOT_NAMES] of  Property_List
 
 	(properties
-		[dd11179_ProjectKB_Class193]
-		[dd11179_ProjectKB_Class194]
-		[dd11179_ProjectKB_Class195]))
+		[dd11179_ProjectKB_Class118]
+		[dd11179_ProjectKB_Class119]
+		[dd11179_ProjectKB_Class120]))
 
 ([CLSES_TAB] of  Widget
 
@@ -51,9 +51,24 @@
 	(property_list [dd11179_ProjectKB_Class12])
 	(widget_class_name "edu.stanford.smi.protegex.owl.ui.cls.OWLClassesTab"))
 
+([dd11179_ProjectKB_Class118] of  String
+
+	(name ":INSTANCE-ANNOTATION")
+	(string_value "%3AANNOTATION-TEXT"))
+
+([dd11179_ProjectKB_Class119] of  String
+
+	(name ":PAL-CONSTRAINT")
+	(string_value "%3APAL-NAME"))
+
 ([dd11179_ProjectKB_Class12] of  Property_List
 )
 
+([dd11179_ProjectKB_Class120] of  String
+
+	(name ":META-CLASS")
+	(string_value "%3ANAME"))
+
 ([dd11179_ProjectKB_Class13] of  Widget
 
 	(is_hidden TRUE)
@@ -87,21 +102,6 @@
 	(property_list [dd11179_ProjectKB_Class20])
 	(widget_class_name "edu.stanford.smi.protege.widget.KAToolTab"))
 
-([dd11179_ProjectKB_Class193] of  String
-
-	(name ":INSTANCE-ANNOTATION")
-	(string_value "%3AANNOTATION-TEXT"))
-
-([dd11179_ProjectKB_Class194] of  String
-
-	(name ":PAL-CONSTRAINT")
-	(string_value "%3APAL-NAME"))
-
-([dd11179_ProjectKB_Class195] of  String
-
-	(name ":META-CLASS")
-	(string_value "%3ANAME"))
-
 ([dd11179_ProjectKB_Class2] of  Property_List
 )
 
@@ -522,7 +522,7 @@
 	(name "instances_file_name")
 	(string_value "dd11179.pins"))
 
-([KB_440487_Class0] of  Map
+([KB_699654_Class0] of  Map
 )
 
 ([KB_860773_Class0] of  Map