Merge pull request #86 from satra/fix/metacompare

fix: minmeta added to convert and assertion removed to enable numeric comparison

Author: satra

Dockerfile

@@ -15,9 +15,12 @@ RUN conda install -y -c conda-forge nipype && \
     pip install https://github.com/moloney/dcmstack/archive/c12d27d2c802d75a33ad70110124500a83e851ee.zip && \
     pip install datalad && \
     conda clean -tipsy && rm -rf ~/.pip/
-RUN cd /tmp && git clone https://github.com/neurolabusc/dcm2niix.git && \
+RUN apt-get update && apt-get upgrade -y && \
+    apt-get install -y pigz && \
+    apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y && \
+    cd /tmp && git clone https://github.com/neurolabusc/dcm2niix.git && \
     cd dcm2niix && \
-    git checkout 60bab318ee738b644ebb1396bbb8cbe1b006218f && \
+    git checkout 0dc154d9aab4679e487abeaee1759c61559fc7a8 && \
     mkdir build && cd build && cmake -DBATCH_VERSION=ON .. && \
     make && make install && \
     cd / && rm -rf /tmp/dcm2niix

bin/heudiconv

@@ -233,7 +233,8 @@ def json_dumps_pretty(j, indent=2, sort_keys=True):
     # no spaces after [
     js_ = re.sub('\[ ', '[', js_)
     j_ = json.loads(js_)
-    assert(j == j_)
+    # Removed assert as it does not do any floating point comparison
+    #assert(j == j_)
     return js_
 
 
@@ -412,11 +413,9 @@ def group_dicoms_into_seqinfos(
             series_id = series_id + (file_studyUID,)
 
 
-        #print fidx, N, filename
         ingrp = False
         for idx in range(len(mwgroup)):
             same = mw.is_same_series(mwgroup[idx])
-            #print idx, same, groups[idx][0]
             if same:
                 # the same series should have the same study uuid
                 assert mwgroup[idx].dcm_data.get('StudyInstanceUID', None) == file_studyUID
@@ -1348,7 +1347,8 @@ def convert_dicoms(sid,
                 with_prov=with_prov,
                 is_bids=is_bids,
                 sourcedir=sourcedir,
-                outdir=tdir)
+                outdir=tdir,
+                min_meta=min_meta)
 
     if is_bids:
         if seqinfo: