revert changes no longer needed

Author: bpinsard

heudiconv/dicoms.py

@@ -183,6 +183,9 @@ def validate_dicom(
     except AttributeError as e:
         lgr.warning('Ignoring %s since not quite a "normal" DICOM: %s', fl, e)
         return None
+    if dcmfilter is not None and dcmfilter(mw.dcm_data):
+        lgr.warning("Ignoring %s because of DICOM filter", fl)
+        return None
     if mw.dcm_data[0x0008, 0x0016].repval in (
         "Raw Data Storage",
         "GrayscaleSoftcopyPresentationStateStorage",
@@ -194,9 +197,6 @@ def validate_dicom(
     except AttributeError:
         lgr.info("File {} is missing any StudyInstanceUID".format(fl))
         file_studyUID = None
-    if dcmfilter is not None and dcmfilter(mw.dcm_data):
-        lgr.warning("Ignoring %s because of DICOM filter", fl)
-        return None
     # clean series signature
     for sig in ("iop", "ICE_Dims", "SequenceName"):
         try:

heudiconv/heuristics/reproin.py

@@ -226,7 +226,7 @@ def _delete_chars(from_str: str, deletechars: str) -> str:
 
 def filter_dicom(dcmdata: dcm.dataset.Dataset) -> bool:
     """Return True if a DICOM dataset should be filtered out, else False"""
-    return True if dcmdata.get("StudyInstanceUID") in dicoms2skip else False
+    return True if dcmdata.StudyInstanceUID in dicoms2skip else False
 
 
 def filter_files(_fn: str) -> bool: