ENH #1056 first working case?

nexusformat · Jun 13, 2022 · b5df68e · b5df68e
1 parent 2fce00f
commit b5df68e
Showing 1 changed file with 35 additions and 30 deletions.
diff --git a/nxdlTypes.xsd b/nxdlTypes.xsd
@@ -457,14 +457,14 @@
  nxdl:NX_UINT
  nxdl:NX_POSINT
  nxdl:NX_NUMBER
- nxdl:NX_CCOMPLEX
- nxdl:NX_PCOMPLEX
- nxdl:NX_COMPLEX
- nxdl:NX_QUATERNION
  nxdl:NX_DATE_TIME
  nxdl:NX_BOOLEAN
  nxdl:NX_BINARY
  nxdl:ISO8601
+ nxdl:NX_CCOMPLEX
+ nxdl:NX_PCOMPLEX
+ nxdl:NX_COMPLEX
+ nxdl:NX_QUATERNION
  "/>
  </xs:simpleType>
 
@@ -525,29 +525,32 @@
 
  <xs:simpleType name="NX_CCOMPLEX">
  <xs:annotation>
- <xs:documentation>Compound type cartesian representaion of complex numbers (real and imaginary parts) in NeXus</xs:documentation>
- </xs:annotation>
- <xs:list itemType="xs:double">
- <xs:restriction>
- <xs:length value="2">
- </xs:restriction>
- </xs:list>
- <!--
- <xs:sequence>
- <xs:element name="real" type="xs:double"/>
- <xs:element name="imaginary" type="xs:double"/>
- </xs:sequence>
- -->
+ <xs:documentation>
+ Compound type cartesian representation of complex numbers (real and
+ imaginary parts) in NeXus.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType='xs:double'/>
+ </xs:simpleType>
+ <xs:length value='2' />
+ </xs:restriction>
  </xs:simpleType>
- 
+
  <xs:simpleType name="NX_PCOMPLEX">
  <xs:annotation>
- <xs:documentation>Compound type polar representaion of complex numbers (amplitude and phase /in radian/) in NeXus</xs:documentation>
+ <xs:documentation>
+ Compound type polar representation of complex numbers (amplitude
+ and phase *in radian*) in NeXus.
+ </xs:documentation>
  </xs:annotation>
- <xs:sequence>
- <xs:element name="amplitude" type="xs:double"/>
- <xs:element name="phase" type="xs:double"/>
- </xs:sequence>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType='xs:double'/>
+ </xs:simpleType>
+ <xs:length value='2' />
+ </xs:restriction>
  </xs:simpleType>
 
  <xs:simpleType name="NX_COMPLEX">
@@ -562,14 +565,16 @@
 
  <xs:simpleType name="NX_QUATERNION">
  <xs:annotation>
- <xs:documentation>Compound type representaion of quaternion numbers (real,i,j,k) in NeXus</xs:documentation>
+ <xs:documentation>
+ Compound type representation of quaternion numbers (real,i,j,k) in NeXus.
+ </xs:documentation>
  </xs:annotation>
- <xs:sequence>
- <xs:element name="real" type="xs:double"/>
- <xs:element name="i" type="xs:double"/>
- <xs:element name="j" type="xs:double"/>
- <xs:element name="k" type="xs:double"/>
- </xs:sequence>
+ <xs:restriction>
+ <xs:simpleType>
+  <xs:list itemType='xs:double'/>
+ </xs:simpleType>
+ <xs:length value='4' />
+ </xs:restriction>
  </xs:simpleType>
 
  <xs:simpleType name="NX_DATE_TIME">