diff --git a/CMakeLists.txt b/CMakeLists.txt index 34046f3..a3a0379 100644 --- a/CMakeLists.txt +++ b/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 2) +set(SIEMENS_TO_ISMRMRD_VERSION_PATCH 3) 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 @@ -67,7 +67,7 @@ set(Boost_USE_STATIC_RUNTIME OFF) find_package(Boost COMPONENTS system thread program_options filesystem timer REQUIRED) -find_package(ISMRMRD 1.7.0 REQUIRED) +find_package(ISMRMRD 1.8.0 REQUIRED) find_package(HDF5 REQUIRED COMPONENTS C) include_directories( ${ISMRMRD_INCLUDE_DIR} ${HDF5_C_INCLUDE_DIR} ) diff --git a/dependencies/ismrmrd b/dependencies/ismrmrd index 2290200..94b46a3 100644 --- a/dependencies/ismrmrd +++ b/dependencies/ismrmrd @@ -1 +1 @@ -7354a092536876a6bf675d73eb5e05a953a1a5b0 +5672c474292f0b87e9c0aedcb5f1bc87ef0544f8 \ No newline at end of file diff --git a/main.cpp b/main.cpp index 5d3f143..cf560cd 100644 --- a/main.cpp +++ b/main.cpp @@ -1105,9 +1105,9 @@ getAcquisition(bool flash_pat_ref_scan, const Trajectory &trajectory, long dwell } // std::cout << "ismrmrd_acq.sample_time_us(): " << ismrmrd_acq.sample_time_us() << std::endl; - ismrmrd_acq.position()[0] = scanhead.sSliceData.sSlicePosVec.flSag + (float) (global_table_pos[0]); - ismrmrd_acq.position()[1] = scanhead.sSliceData.sSlicePosVec.flCor + (float) (global_table_pos[1]); - ismrmrd_acq.position()[2] = scanhead.sSliceData.sSlicePosVec.flTra + (float) (global_table_pos[2]); + ismrmrd_acq.position()[0] = scanhead.sSliceData.sSlicePosVec.flSag;// + (float) (global_table_pos[0]); + ismrmrd_acq.position()[1] = scanhead.sSliceData.sSlicePosVec.flCor;// + (float) (global_table_pos[1]); + ismrmrd_acq.position()[2] = scanhead.sSliceData.sSlicePosVec.flTra;// + (float) (global_table_pos[2]); // Convert Siemens quaternions to direction cosines. // In the Siemens convention the quaternion corresponds to a rotation matrix with columns P R S diff --git a/parameter_maps/IsmrmrdParameterMap_Siemens.xml b/parameter_maps/IsmrmrdParameterMap_Siemens.xml index fcec622..5488171 100644 --- a/parameter_maps/IsmrmrdParameterMap_Siemens.xml +++ b/parameter_maps/IsmrmrdParameterMap_Siemens.xml @@ -84,6 +84,9 @@

HEADER.MeasUID siemens.HEADER.MeasUID

YAPS.tPatientPosition siemens.YAPS.tPatientPosition

+

DICOM.lGlobalTablePosSag siemens.DICOM.lGlobalTablePosSag

+

DICOM.lGlobalTablePosCor siemens.DICOM.lGlobalTablePosCor

+

DICOM.lGlobalTablePosTra siemens.DICOM.lGlobalTablePosTra

MEAS.tProtocolName siemens.MEAS.tProtocolName

YAPS.ReconMeasDependencies.0 siemens.YAPS.ReconMeasDependencies.RFMap

YAPS.ReconMeasDependencies.1 siemens.YAPS.ReconMeasDependencies.SenMap

diff --git a/parameter_maps/IsmrmrdParameterMap_Siemens.xsl b/parameter_maps/IsmrmrdParameterMap_Siemens.xsl index 4638608..446e639 100644 --- a/parameter_maps/IsmrmrdParameterMap_Siemens.xsl +++ b/parameter_maps/IsmrmrdParameterMap_Siemens.xsl @@ -99,9 +99,38 @@ + + + + + + + + + 0.0 + + + + + + + + 0.0 + + + + + + + + 0.0 + + + +