From dab3715055b6658fa13569c24c55555fd261a4b8 Mon Sep 17 00:00:00 2001
From: Tim Behrens <behrens@fmrib.ox.ac.uk>
Date: Fri, 13 May 2005 15:24:07 +0000
Subject: [PATCH] *** empty log message ***
---
probtrack.cc | 1 +
probtrackOptions.h | 4 ++--
pt_matrix_mesh.cc | 2 +-
pt_simple.cc | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/probtrack.cc b/probtrack.cc
index 5bfb2a1..2c40be1 100644
--- a/probtrack.cc
+++ b/probtrack.cc
@@ -28,6 +28,7 @@ int main ( int argc, char **argv ){
probtrackOptions& opts =probtrackOptions::getInstance();
Log& logger = LogSingleton::getInstance();
opts.parse_command_line(argc,argv,logger);
+ srand(opts.rseed.value());
if(opts.verbose.value()>0){
opts.status();
}
diff --git a/probtrackOptions.h b/probtrackOptions.h
index ad2dac1..cab586c 100644
--- a/probtrackOptions.h
+++ b/probtrackOptions.h
@@ -51,7 +51,7 @@ class probtrackOptions {
Option<bool> loopcheck;
Option<bool> usef;
Option<bool> modeuler;
- Option<float> rseed;
+ Option<int> rseed;
void parse_command_line(int argc, char** argv,Log& logger);
void modecheck();
void modehelp();
@@ -148,7 +148,7 @@ class probtrackOptions {
modeuler(string("--modeuler"), false,
string("Use modified euler streamlining"),
false, no_argument),
- rseed(string("--rseed"), 0.324571,
+ 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")
diff --git a/pt_matrix_mesh.cc b/pt_matrix_mesh.cc
index 3f05a73..deda1e4 100644
--- a/pt_matrix_mesh.cc
+++ b/pt_matrix_mesh.cc
@@ -423,7 +423,7 @@ void mesh_lengths(){
if(opts.rubbishfile.value()!="")
{
- if(RUBBISH(x_s,y_s,z_s)==1) break;
+ if(RUBBISH(x_s,y_s,z_s)>0) break;
}
path(it,1)=x_s;
diff --git a/pt_simple.cc b/pt_simple.cc
index 7e6fc4c..4d2d446 100644
--- a/pt_simple.cc
+++ b/pt_simple.cc
@@ -147,7 +147,7 @@ void track(){
if(opts.rubbishfile.value()!="")
{
- if(RUBBISH(x_s,y_s,z_s)==1) break;
+ if(RUBBISH(x_s,y_s,z_s)>0) break;
}
path(it+(direc-1)*nsteps/2,1)=x_s;
--
GitLab