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

fixelcfestats: New option -mask #1030

Merged
merged 13 commits into from Jul 14, 2017
Merged

fixelcfestats: New option -mask #1030

merged 13 commits into from Jul 14, 2017

Commits on Jun 27, 2017

  1. fixelcfestats: New option -mask

    This option restricts the statistical analysis to a subset of fixels, as defined by a boolean fixel data file.
    Calculation of the fixel-fixel connectivity matrix, data smoothing, t-statistic calculation, and stiatistical enhancement, are all only performed on those fixels within the mask.
    However, the output fixel directory contains all of the fixels from the input template fixel image, not just those within the mask; this retains fixel-fixel correspondence between the input template image and the output results.
    For fixels outside the mask, a value of NaN is written for all fixel data file outputs.
    Lestropie committed Jun 27, 2017
    Copy the full SHA
    9248b5b View commit details
    Browse the repository at this point in the history
  2. Docs update

    Lestropie committed Jun 27, 2017
    Copy the full SHA
    11911d5 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    7c58e1c View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2017

  1. fixelcfestats: Various fixels for -mask option

    Also includes a bug fix where opting to not smooth the input data would likely have resulted in an error.
    Lestropie committed Jun 28, 2017
    Copy the full SHA
    3a6aded View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2017

  1. fixelcfestats: Change type of normalised connectivity matrix

    On testing prior changes to fixelcfestats to support the -mask option, it was found to run extremely slowly, even when not using the -mask option. The suspected cause was that during the matrix normalisation, each row of the connectivity matrix (a map<uint32_t, float>) was being re-constructed from scratch (due to the possibility of fixel indices changing), and hence what was a balanced binary search tree would become essentially a sorted doubly-linked-list. Now, each row of the connectivity matrix is instead converted to essentially a vector<pair<uint32_t,float>>, since it is no longer necessary to have fast lookup for an arbitrary fixel index. This should reduce memory requirement after matrix construction has completed, and will also hopefully improve cache performance since the connectivity data for each fixel will be serialised.
    There are also various little fixes and tweaks to polish off additions for supporting the -mask option.
    Lestropie committed Jun 29, 2017
    Copy the full SHA
    36224e5 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2017

  1. Copy the full SHA
    3769f48 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    840beac View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2017

  1. Copy the full SHA
    f746055 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    07289db View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    0f13690 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    ca549ce View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2017

  1. Copy the full SHA
    9866913 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2017

  1. Copy the full SHA
    dbf9e1e View commit details
    Browse the repository at this point in the history