Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master to dev #2304

Merged
merged 46 commits into from
Apr 13, 2021
Merged

Master to dev #2304

merged 46 commits into from
Apr 13, 2021

Conversation

Lestropie
Copy link
Member

Supersedes #2302. Independent branch necessary to resolve merge conflicts due to differential treatment of Python2 on dev (support dropped entirely in #2215) versus master (patch fix for CI in #2300).

jdtournier and others added 30 commits January 6, 2021 12:39
- The -focus option was not labelled as type_sequence_float(), leading to
  a warning if the first value is negative, e.g.:

      mrview: [WARNING] Value "-1,2,3" is being used as the expected argument
      for option "-focus"; is this what you intended?

- It should be allowed to use the -target option multiple times.
This simply clamps values of the input data at zero before taking their
mean per-shell, which seems to fix issues raised in #2248.
…_data

dwi2response dhollander: fix handling of data with negative values
Rebase to latest master
Use erase-remove idiom, otherwise particles will be duplicated instead of removed.
When tckglobal command was run with -niter 10B the numbers of iterations,
that run were maximally 1410065408 instead of 10000000000.
This change fixes this parsing issue.
…moval

tckglobal: Fix bug that caused particles in a voxel to be duplicated when tried to be removed
tckglobal: Fix erroneous -niter parsing for values bigger that 1.4e9
…s_target

mrview: fix handling of -focus and -target options
…tics_parsing

python: fix handling of N/A output in image.statistics()
Downstream of #1800, which introduced the functionality of determining the optimal reordering of directions for all possible selections of first volume, and choosing the optimal reordering from that set. Algorithm produces a segmentation fault if fewer than six input directions. This change forces the first volume in the input to be the first volume in the output in such scenarios (as there is no objective criterion by which to determine which direction is best to use first in this scenario).
Comparisons between signed and unsigned integers introduced in 035a98f.
jdtournier and others added 16 commits March 1, 2021 21:53
…_line_option

add two new command lines option in mrview for tractogram
For help page interfaces of algorithmm module wrapper scripts, do not insert the prospect of command-line options in between the wrapper name and the algorithm selection, as such usage will not work.
As reported in #2292.
In instances where the input data contain non-finite values (regardless of whether or not such data are excluded from statistical inference via a mask), and at least one F-test is performed, writing the absolute and standardised effect size as NaN (as such cannot be meaningfully calculated for an F-test) was incorrectly indexed, leading to a segmentation fault.
mrview: fix glitch in handling of clip plane selection
more verbose error messages in population_template
mrregister: fix lmax check for nonlinear multi contrast registration
Conflicts:
	.github/workflows/checks.yml
	lib/mrtrix3/run.py
@Lestropie Lestropie merged commit 9758eae into dev Apr 13, 2021
@Lestropie Lestropie deleted the master_to_dev branch April 13, 2021 02:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants