Add Pulseq types to MRD

.devcontainer/Dockerfile

@@ -90,7 +90,7 @@ RUN . /opt/conda/etc/profile.d/conda.sh \
 
 
 # Install the yardl tool
-ARG YARDL_VERSION=0.6.4
+ARG YARDL_VERSION=0.6.5
 RUN wget --quiet "https://github.com/microsoft/yardl/releases/download/v${YARDL_VERSION}/yardl_${YARDL_VERSION}_linux_x86_64.tar.gz" \
     && tar -xzf "yardl_${YARDL_VERSION}_linux_x86_64.tar.gz" \
     && mv yardl "/opt/conda/envs/${CONDA_ENVIRONMENT_NAME}/bin/" \

.github/workflows/mrd_build.yml

@@ -11,7 +11,7 @@ on:
 env:
   # Increase this to manually reset the conda environment cache
   CONDA_CACHE_NUMBER: 0
-  YARDL_VERSION: 0.6.4
+  YARDL_VERSION: 0.6.5
 
 defaults:
   run:

cpp/mrd-tools/converters.cc

@@ -1087,6 +1087,11 @@ ISMRMRD::Image<std::complex<double>> convert(Image<std::complex<double>>& im) {
   return convert<std::complex<double>>(im);
 }
 
+// Convert mrd::AcquisitionPrototype - no equivalent in ISMRMRD::
+int convert(AcquisitionPrototype&) {
+  return 0;
+}
+
 // Convert mrd::AcquisitionBucket - no equivalent in ISMRMRD::
 int convert(AcquisitionBucket&) {
   return 0;
@@ -1107,6 +1112,41 @@ int convert(ArrayComplexFloat&) {
   return 0;
 }
 
+// no equivalent in ISMRMRD::
+int convert(PulseqDefinitions&) {
+  return 0;
+}
+
+// no equivalent in ISMRMRD::
+int convert(std::vector<Block>&) {
+  return 0;
+}
+
+// no equivalent in ISMRMRD:://
+int convert(RFEvent&) {
+  return 0;
+}
+
+// no equivalent in ISMRMRD::
+int convert(ArbitraryGradient&) {
+  return 0;
+}
+
+// no equivalent in ISMRMRD::
+int convert(TrapezoidalGradient&) {
+  return 0;
+}
+
+// no equivalent in ISMRMRD::
+int convert(ADCEvent&) {
+  return 0;
+}
+
+// no equivalent in ISMRMRD::
+int convert(Shape&) {
+  return 0;
+}
+
 yardl::Date date_from_string(const std::string& s) {
   std::stringstream ss{s};
 

cpp/mrd-tools/converters.h

@@ -2,8 +2,8 @@
 
 #include "mrd/types.h"
 
-#include <ismrmrd/xml.h>
 #include <ismrmrd/waveform.h>
+#include <ismrmrd/xml.h>
 
 namespace mrd::converters {
 
@@ -22,6 +22,14 @@ int convert(AcquisitionBucket&);
 int convert(ReconData&);
 int convert(ImageArray&);
 int convert(ArrayComplexFloat&);
+int convert(AcquisitionPrototype&);
+int convert(PulseqDefinitions&);
+int convert(std::vector<Block>&);
+int convert(RFEvent&);
+int convert(ArbitraryGradient&);
+int convert(TrapezoidalGradient&);
+int convert(ADCEvent&);
+int convert(Shape&);
 
 Header convert(ISMRMRD::IsmrmrdHeader& hdr);
 Acquisition convert(ISMRMRD::Acquisition& acq);

cpp/mrd/hdf5/protocols.h

@@ -28,7 +28,7 @@ class MrdWriter : public mrd::MrdWriterBase, public yardl::hdf5::Hdf5Writer {
   void Flush() override;
 
   private:
-  std::unique_ptr<yardl::hdf5::UnionDatasetWriter<14>> data_dataset_state_;
+  std::unique_ptr<yardl::hdf5::UnionDatasetWriter<22>> data_dataset_state_;
 };
 
 // HDF5 reader for the Mrd protocol.
@@ -42,7 +42,7 @@ class MrdReader : public mrd::MrdReaderBase, public yardl::hdf5::Hdf5Reader {
   bool ReadDataImpl(mrd::StreamItem& value) override;
 
   private:
-  std::unique_ptr<yardl::hdf5::UnionDatasetReader<14>> data_dataset_state_;
+  std::unique_ptr<yardl::hdf5::UnionDatasetReader<22>> data_dataset_state_;
 };
 
 // HDF5 writer for the MrdNoiseCovariance protocol.