Fixed bug in setup.py

ismrmrd · Jun 29, 2022 · b4ab63b · b4ab63b
1 parent c3e1d86
commit b4ab63b
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 12 deletions.
diff --git a/schema/ismrmrd.xsd b/schema/ismrmrd.xsd
@@ -22,6 +22,7 @@
     <xs:all>
       <xs:element minOccurs="0" name="patientName" type="xs:string" />
       <xs:element minOccurs="0" name="patientWeight_kg" type="xs:float" />
+      <xs:element minOccurs="0" name="patientHeight_m" type="xs:float"/>
       <xs:element minOccurs="0" name="patientID" type="xs:string" />
       <xs:element minOccurs="0" name="patientBirthdate" type="xs:date" />
       <xs:element minOccurs="0" name="patientGender">
@@ -43,6 +44,7 @@
       <xs:element minOccurs="0" maxOccurs="1" name="referringPhysicianName" type="xs:string" />
       <xs:element minOccurs="0" maxOccurs="1" name="studyDescription" type="xs:string" />
       <xs:element minOccurs="0" maxOccurs="1" name="studyInstanceUID" type="xs:string" />
+      <xs:element minOccurs="0" maxOccurs="1" name="bodyPartExamined" type="xs:string" />
     </xs:all>
   </xs:complexType>
 
@@ -65,9 +67,10 @@
       <xs:element minOccurs="0" name="seriesDate" type="xs:date" />
       <xs:element minOccurs="0" name="seriesTime" type="xs:time" />
       <xs:element minOccurs="1" name="patientPosition" type="patientPositionType" />
-      <xs:element minOccurs="0" name="relativeTablePosition" type="threeDimensionalFloatType" />
+      <xs:element minOccurs="0" name="relativeTablePosition" type="threeDimensionalFloat" />
       <xs:element minOccurs="0" name="initialSeriesNumber" type="xs:long" />
       <xs:element minOccurs="0" name="protocolName" type="xs:string" />
+      <xs:element minOccurs="0" name="sequenceName" type="xs:string" />
       <xs:element minOccurs="0" name="seriesDescription" type="xs:string" />
       <xs:element maxOccurs="unbounded" minOccurs="0" name="measurementDependency" type="measurementDependencyType" />
       <xs:element minOccurs="0" name="seriesInstanceUIDRoot" type="xs:string" />
@@ -101,6 +104,7 @@
       <xs:element minOccurs="0" maxOccurs="1" name="institutionName" type="xs:string" />
       <xs:element minOccurs="0" maxOccurs="1" name="stationName" type="xs:string" />
       <xs:element minOccurs="0" maxOccurs="1" name="deviceID" type="xs:string" />
+      <xs:element minOccurs="0" maxOccurs="1" name="deviceSerialNumber" type="xs:string" />
     </xs:sequence>
   </xs:complexType>
 
@@ -119,16 +123,24 @@
       <xs:element maxOccurs="1" minOccurs="0" name="trajectoryDescription" type="trajectoryDescriptionType" />
       <xs:element maxOccurs="1" minOccurs="0" name="parallelImaging" type="parallelImagingType" />
       <xs:element maxOccurs="1" minOccurs="0" name="echoTrainLength" type="xs:long" />
+      <xs:element maxOccurs="1" minOccurs="0" name="multiband" type="multibandType"/>
     </xs:all>
   </xs:complexType>
 
   <xs:complexType name="encodingSpaceType">
     <xs:all>
       <xs:element maxOccurs="1" minOccurs="1" name="matrixSize" type="matrixSizeType" />
-      <xs:element maxOccurs="1" minOccurs="1" name="fieldOfView_mm" type="fieldOfView_mmType" />
+      <xs:element maxOccurs="1" minOccurs="1" name="fieldOfView_mm" type="fieldOfView_mm" />
     </xs:all>
   </xs:complexType>
 
+  <xs:complexType name="multibandType">
+    <xs:sequence>
+      <xs:element maxOccurs="unbounded" minOccurs="1" name="spacing" type="xs:float"/>
+      <xs:element name="phaseShift" type="xs:float"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="matrixSizeType">
     <xs:sequence>
       <xs:element default="1" maxOccurs="1" minOccurs="1" name="x" type="xs:unsignedShort" />
@@ -137,14 +149,23 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="fieldOfView_mmType">
+  <xs:complexType name="fieldOfView_mm">
     <xs:sequence>
       <xs:element maxOccurs="1" minOccurs="1" name="x" type="xs:float" />
       <xs:element maxOccurs="1" minOccurs="1" name="y" type="xs:float" />
       <xs:element maxOccurs="1" minOccurs="1" name="z" type="xs:float" />
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="threeDimensionalFloat">
+    <xs:sequence>
+      <xs:element maxOccurs="1" minOccurs="1" name="x" type="xs:float" />
+      <xs:element maxOccurs="1" minOccurs="1" name="y" type="xs:float" />
+      <xs:element maxOccurs="1" minOccurs="1" name="z" type="xs:float" />
+    </xs:sequence>
+  </xs:complexType>
+
+
   <xs:complexType name="limitType">
     <xs:all>
       <xs:element default="0" name="minimum" type="xs:unsignedShort" />
@@ -153,14 +174,6 @@
     </xs:all>
   </xs:complexType>
 
-   <xs:complexType name="threeDimensionalFloatType">
-    <xs:sequence>
-      <xs:element maxOccurs="1" minOccurs="1" name="x" type="xs:float" />
-      <xs:element maxOccurs="1" minOccurs="1" name="y" type="xs:float" />
-      <xs:element maxOccurs="1" minOccurs="1" name="z" type="xs:float" />
-    </xs:sequence>
-  </xs:complexType>
-
   <xs:complexType name="encodingLimitsType">
     <xs:all>
       <xs:element maxOccurs="1" minOccurs="0" name="kspace_encoding_step_0" type="limitType" />
@@ -173,6 +186,14 @@
       <xs:element maxOccurs="1" minOccurs="0" name="repetition" type="limitType" />
       <xs:element maxOccurs="1" minOccurs="0" name="set" type="limitType" />
       <xs:element maxOccurs="1" minOccurs="0" name="segment" type="limitType" />
+      <xs:element maxOccurs="1" minOccurs="0" name="user_0" type="limitType" />
+      <xs:element maxOccurs="1" minOccurs="0" name="user_1" type="limitType" />
+      <xs:element maxOccurs="1" minOccurs="0" name="user_2" type="limitType" />
+      <xs:element maxOccurs="1" minOccurs="0" name="user_3" type="limitType" />
+      <xs:element maxOccurs="1" minOccurs="0" name="user_4" type="limitType" />
+      <xs:element maxOccurs="1" minOccurs="0" name="user_5" type="limitType" />
+      <xs:element maxOccurs="1" minOccurs="0" name="user_6" type="limitType" />
+      <xs:element maxOccurs="1" minOccurs="0" name="user_7" type="limitType" />
     </xs:all>
   </xs:complexType>
 
@@ -204,10 +225,25 @@
       <xs:element minOccurs="0" maxOccurs="unbounded" type="xs:float" name="flipAngle_deg" />
       <xs:element minOccurs="0" maxOccurs="1" type="xs:string" name="sequence_type" />
       <xs:element minOccurs="0" maxOccurs="unbounded" type="xs:float" name="echo_spacing" />
+      <xs:element minOccurs="0" maxOccurs="unbounded" type="diffusionType" name="diffusion"/>
+    </xs:sequence>
+  </xs:complexType>
 
+  <xs:complexType name="diffusionType">
+    <xs:sequence>
+      <xs:element type="gradientDirectionType" name="gradientDirection" />
+      <xs:element type="xs:float" name="bvalue"/>
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="gradientDirectionType">
+    <xs:all>
+      <xs:element type="xs:float" name="rl"/>
+      <xs:element type="xs:float" name="ap"/>
+      <xs:element type="xs:float" name="fh"/>
+    </xs:all>
+  </xs:complexType>
+
   <xs:complexType name="userParameterLongType">
     <xs:all>
       <xs:element name="name" type="xs:string" />

diff --git a/setup.py b/setup.py
@@ -65,7 +65,7 @@ def to_uri(filename):
     keywords='ismrmrd',
     url='https://ismrmrd.github.io',
     long_description = long_description,
-    long_description_content_type='text/markdown'
+    long_description_content_type='text/markdown',
     packages=find_packages(),
     classifiers=[
         'Development Status :: 5 - Production/Stable',