Skip to content

Commit b4ab63b

Browse files
dchansendchansen
committed
Fixed bug in setup.py
1 parent c3e1d86 commit b4ab63b

File tree

2 files changed

+48
-12
lines changed

2 files changed

+48
-12
lines changed

‎schema/ismrmrd.xsd‎

Lines changed: 47 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<xs:all>
2323
<xs:element minOccurs="0" name="patientName" type="xs:string" />
2424
<xs:element minOccurs="0" name="patientWeight_kg" type="xs:float" />
25+
<xs:element minOccurs="0" name="patientHeight_m" type="xs:float"/>
2526
<xs:element minOccurs="0" name="patientID" type="xs:string" />
2627
<xs:element minOccurs="0" name="patientBirthdate" type="xs:date" />
2728
<xs:element minOccurs="0" name="patientGender">
@@ -43,6 +44,7 @@
4344
<xs:element minOccurs="0" maxOccurs="1" name="referringPhysicianName" type="xs:string" />
4445
<xs:element minOccurs="0" maxOccurs="1" name="studyDescription" type="xs:string" />
4546
<xs:element minOccurs="0" maxOccurs="1" name="studyInstanceUID" type="xs:string" />
47+
<xs:element minOccurs="0" maxOccurs="1" name="bodyPartExamined" type="xs:string" />
4648
</xs:all>
4749
</xs:complexType>
4850

@@ -65,9 +67,10 @@
6567
<xs:element minOccurs="0" name="seriesDate" type="xs:date" />
6668
<xs:element minOccurs="0" name="seriesTime" type="xs:time" />
6769
<xs:element minOccurs="1" name="patientPosition" type="patientPositionType" />
68-
<xs:element minOccurs="0" name="relativeTablePosition" type="threeDimensionalFloatType" />
70+
<xs:element minOccurs="0" name="relativeTablePosition" type="threeDimensionalFloat" />
6971
<xs:element minOccurs="0" name="initialSeriesNumber" type="xs:long" />
7072
<xs:element minOccurs="0" name="protocolName" type="xs:string" />
73+
<xs:element minOccurs="0" name="sequenceName" type="xs:string" />
7174
<xs:element minOccurs="0" name="seriesDescription" type="xs:string" />
7275
<xs:element maxOccurs="unbounded" minOccurs="0" name="measurementDependency" type="measurementDependencyType" />
7376
<xs:element minOccurs="0" name="seriesInstanceUIDRoot" type="xs:string" />
@@ -101,6 +104,7 @@
101104
<xs:element minOccurs="0" maxOccurs="1" name="institutionName" type="xs:string" />
102105
<xs:element minOccurs="0" maxOccurs="1" name="stationName" type="xs:string" />
103106
<xs:element minOccurs="0" maxOccurs="1" name="deviceID" type="xs:string" />
107+
<xs:element minOccurs="0" maxOccurs="1" name="deviceSerialNumber" type="xs:string" />
104108
</xs:sequence>
105109
</xs:complexType>
106110

@@ -119,16 +123,24 @@
119123
<xs:element maxOccurs="1" minOccurs="0" name="trajectoryDescription" type="trajectoryDescriptionType" />
120124
<xs:element maxOccurs="1" minOccurs="0" name="parallelImaging" type="parallelImagingType" />
121125
<xs:element maxOccurs="1" minOccurs="0" name="echoTrainLength" type="xs:long" />
126+
<xs:element maxOccurs="1" minOccurs="0" name="multiband" type="multibandType"/>
122127
</xs:all>
123128
</xs:complexType>
124129

125130
<xs:complexType name="encodingSpaceType">
126131
<xs:all>
127132
<xs:element maxOccurs="1" minOccurs="1" name="matrixSize" type="matrixSizeType" />
128-
<xs:element maxOccurs="1" minOccurs="1" name="fieldOfView_mm" type="fieldOfView_mmType" />
133+
<xs:element maxOccurs="1" minOccurs="1" name="fieldOfView_mm" type="fieldOfView_mm" />
129134
</xs:all>
130135
</xs:complexType>
131136

137+
<xs:complexType name="multibandType">
138+
<xs:sequence>
139+
<xs:element maxOccurs="unbounded" minOccurs="1" name="spacing" type="xs:float"/>
140+
<xs:element name="phaseShift" type="xs:float"/>
141+
</xs:sequence>
142+
</xs:complexType>
143+
132144
<xs:complexType name="matrixSizeType">
133145
<xs:sequence>
134146
<xs:element default="1" maxOccurs="1" minOccurs="1" name="x" type="xs:unsignedShort" />
@@ -137,14 +149,23 @@
137149
</xs:sequence>
138150
</xs:complexType>
139151

140-
<xs:complexType name="fieldOfView_mmType">
152+
<xs:complexType name="fieldOfView_mm">
141153
<xs:sequence>
142154
<xs:element maxOccurs="1" minOccurs="1" name="x" type="xs:float" />
143155
<xs:element maxOccurs="1" minOccurs="1" name="y" type="xs:float" />
144156
<xs:element maxOccurs="1" minOccurs="1" name="z" type="xs:float" />
145157
</xs:sequence>
146158
</xs:complexType>
147159

160+
<xs:complexType name="threeDimensionalFloat">
161+
<xs:sequence>
162+
<xs:element maxOccurs="1" minOccurs="1" name="x" type="xs:float" />
163+
<xs:element maxOccurs="1" minOccurs="1" name="y" type="xs:float" />
164+
<xs:element maxOccurs="1" minOccurs="1" name="z" type="xs:float" />
165+
</xs:sequence>
166+
</xs:complexType>
167+
168+
148169
<xs:complexType name="limitType">
149170
<xs:all>
150171
<xs:element default="0" name="minimum" type="xs:unsignedShort" />
@@ -153,14 +174,6 @@
153174
</xs:all>
154175
</xs:complexType>
155176

156-
<xs:complexType name="threeDimensionalFloatType">
157-
<xs:sequence>
158-
<xs:element maxOccurs="1" minOccurs="1" name="x" type="xs:float" />
159-
<xs:element maxOccurs="1" minOccurs="1" name="y" type="xs:float" />
160-
<xs:element maxOccurs="1" minOccurs="1" name="z" type="xs:float" />
161-
</xs:sequence>
162-
</xs:complexType>
163-
164177
<xs:complexType name="encodingLimitsType">
165178
<xs:all>
166179
<xs:element maxOccurs="1" minOccurs="0" name="kspace_encoding_step_0" type="limitType" />
@@ -173,6 +186,14 @@
173186
<xs:element maxOccurs="1" minOccurs="0" name="repetition" type="limitType" />
174187
<xs:element maxOccurs="1" minOccurs="0" name="set" type="limitType" />
175188
<xs:element maxOccurs="1" minOccurs="0" name="segment" type="limitType" />
189+
<xs:element maxOccurs="1" minOccurs="0" name="user_0" type="limitType" />
190+
<xs:element maxOccurs="1" minOccurs="0" name="user_1" type="limitType" />
191+
<xs:element maxOccurs="1" minOccurs="0" name="user_2" type="limitType" />
192+
<xs:element maxOccurs="1" minOccurs="0" name="user_3" type="limitType" />
193+
<xs:element maxOccurs="1" minOccurs="0" name="user_4" type="limitType" />
194+
<xs:element maxOccurs="1" minOccurs="0" name="user_5" type="limitType" />
195+
<xs:element maxOccurs="1" minOccurs="0" name="user_6" type="limitType" />
196+
<xs:element maxOccurs="1" minOccurs="0" name="user_7" type="limitType" />
176197
</xs:all>
177198
</xs:complexType>
178199

@@ -204,10 +225,25 @@
204225
<xs:element minOccurs="0" maxOccurs="unbounded" type="xs:float" name="flipAngle_deg" />
205226
<xs:element minOccurs="0" maxOccurs="1" type="xs:string" name="sequence_type" />
206227
<xs:element minOccurs="0" maxOccurs="unbounded" type="xs:float" name="echo_spacing" />
228+
<xs:element minOccurs="0" maxOccurs="unbounded" type="diffusionType" name="diffusion"/>
229+
</xs:sequence>
230+
</xs:complexType>
207231

232+
<xs:complexType name="diffusionType">
233+
<xs:sequence>
234+
<xs:element type="gradientDirectionType" name="gradientDirection" />
235+
<xs:element type="xs:float" name="bvalue"/>
208236
</xs:sequence>
209237
</xs:complexType>
210238

239+
<xs:complexType name="gradientDirectionType">
240+
<xs:all>
241+
<xs:element type="xs:float" name="rl"/>
242+
<xs:element type="xs:float" name="ap"/>
243+
<xs:element type="xs:float" name="fh"/>
244+
</xs:all>
245+
</xs:complexType>
246+
211247
<xs:complexType name="userParameterLongType">
212248
<xs:all>
213249
<xs:element name="name" type="xs:string" />

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def to_uri(filename):
6565
keywords='ismrmrd',
6666
url='https://ismrmrd.github.io',
6767
long_description = long_description,
68-
long_description_content_type='text/markdown'
68+
long_description_content_type='text/markdown',
6969
packages=find_packages(),
7070
classifiers=[
7171
'Development Status :: 5 - Production/Stable',

0 commit comments

Comments
 (0)