Merge pull request #404 from darrencl/refactor-dicom-reads

Add stop_before_pixels to the rest of dicom reads

Author: yarikoptic

heudiconv/dicoms.py

@@ -58,7 +58,9 @@ def group_dicoms_into_seqinfos(files, file_filter, dcmfilter, grouping):
         import nibabel.nicom.dicomwrappers as dw
         # TODO after getting a regression test check if the same behavior
         #      with stop_before_pixels=True
-        mw = dw.wrapper_from_data(dcm.read_file(filename, force=True))
+        mw = dw.wrapper_from_data(
+            dcm.read_file(filename, stop_before_pixels=True, force=True)
+        )
 
         for sig in ('iop', 'ICE_Dims', 'SequenceName'):
             try:

heudiconv/tests/test_dicoms.py

@@ -15,7 +15,7 @@
 
 def test_private_csa_header(tmpdir):
     dcm_file = op.join(TESTS_DATA_PATH, 'axasc35.dcm')
-    dcm_data = dcm.read_file(dcm_file)
+    dcm_data = dcm.read_file(dcm_file, stop_before_pixels=True)
     for pub, priv in DICOM_FIELDS_TO_TEST.items():
         # ensure missing public tag
         with pytest.raises(AttributeError):