Skip to content

Commit

Permalink
Revert test back to single process
Browse files Browse the repository at this point in the history
  • Loading branch information
EmmaRenauld committed Oct 18, 2024
1 parent 484809b commit 6cff089
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
12 changes: 5 additions & 7 deletions scripts/scil_connectivity_compute_matrices.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,12 @@
- Streamline count.
- Length: mean streamline length (mm).
- Volume-weighted: Volume of the bundle.
- Similarity: mean density??
- Similarity: mean density.
Uses pre-computed density maps, which can be obtained with
>> scil_connectivity_hdf5_average_density_map.py
The bundles should be averaged version in the same space. This will
compute the weighted-dice between each node and their homologuous average
version.
- Any metric: You can provide your own maps through --metrics. The average
non-zero value in the volume occupied by the bundle will be reported in
the matrices nodes.
Expand All @@ -51,10 +54,6 @@
- Mean DPS: Mean values in the data_per_streamline of each streamline in the
bundles.
??? The bundles should be averaged version in the same space. This will
compute the weighted-dice between each node and their homologuous average
version.
Formerly: scil_compute_connectivity.py
"""

Expand Down Expand Up @@ -82,7 +81,6 @@
validate_nbr_processes, assert_inputs_dirs_exist,
assert_headers_compatible,
assert_output_dirs_exist_and_empty)
from scilpy.connectivity.connectivity import d


def _build_arg_parser():
Expand Down Expand Up @@ -262,7 +260,7 @@ def main():
outputs.append(compute_connectivity_matrices_from_hdf5(
args.in_hdf5, img_labels, comb[0], comb[1],
compute_volume, compute_streamline_count, compute_length,
similarity_directory, (metrics_data, metrics_names),
similarity_directory, metrics_data, metrics_names,
lesion_data, args.include_dps, args.density_weighting,
args.min_lesion_vol))
else:
Expand Down
2 changes: 1 addition & 1 deletion scripts/tests/test_connectivity_compute_matrices.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ def test_execution_connectivity(script_runner, monkeypatch):
'--similarity', in_avg, 'sim.npy',
'--metrics', in_afd, 'afd_max.npy',
'--density_weighting', '--no_self_connection',
'--processes', '4', '-v')
'--processes', '1')
assert ret.success

0 comments on commit 6cff089

Please sign in to comment.