Merge branch 'master' into trajAttachOpt

.github/workflows/siemens_to_ismrmrd_conda.yml

@@ -33,4 +33,7 @@ jobs:
           ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
         working-directory: conda
         run: |
-          ./publish_package.sh -u ismrmrd -t "$ANACONDA_TOKEN" -p `find build_pkg -name siemens_to_ismrmrd*.tar.bz2`
+          for p in $(find build_pkg -name siemens_to_ismrmrd*.tar.bz2)
+          do
+            ./publish_package.sh -u ismrmrd -t "$ANACONDA_TOKEN" -p "$p"
+          done

CMakeLists.txt

@@ -18,7 +18,7 @@ message(STATUS "Looking for packages in : ${CMAKE_PREFIX_PATH}")
 #VERSIONING
 set(SIEMENS_TO_ISMRMRD_VERSION_MAJOR 1)
 set(SIEMENS_TO_ISMRMRD_VERSION_MINOR 2)
-set(SIEMENS_TO_ISMRMRD_VERSION_PATCH 7)
+set(SIEMENS_TO_ISMRMRD_VERSION_PATCH 9)
 set(SIEMENS_TO_ISMRMRD_VERSION_STRING ${SIEMENS_TO_ISMRMRD_VERSION_MAJOR}.${SIEMENS_TO_ISMRMRD_VERSION_MINOR}.${SIEMENS_TO_ISMRMRD_VERSION_PATCH})
 
 # Generate the converter_version.h header file

conda/conda_build_config.yaml

@@ -0,0 +1,3 @@
+boost:
+    - 1.76.0
+    - 1.80.0

conda/meta.yaml

@@ -11,22 +11,22 @@ source:
 
 requirements:
   build:
-    - boost=1.76.0
+    - boost {{ boost }}
     - clang>=13.0.1        # [osx]
     - clangxx>=13.0.1      # [osx]
     - cmake>=3.20.0
     - gcc_linux-64>=9.0.0  # [linux64] 
     - gxx_linux-64>=9.0.0  # [linux64]
-    - ismrmrd=1.12.0
-    - libxml2=2.9.12
-    - libxslt=1.1.33 
+    - ismrmrd=1.13.1
+    - libxml2=2.9
+    - libxslt=1.1 
     - ninja=1.10.*
 
   run:
-    - ismrmrd=1.12.0
-    - boost=1.76.0
-    - libxml2=2.9.12
-    - libxslt=1.1.33 
+    - ismrmrd=1.13.1
+    - boost {{ boost }}
+    - libxml2=2.9
+    - libxslt=1.1 
 
 about:
   home: https://github.com/ismrmrd/siemens_to_ismrmrd

main.cpp

@@ -1011,12 +1011,17 @@ std::vector<ChannelHeaderAndData>
 readChannelHeaders(std::ifstream &siemens_dat, bool VBFILE, const sScanHeader &scanhead) {
     size_t nchannels = scanhead.ushUsedChannels;
     auto channels = std::vector<ChannelHeaderAndData>(nchannels);
-    sMDH mdh;
+
     for (unsigned int c = 0; c < nchannels; c++) {
         if (VBFILE) {
-            if (c > 0) {
-                siemens_dat.read(reinterpret_cast<char *>(&mdh), sizeof(sMDH));
+            if (c == 0) {
+                // Rewind to read mdh again 
+                // It was read once to create scanhead 
+                // Not all parameters are present in scanhead
+                siemens_dat.seekg(-sizeof(sMDH), std::ios_base::cur);
             }
+            sMDH mdh;
+            siemens_dat.read(reinterpret_cast<char*>(&mdh), sizeof(sMDH));
             channels[c].header.ulTypeAndChannelLength = 0;
             channels[c].header.lMeasUID = mdh.lMeasUID;
             channels[c].header.ulScanCounter = mdh.ulScanCounter;