Fixed bug in dict reading in phillips metadata creation. (#66)

CHANGELOG.md

@@ -1,5 +1,9 @@
 This document contains the Spec2nii release history in reverse chronological order.
 
+0.6.5 (Wednesday 8th February 2023)
+-----------------------------------
+- Fixed bug in philips and rda metadata translation functions.
+
 0.6.4 (Tuesday 7th February 2023)
 ---------------------------------
 - Added first pass at new `spec2nii auto` feature with automatic conversion for some formats.

spec2nii/Philips/philips.py

@@ -172,13 +172,13 @@ def spar_to_nmrs_hdrext(spar_dict):
         spar_dict["nucleus"])
 
     def set_standard_def(nifti_mrs_key, location, key, cast=None):
-        try:
+        if key in location\
+                and location[key] is not None:
             if cast is not None:
-                obj.set_standard_def(nifti_mrs_key, cast(getattr(location, key)))
+                obj.set_standard_def(nifti_mrs_key, cast(location[key]))
             else:
-                obj.set_standard_def(nifti_mrs_key, getattr(location, key))
-        except AttributeError:
-            pass
+                obj.set_standard_def(nifti_mrs_key, location[key])
+
     # # 5.1 MRS specific Tags
     # 'EchoTime'
     obj.set_standard_def('EchoTime', float(spar_dict['echo_time']) * 1E-3)

spec2nii/Siemens/rda.py

@@ -123,13 +123,12 @@ def extractRdaMetadata(hdr):
 
     # Standard defined metadata
     def set_standard_def(nifti_mrs_key, location, key, cast=None):
-        try:
+        if key in location\
+                and location[key] is not None:
             if cast is not None:
-                obj.set_standard_def(nifti_mrs_key, cast(getattr(location, key)))
+                obj.set_standard_def(nifti_mrs_key, cast(location[key]))
             else:
-                obj.set_standard_def(nifti_mrs_key, getattr(location, key))
-        except AttributeError:
-            pass
+                obj.set_standard_def(nifti_mrs_key, location[key])
 
     # # 5.1 MRS specific Tags
     # 'EchoTime'

tests/test_philips_sdat_spar.py

@@ -48,6 +48,7 @@ def test_svs(tmp_path):
     assert hdr_ext['SpectrometerFrequency'][0] == 127.759464
     assert hdr_ext['ResonantNucleus'][0] == '1H'
     assert hdr_ext['OriginalFile'][0] == svs_path_sdat.name
+    assert hdr_ext['SoftwareVersions'] == '5.5.2 ; .5.2 ;'
 
 
 def test_svs_edit(tmp_path):