x == y or x == z → x in (y, z)

ImagingDataCommons · Oct 11, 2023 · 0e4d302 · 0e4d302
1 parent 1cc2481
commit 0e4d302
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/highdicom/pr/content.py b/src/highdicom/pr/content.py
@@ -265,10 +265,7 @@ def __init__(
                         'that the first and last points are equal, '
                         'i.e., that the graphic has a closed contour. '
                     )
-        if (
-            units == AnnotationUnitsValues.PIXEL or
-            units == AnnotationUnitsValues.MATRIX
-        ):
+        if units in (AnnotationUnitsValues.PIXEL, AnnotationUnitsValues.MATRIX):
             if graphic_data.min() < 0.0:
                 raise ValueError('Graphic data must be non-negative.')
         elif units == AnnotationUnitsValues.DISPLAY:

diff --git a/src/highdicom/sr/templates.py b/src/highdicom/sr/templates.py
@@ -110,8 +110,8 @@ def _count_roi_items(
     n_region_in_space_items = 0
     for item in group_item.ContentSequence:
         if (item.name == codes.DCM.ImageRegion and
-                (item.value_type == ValueTypeValues.SCOORD or
-                 item.value_type == ValueTypeValues.SCOORD3D)):
+                item.value_type in (ValueTypeValues.SCOORD,
+                                    ValueTypeValues.SCOORD3D)):
             n_image_region_items += 1
         if (item.name == codes.DCM.VolumeSurface and
                 item.value_type == ValueTypeValues.SCOORD3D):

diff --git a/src/highdicom/utils.py b/src/highdicom/utils.py
@@ -121,7 +121,7 @@ def compute_plane_position_tiled_full(
         slice_index is not None,
         spacing_between_slices is not None,
     )
-    if not (sum(provided_3d_params) == 0 or sum(provided_3d_params) == 2):
+    if sum(provided_3d_params) not in (0, 2):
         raise TypeError(
             'None or both of the following parameters need to be provided: '
             '"slice_index", "spacing_between_slices"'