Fix anonymization logic

DICOM anonymization was previously not working due to incorrect if
logic. This commit changes anonymization to work from a list of
attributes to remove, lowering possibility for error and increasing ease
of extension for future fields.

Author: spolcyn

rtCommon/imageHandling.py

@@ -58,37 +58,28 @@ def getDicomFileName(cfg, scanNum, fileNum):
 
     return fullFileName
 
+attributesToAnonymize = [
+        'PatientID', 'PatientAge', 'PatientBirthDate', 'PatientName',
+        'PatientSex', 'PatientSize', 'PatientWeight', 'PatientPosition',
+        'StudyDate', 'StudyTime', 'SeriesDate', 'SeriesTime',
+        'AcquisitionDate', 'AcquisitionTime', 'ContentDate', 'ContentTime',
+        'InstanceCreationDate', 'InstanceCreationTime',
+        'PerformedProcedureStepStartDate', 'PerformedProcedureStepStartTime'
+]
 
 def anonymizeDicom(dicomImg):
     """
     This function takes in the dicom image that you read in and deletes
-    lots of different variables. The purpose of this is to anonymize the
+    lots of different attributes. The purpose of this is to anonymize the
     dicom data before transferring it to the cloud.
 
     Used externally.
     """
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.PatientID
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.PatientAge
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.PatientBirthDate
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.PatientName
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.PatientSex
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.PatientSize
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.PatientWeight
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.PatientPosition
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.StudyDate
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.StudyTime
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.SeriesDate
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.SeriesTime
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.AcquisitionDate
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.AcquisitionTime
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.ContentDate
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.ContentTime
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.InstanceCreationDate
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.InstanceCreationTime
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.PerformedProcedureStepStartDate
-    if hasattr(dicomImg, 'PatientID'): del dicomImg.PerformedProcedureStepStartTime
-    return dicomImg
+    for toAnonymize in attributesToAnonymize:
+        if hasattr(dicomImg, toAnonymize):
+            setattr(dicomImg, toAnonymize, "")
 
+    return dicomImg
 
 def readDicomFromFile(filename):
     """

tests/test_readDicom.py

@@ -40,3 +40,17 @@ def test_readDicom():
 
     fileInterface.fileWatcher.__del__()
     fileInterface.fileWatcher = None
+
+    # Test anonymization of sensitive patient fields
+    def countUnanonymizedSensitiveAttrs(dicomImg):
+        sensitiveAttrs = 0
+        for attr in rd.attributesToAnonymize:
+            if hasattr(dicomImg, attr) and getattr(dicomImg, attr) != "":
+                sensitiveAttrs += 1
+        return sensitiveAttrs
+
+    dicomImg5 = rd.readDicomFromFile(dicomFile)
+    assert countUnanonymizedSensitiveAttrs(dicomImg5) >= 1
+
+    rd.anonymizeDicom(dicomImg5)
+    assert countUnanonymizedSensitiveAttrs(dicomImg5) == 0