Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions dcm2bids/sidecar.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ def compare_float(name, pattern):
if len(sub_pattern) != 1:
raise ValueError(f"List for key {comparison} "
"should have only one value. "
"Error val: {sub_pattern}")
f"Error val: {sub_pattern}")

sub_pattern = float(sub_pattern[0])
else:
Expand All @@ -384,9 +384,11 @@ def compare_float(name, pattern):
if isinstance(pattern, dict):
if len(pattern.keys()) == 1:
if "any" in pattern.keys():
result.append(compare_complex(name, pattern))
is_match = compare_complex(name, pattern)
result.append(is_match)
elif list(pattern.keys())[0] in compare_float_keys:
result.append(compare_float(name, pattern))
is_match = compare_float(name, pattern)
result.append(is_match)
else:
self.logger.warning(f"This key {list(pattern.keys())[0]} "
"is not allowed.")
Expand All @@ -395,9 +397,13 @@ def compare_float(name, pattern):
"using only one key.")

elif isinstance(name, list):
result.append(compare_list(name, pattern))
is_match = compare_list(name, pattern)
result.append(is_match)
else:
result.append(compare(name, pattern))
is_match = compare(name, pattern)
result.append(is_match)
if not is_match:
self.logger.debug(f"Criteria not met for {tag}: {name} != {pattern}")

return all(result)

Expand Down