Skip to content
Snippets Groups Projects
Commit 54fd72b1 authored by Tim Behrens's avatar Tim Behrens
Browse files

*** empty log message ***

parent 9e2cb75e
No related branches found
No related tags found
No related merge requests found
...@@ -192,12 +192,10 @@ public: ...@@ -192,12 +192,10 @@ public:
//Sort the output based on mean_fsamples //Sort the output based on mean_fsamples
// //
vector<Matrix> sumf; vector<Matrix> sumf;
cerr<<"cock"<<endl;
for(int f=0;f<opts.nfibres.value();f++){ for(int f=0;f<opts.nfibres.value();f++){
Matrix tmp=sum(m_fsamples[f],1); Matrix tmp=sum(m_fsamples[f],1);
sumf.push_back(tmp); sumf.push_back(tmp);
} }
cerr<<"cock2"<<endl;
for(int vox=1;vox<=m_dsamples.Ncols();vox++){ for(int vox=1;vox<=m_dsamples.Ncols();vox++){
vector<pair<float,int> > sfs; vector<pair<float,int> > sfs;
pair<float,int> ftmp; pair<float,int> ftmp;
...@@ -221,7 +219,6 @@ public: ...@@ -221,7 +219,6 @@ public:
} }
cerr<<"cock3"<<endl;
// save the sorted fibres // save the sorted fibres
for(int f=0;f<opts.nfibres.value();f++){ for(int f=0;f<opts.nfibres.value();f++){
// element_mod_n(thsamples_out[f],M_PI); // element_mod_n(thsamples_out[f],M_PI);
...@@ -383,7 +380,6 @@ int main(int argc, char *argv[]) ...@@ -383,7 +380,6 @@ int main(int argc, char *argv[])
// Setup logging: // Setup logging:
Log& logger = LogSingleton::getInstance(); Log& logger = LogSingleton::getInstance();
cerr<<"here"<<endl;
xfibresOptions& opts = xfibresOptions::getInstance(); xfibresOptions& opts = xfibresOptions::getInstance();
opts.parse_command_line(argc,argv,logger); opts.parse_command_line(argc,argv,logger);
srand(xfibresOptions::getInstance().seed.value()); srand(xfibresOptions::getInstance().seed.value());
...@@ -400,16 +396,13 @@ int main(int argc, char *argv[]) ...@@ -400,16 +396,13 @@ int main(int argc, char *argv[])
read_volume(mask,opts.maskfile.value()); read_volume(mask,opts.maskfile.value());
datam=data.matrix(mask); datam=data.matrix(mask);
} }
cerr<<"ok"<<endl;
Matrix Amat; Matrix Amat;
ColumnVector alpha, beta; ColumnVector alpha, beta;
Amat=form_Amat(bvecs,bvals); Amat=form_Amat(bvecs,bvals);
cart2sph(bvecs,alpha,beta); cart2sph(bvecs,alpha,beta);
Samples samples(datam.Ncols()); Samples samples(datam.Ncols());
cerr<<"ok2"<<endl;
cerr<<datam.Ncols()<<endl;
for(int vox=1;vox<=datam.Ncols();vox++){ for(int vox=1;vox<=datam.Ncols();vox++){
cerr <<vox<<"/"<<datam.Ncols()<<endl; cout` <<vox<<"/"<<datam.Ncols()<<endl;
xfibresVoxelManager vm(datam.Column(vox),alpha,beta,bvals,samples,vox); xfibresVoxelManager vm(datam.Column(vox),alpha,beta,bvals,samples,vox);
vm.initialise(Amat); vm.initialise(Amat);
vm.runmcmc(); vm.runmcmc();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment