[ismrmrd] 220/281: add multiple measurements

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag ismrmrd0.5
in repository ismrmrd.

commit a5f430453008f7923c636febb8165f594bfcfd25
Author: Hui Xue <hui.xue at nih.gov>
Date:   Fri Apr 4 10:13:10 2014 -0400

    add multiple measurements
---
 ismrmrd.h          |  7 +++----
 schema/ismrmrd.xsd | 12 ++++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ismrmrd.h b/ismrmrd.h
index 9b3d031..c4680b2 100644
--- a/ismrmrd.h
+++ b/ismrmrd.h
@@ -95,18 +95,17 @@ enum AcquisitionFlags {
     ACQ_LAST_IN_SET                             = 16,
     ACQ_FIRST_IN_SEGMENT                        = 17,
     ACQ_LAST_IN_SEGMENT                         = 18,
-
-    ACQ_LAST_IN_MEASUREMENT                     = 25,
-
     ACQ_IS_NOISE_MEASUREMENT                    = 19,
     ACQ_IS_PARALLEL_CALIBRATION                 = 20,
     ACQ_IS_PARALLEL_CALIBRATION_AND_IMAGING     = 21,
     ACQ_IS_REVERSE                              = 22,
     ACQ_IS_NAVIGATION_DATA                      = 23,
     ACQ_IS_PHASECORR_DATA                       = 24,
-    ACQ_IS_RTFEEDBACK_DATA                      = 25,
+    ACQ_LAST_IN_MEASUREMENT                     = 25,
     ACQ_IS_HPFEEDBACK_DATA                      = 26,
     ACQ_IS_DUMMYSCAN_DATA                       = 27,
+    ACQ_IS_RTFEEDBACK_DATA                      = 28,
+    ACQ_IS_SURFACECOILCORRECTIONSCAN_DATA       = 29,
 
     ACQ_USER1                                   = 57,
     ACQ_USER2                                   = 58,
diff --git a/schema/ismrmrd.xsd b/schema/ismrmrd.xsd
index 9b675b7..55e337e 100644
--- a/schema/ismrmrd.xsd
+++ b/schema/ismrmrd.xsd
@@ -47,6 +47,7 @@
 
   <xs:complexType name="measurementInformationType">
     <xs:all>
+      <xs:element minOccurs="0" name="measurementID" type="xs:string"/>
       <xs:element minOccurs="0" name="seriesDate" type="xs:date"/>
       <xs:element minOccurs="0" name="seriesTime" type="xs:time"/>
       <xs:element minOccurs="1" name="patientPosition">
@@ -66,6 +67,17 @@
       <xs:element minOccurs="0" name="initialSeriesNumber" type="xs:long"/>
       <xs:element minOccurs="0" name="protocolName" type="xs:string"/>
       <xs:element minOccurs="0" name="seriesDescription" type="xs:string"/>
+      <xs:element maxOccurs="1" minOccurs="0" name="measurementDependencyIDs" type="measurementDependenciesType"/>
+    </xs:all>
+  </xs:complexType>
+
+  <xs:complexType name="measurementDependenciesType">
+    <xs:all>
+      <xs:element maxOccurs="1" minOccurs="0" name="noiseMeasurement" type="xs:string"/>
+      <xs:element maxOccurs="1" minOccurs="0" name="surfaceCoilCorrectionMeasurement" type="xs:string"/>
+      <xs:element maxOccurs="1" minOccurs="0" name="otherMeasurement1" type="xs:string"/>
+      <xs:element maxOccurs="1" minOccurs="0" name="otherMeasurement2" type="xs:string"/>
+      <xs:element maxOccurs="1" minOccurs="0" name="otherMeasurement3" type="xs:string"/>
     </xs:all>
   </xs:complexType>
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git