From 8a10fb632e1d688f9a1620195c8330f357e8ee3b Mon Sep 17 00:00:00 2001
From: Saad Jbabdi <saad@fmrib.ox.ac.uk>
Date: Thu, 22 Feb 2007 15:15:42 +0000
Subject: [PATCH] network mode corrections
---
probtrackxOptions.h | 16 ++++++++--------
streamlines.cc | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/probtrackxOptions.h b/probtrackxOptions.h
index 5c28f2b..4e2ed69 100644
--- a/probtrackxOptions.h
+++ b/probtrackxOptions.h
@@ -48,7 +48,7 @@ class probtrackxOptions {
Option<string> seedref;
Option<string> mask2;
Option<string> waypoints;
- Option<bool> waypoints_and;
+ Option<bool> network;
Option<string> meshfile;
FmribOption<string> lrmask;
Option<string> logdir;
@@ -148,12 +148,12 @@ class probtrackxOptions {
string("second mask in twomask_symm mode."),
false, requires_argument),
waypoints(string("--waypoints"), string(""),
- string("Waypoint mask or ascii list of waypoint masks"),
+ string("Waypoint mask or ascii list of waypoint masks - only keep paths going through ALL the masks"),
false, requires_argument),
- waypoints_and(string("--network"), true,
- string("Searches for pathways connecting every seed to at least one waypoint"),
- false, no_argument),
- meshfile(string("--mesh"), string(""),
+ network(string("--network"), false,
+ string("Only keep paths going through at least one waypoint mask, or another seed in multiple seeds mode"),
+ false, no_argument),
+ meshfile(string("--mesh"), string(""),
string(""),
false, requires_argument),
lrmask(string("--lrmask"), string(""),
@@ -195,7 +195,7 @@ class probtrackxOptions {
rseed(string("--rseed"), 12345,
string("Random seed"),
false, requires_argument),
- options("probtrack","probtrack -s <basename> -m <maskname> -x <seedfile> -o <output> --targetmasks=<textfile>\n probtrack --help\n")
+ options("probtrackx","probtrackx -s <basename> -m <maskname> -x <seedfile> -o <output> --targetmasks=<textfile>\n probtrackx --help\n")
{
@@ -210,7 +210,7 @@ class probtrackxOptions {
options.add(skipmask);
options.add(mask2);
options.add(waypoints);
- options.add(waypoints_and);
+ options.add(network);
options.add(meshfile);
options.add(lrmask);
options.add(seedref);
diff --git a/streamlines.cc b/streamlines.cc
index 71ea3b7..a35e3d7 100644
--- a/streamlines.cc
+++ b/streamlines.cc
@@ -200,7 +200,7 @@ namespace TRACT{
bool accept_path=true;
if(m_passed_flags.size()!=0){
- if(opts.waypoints_and.value()){
+ if(!opts.network.value()){
for(unsigned int i=0; i<m_passed_flags.size();i++)
if(!m_passed_flags[i])
accept_path=false;
--
GitLab