Skip to content

Commit 696aa2a

Browse files
committed
Fix up bugs.
Update cubids.py Update cubids.py Update cubids.py Update cubids.py Update cubids.py Update schema.json Remove prints. Update utils.py Update utils.py Update utils.py Update utils.py Update utils.py Update utils.py Update utils.py Update utils.py Update utils.py Update utils.py Drop try/except.
1 parent a2a44ef commit 696aa2a

File tree

4 files changed

+701
-171
lines changed

4 files changed

+701
-171
lines changed

cubids/cubids.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,12 +1057,16 @@ def get_param_groups_from_entity_set(self, entity_set):
10571057
raise Exception("Fieldmaps must be cached to find parameter groups.")
10581058
key_entities = utils._entity_set_to_entities(entity_set)
10591059
key_entities["extension"] = ".nii[.gz]*"
1060+
# Account for plus signs in entity values
1061+
key_entities = {k: v.replace("+", "\\+") for k, v in key_entities.items() if v is not None}
10601062

10611063
matching_files = self.layout.get(
10621064
return_type="file", scope="self", regex_search=True, **key_entities
10631065
)
1066+
if not matching_files:
1067+
raise Exception(f"No files found for entity set: {key_entities}")
10641068

1065-
# ensure files who's entities contain key_entities but include other
1069+
# ensure files whose entities contain key_entities but include other
10661070
# entities do not also get added to matching_files
10671071
to_include = []
10681072
for filepath in matching_files:
@@ -1256,14 +1260,12 @@ def get_param_groups_dataframes(self):
12561260
labeled_files = []
12571261
param_group_summaries = []
12581262
for entity_set in entity_sets:
1259-
try:
1260-
(
1261-
labeled_file_params,
1262-
param_summary,
1263-
modality,
1264-
) = self.get_param_groups_from_entity_set(entity_set)
1265-
except Exception:
1266-
continue
1263+
(
1264+
labeled_file_params,
1265+
param_summary,
1266+
modality,
1267+
) = self.get_param_groups_from_entity_set(entity_set)
1268+
12671269
if labeled_file_params is None:
12681270
continue
12691271
param_group_summaries.append(param_summary)

cubids/data/config.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,9 @@ sidecar_params:
311311
suggest_variant_rename: yes
312312
FlipAngle:
313313
suggest_variant_rename: yes
314+
ImageOrientationPatientDICOM:
315+
tolerance: 0.0001
316+
suggest_variant_rename: yes
314317
MultibandAccelerationFactor:
315318
suggest_variant_rename: yes
316319
NumberOfVolumesDiscardedByScanner:
@@ -350,6 +353,9 @@ sidecar_params:
350353
suggest_variant_rename: yes
351354
FlipAngle:
352355
suggest_variant_rename: yes
356+
ImageOrientationPatientDICOM:
357+
tolerance: 0.0001
358+
suggest_variant_rename: yes
353359
MultibandAccelerationFactor:
354360
suggest_variant_rename: yes
355361
NumberOfVolumesDiscardedByScanner:
@@ -389,6 +395,9 @@ sidecar_params:
389395
suggest_variant_rename: yes
390396
FlipAngle:
391397
suggest_variant_rename: yes
398+
ImageOrientationPatientDICOM:
399+
tolerance: 0.0001
400+
suggest_variant_rename: yes
392401
MultibandAccelerationFactor:
393402
suggest_variant_rename: yes
394403
NumberOfVolumesDiscardedByScanner:
@@ -428,6 +437,9 @@ sidecar_params:
428437
suggest_variant_rename: yes
429438
FlipAngle:
430439
suggest_variant_rename: yes
440+
ImageOrientationPatientDICOM:
441+
tolerance: 0.0001
442+
suggest_variant_rename: yes
431443
MultibandAccelerationFactor:
432444
suggest_variant_rename: yes
433445
NumberOfVolumesDiscardedByScanner:
@@ -479,6 +491,9 @@ sidecar_params:
479491
suggest_variant_rename: yes
480492
FlipAngle:
481493
suggest_variant_rename: yes
494+
ImageOrientationPatientDICOM:
495+
tolerance: 0.0001
496+
suggest_variant_rename: yes
482497
LabelingDistance:
483498
tolerance: 0.1
484499
suggest_variant_rename: yes
@@ -535,6 +550,9 @@ sidecar_params:
535550
suggest_variant_rename: yes
536551
FlipAngle:
537552
suggest_variant_rename: yes
553+
ImageOrientationPatientDICOM:
554+
tolerance: 0.0001
555+
suggest_variant_rename: yes
538556
MultibandAccelerationFactor:
539557
suggest_variant_rename: yes
540558
NumberOfVolumesDiscardedByScanner:

0 commit comments

Comments
 (0)