From 5f8ca4c31c03ca70b9c7153e1f4f2853b7eb4258 Mon Sep 17 00:00:00 2001
From: Kelvin Chow <kelvin.chow@gmail.com>
Date: Tue, 22 Nov 2022 22:19:04 -0600
Subject: [PATCH] Fix detection of Numaris/X and update stylesheet to account
 for missing imageColumns

---
 main.cpp                                      |  2 +-
 .../IsmrmrdParameterMap_Siemens_NX.xsl        | 68 ++++++++++++++-----
 2 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/main.cpp b/main.cpp
index 0dd5582..2723017 100644
--- a/main.cpp
+++ b/main.cpp
@@ -803,7 +803,7 @@ int main(int argc, char* argv[]) {
         std::cout << "Protocol name: " << protocol_name << std::endl;
 
         bool isNX = false;
-        if ((baseLineString.find("NXVA") != std::string::npos) || (software_version.find("XA11") != std::string::npos) )
+        if ((baseLineString.find("NXVA") != std::string::npos) || (software_version.find("syngo MR XA") != std::string::npos) )
         {
             isNX = true;
         }
diff --git a/parameter_maps/IsmrmrdParameterMap_Siemens_NX.xsl b/parameter_maps/IsmrmrdParameterMap_Siemens_NX.xsl
index 4fd2681..95ee44d 100644
--- a/parameter_maps/IsmrmrdParameterMap_Siemens_NX.xsl
+++ b/parameter_maps/IsmrmrdParameterMap_Siemens_NX.xsl
@@ -59,6 +59,10 @@
 
     <xsl:variable name="strSeperator">_</xsl:variable>
 
+    <xsl:variable name="pixelSpacing">
+        <xsl:value-of select="siemens/MEAS/sSliceArray/asSlice/s0/dReadoutFOV * 0.5 * siemens/YAPS/flReadoutOSFactor div siemens/MEAS/sKSpace/lBaseResolution"/>
+    </xsl:variable>
+
     <xsl:template match="/">
         <ismrmrdHeader xsi:schemaLocation="http://www.ismrm.org/ISMRMRD ismrmrd.xsd"
                 xmlns="http://www.ismrm.org/ISMRMRD"
@@ -337,18 +341,26 @@
 
                 <encodedSpace>
                     <matrixSize>
-
                         <xsl:choose>
-                            <xsl:when test="siemens/MEAS/sKSpace/ucTrajectory = 1">
+                        <xsl:when test="siemens/MEAS/sKSpace/ucTrajectory = 1">
+                            <x>
+                                <xsl:value-of select="siemens/YAPS/iNoOfFourierColumns"/>
+                            </x>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:choose>
+                            <xsl:when test="(siemens/IRIS/DERIVED/imageColumns) and (siemens/IRIS/DERIVED/imageColumns > 0)">
                                 <x>
-                                    <xsl:value-of select="siemens/YAPS/iNoOfFourierColumns"/>
+                                    <xsl:value-of select="siemens/IRIS/DERIVED/imageColumns"/>
                                 </x>
                             </xsl:when>
                             <xsl:otherwise>
                                 <x>
-                                    <xsl:value-of select="siemens/IRIS/DERIVED/imageColumns"/>
+                                    <xsl:value-of select="siemens/MEAS/sKSpace/lBaseResolution"/>
                                 </x>
                             </xsl:otherwise>
+                            </xsl:choose>
+                        </xsl:otherwise>
                         </xsl:choose>
 
                         <xsl:choose>
@@ -408,21 +420,41 @@
                 </encodedSpace>
                 <reconSpace>
                     <matrixSize>
-                        <x>
-                            <xsl:value-of select="siemens/IRIS/DERIVED/imageColumns"/>
-                        </x>
-                        <y>
-                            <xsl:value-of select="siemens/IRIS/DERIVED/imageLines"/>
-                        </y>
                         <xsl:choose>
-                            <xsl:when test="siemens/YAPS/i3DFTLength = 1">
-                                <z>1</z>
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <z>
-                                    <xsl:value-of select="siemens/MEAS/sKSpace/lImagesPerSlab"/>
-                                </z>
-                            </xsl:otherwise>
+                        <xsl:when test="(siemens/IRIS/DERIVED/imageColumns) and (siemens/IRIS/DERIVED/imageColumns > 0)">
+                            <x>
+                                <xsl:value-of select="siemens/IRIS/DERIVED/imageColumns"/>
+                            </x>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <x>
+                                <xsl:value-of select="siemens/MEAS/sKSpace/lBaseResolution"/>
+                            </x>
+                        </xsl:otherwise>
+                        </xsl:choose>
+
+                        <xsl:choose>
+                        <xsl:when test="(siemens/IRIS/DERIVED/imageLines) and (siemens/IRIS/DERIVED/imageLines > 0)">
+                            <y>
+                                <xsl:value-of select="siemens/IRIS/DERIVED/imageLines"/>
+                            </y>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <y>
+                                <xsl:value-of select="floor(siemens/MEAS/sSliceArray/asSlice/s0/dPhaseFOV * (1+$phaseOversampling) div $pixelSpacing + 0.5)"/>
+                            </y>
+                        </xsl:otherwise>
+                        </xsl:choose>
+
+                        <xsl:choose>
+                        <xsl:when test="siemens/YAPS/i3DFTLength = 1">
+                            <z>1</z>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <z>
+                                <xsl:value-of select="siemens/MEAS/sKSpace/lImagesPerSlab"/>
+                            </z>
+                        </xsl:otherwise>
                         </xsl:choose>
                     </matrixSize>
                     <fieldOfView_mm>