fixed validation errors

.gitlab-ci.yml

@@ -22,14 +22,14 @@ validate_p08:
     stage: validate
     script:
         # - linkml-validate -s ./schema/beamline_p08.yaml ./Dataset/p08_example_data.yaml
-        - linkml-validate -s ./schema/beamline_p65.yaml ./Dataset/p65_example_data.yaml
+        - linkml-validate -s ./schema/beamline_p65_xas.yaml ./Dataset/p65_example_data.yaml
 
 # Stage - build derivative - generate json schema
 json-schema:
   stage: build-derivatives
   script:
     # - gen-json-schema --closed ./schema/beamline_p08.yaml  > beamline_p08.json
-    - gen-json-schema --closed ./schema/beamline_p65.yaml  > beamline_p65_xas.json
+    - gen-json-schema --closed ./schema/beamline_p65_xas.yaml  > beamline_p65_xas.json
   artifacts:
     name: "json-schemas"
     paths:

Dataset/p65_example_data.yaml

@@ -58,7 +58,7 @@ scientificMetadata:
       metadata:
             project: "Catalysis Study for Platinum-Based Catalysts"
             experimenter: "Dr. John Doe"
-      startTime: "2024-08-01T09:00:00"
-      endTime: "2024-08-01T12:00:00"
+      startTime: "2024-08-01T09:00:00Z"
+      endTime: "2024-08-01T12:00:00Z"
 
 

schema/base_scicat_dataset.yaml

@@ -7,7 +7,6 @@ prefixes:
 imports: [linkml:types]
 # default_prefix: linkml
 default_range: string
-
 classes:
   ScicatDataset:
     abstract: true
@@ -116,7 +115,7 @@ classes:
         description: The ID of the proposal to which the dataset belongs.
       isPublished:
         description: The ID of the proposal to which the dataset belongs.
-        range: bool
+        range: boolean
       #~ sampleId:
         #~ description: ID of the sample used when collecting the data.
       instrumentId:
@@ -125,8 +124,9 @@ classes:
         description: Defines the group which owns the data, and therefore has unrestricted access to this data. Usually a pgroup like p12151
       accessGroups: 
         description: Defines the group which owns the data, and therefore has unrestricted access to this data. Usually a pgroup like p12151
+        multivalued: true
     #   #~ instrumentGroup: {}
-        range: list
+      
 
 
   SciCatProposal:
@@ -198,20 +198,20 @@ classes:
   MetaObject:
     class_uri: linkml:Any
 
-  Instrument:
-    abstract: true
-    attributes:
-      pid:
-        description: PID of the instrument
+  # Instrument:
+  #   abstract: true
+  #   attributes:
+  #     pid:
+  #       description: PID of the instrument
       
-      uniqueName: 
-        description: The unique name of the instrument. This name has to be unique within the scicat instance.
+  #     uniqueName: 
+  #       description: The unique name of the instrument. This name has to be unique within the scicat instance.
       
-      name: 
-        description: The common name of the instrument. This name can be non unique as it is the name that users use to commonly refer to this instrument.
+  #     name: 
+  #       description: The common name of the instrument. This name can be non unique as it is the name that users use to commonly refer to this instrument.
       
-      customMetadata:
-         range: MetaObject
+  #     customMetadata:
+  #        range: MetaObject
 
 
 enums:

schema/rockit.yaml

@@ -15,7 +15,7 @@ classes:
     # should get all what one can get from PaNET
     attributes:
       sample_environment:
-       range: sample_environment
+       range: SampleEnvironment
       # GasComposition:
       #   description: Describe gas composition
       #   range: string

schema/technique_xas_catalysis.yaml

@@ -15,13 +15,7 @@ imports:
 
 
 
-default_prefix: xas_catalysis
 
-types:
-  float:
-    base: float
-  datetime:
-    base: datetime
 
 classes:
 
@@ -95,9 +89,9 @@ classes:
       method:
         description: Method or algorithm used for data processing
 
-  MetaObject:
-    description: Generic metadata object
-    class_uri: linkml:Any
+  # MetaObject:
+  #   description: Generic metadata object
+  #   class_uri: linkml:Any
 
   EnergyRange:
     description: Energy range used in the XAS experiment