Skip to content

Commit

Permalink
Clean up after SVN import
Browse files Browse the repository at this point in the history
  • Loading branch information
johncolby committed Jan 11, 2011
1 parent f15a38a commit 87556a3
Show file tree
Hide file tree
Showing 20 changed files with 27 additions and 27 deletions.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
4 changes: 2 additions & 2 deletions along_trk_stats/trk_add_sc.m → trk_add_sc.m
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

% Author: John Colby ([email protected])
% UCLA Developmental Cognitive Neuroimaging Group (Sowell Lab)
% Apr 2010 $Rev$ $Date$
% Apr 2010

% Loop over # of tracks (slow...any faster way?)
for iTrk=1:length(tracks)
Expand All @@ -42,4 +42,4 @@
% Update header
n_scalars_old = header.n_scalars;
header.n_scalars = n_scalars_old + 1;
header.scalar_name(n_scalars_old + 1,1:size(name,2)) = name;
header.scalar_name(n_scalars_old + 1,1:size(name,2)) = name;
4 changes: 2 additions & 2 deletions along_trk_stats/trk_compile_data.m → trk_compile_data.m
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

% Author: John Colby ([email protected])
% UCLA Developmental Cognitive Neuroimaging Group (Sowell Lab)
% Sept 2010 $Rev$ $Date$
% Sept 2010

%% Check and format input arguments
if nargin < 6 || isempty(starting_pts_in)
Expand Down Expand Up @@ -158,4 +158,4 @@
export(starting_pts_out, 'file', fullfile(outDir, 'starting_pts_out.txt'))

close all
fclose all;
fclose all;
File renamed without changes.
4 changes: 2 additions & 2 deletions along_trk_stats/trk_flip.m → trk_flip.m
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

% Author: John Colby ([email protected])
% UCLA Developmental Cognitive Neuroimaging Group (Sowell Lab)
% Apr 2010 $Rev$ $Date$
% Apr 2010

if nargin < 5, slices = []; end
if nargin < 4, volume = []; end
Expand Down Expand Up @@ -93,4 +93,4 @@
end
end
end
end
end
4 changes: 2 additions & 2 deletions along_trk_stats/trk_interp.m → trk_interp.m
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

% Author: John Colby ([email protected])
% UCLA Developmental Cognitive Neuroimaging Group (Sowell Lab)
% Apr 2010 $Rev$ $Date$
% Apr 2010

if nargin<3, spacing = []; end
if nargin<2 || isempty(nPoints_new), nPoints_new = 100; end
Expand Down Expand Up @@ -83,4 +83,4 @@
[~, ind] = min(dists);
tracks_interp(iTrk).tiePoint = ind;
end
end
end
4 changes: 2 additions & 2 deletions along_trk_stats/trk_length.m → trk_length.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

% Author: John Colby ([email protected])
% UCLA Developmental Cognitive Neuroimaging Group (Sowell Lab)
% Apr 2010 $Rev$ $Date$
% Apr 2010

% Put in matrix form if possible
if isstruct(tracks) && length(unique(cat(tracks.nPoints)))==1
Expand All @@ -40,4 +40,4 @@
for i=1:length(tracks)
lengths(i) = sum(sqrt(squeeze(sum((tracks(i).matrix(2:end,1:3) - tracks(i).matrix(1:(end-1),1:3)).^2, 2))), 1);
end
end
end
4 changes: 2 additions & 2 deletions along_trk_stats/trk_mean_sc.m → trk_mean_sc.m
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

% Author: John Colby ([email protected])
% UCLA Developmental Cognitive Neuroimaging Group (Sowell Lab)
% Apr 2010 $Rev$ $Date$
% Apr 2010

scalars = zeros(tracks(1).nPoints, header.n_count, header.n_scalars);

Expand All @@ -43,4 +43,4 @@
end

scalar_mean = squeeze(nanmean(scalars, 2));
scalar_sd = squeeze(nanstd(scalars, 0, 2));
scalar_sd = squeeze(nanstd(scalars, 0, 2));
2 changes: 1 addition & 1 deletion along_trk_stats/trk_plot.m → trk_plot.m
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function trk_plot(header,tracks,volume,slices)

% Author: John Colby ([email protected])
% UCLA Developmental Cognitive Neuroimaging Group (Sowell Lab)
% Mar 2010 $Rev$ $Date$
% Mar 2010

% Input argument defaults
if nargin < 4, slices = []; end
Expand Down
4 changes: 2 additions & 2 deletions along_trk_stats/trk_read.m → trk_read.m
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

% Author: John Colby ([email protected])
% UCLA Developmental Cognitive Neuroimaging Group (Sowell Lab)
% Mar 2010 $Rev$ $Date$
% Mar 2010

% Parse in header
fid = fopen(filePath, 'r');
Expand Down Expand Up @@ -80,4 +80,4 @@
header.swap_zx = fread(fid, 1, 'uchar');
header.n_count = fread(fid, 1, 'int')';
header.version = fread(fid, 1, 'int')';
header.hdr_size = fread(fid, 1, 'int')';
header.hdr_size = fread(fid, 1, 'int')';
4 changes: 2 additions & 2 deletions along_trk_stats/trk_restruc.m → trk_restruc.m
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

% Author: John Colby ([email protected])
% UCLA Developmental Cognitive Neuroimaging Group (Sowell Lab)
% Mar 2010 $Rev$ $Date$
% Mar 2010

if nargin < 2, tiePoint = []; end

Expand Down Expand Up @@ -69,4 +69,4 @@
if tiePoint
[tracks_out.tiePoint] = deal(tiePoint);
end
end
end
4 changes: 2 additions & 2 deletions along_trk_stats/trk_stats.m → trk_stats.m
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

% Author: John Colby ([email protected])
% UCLA Developmental Cognitive Neuroimaging Group (Sowell Lab)
% Mar 2010 $Rev$ $Date$
% Mar 2010

% Input argument defaults
if nargin < 4 || isempty(method), method = 'quick'; end
Expand Down Expand Up @@ -64,4 +64,4 @@
meanInt = nanmean(ints(ints>0));
stdInt = nanstd(ints(ints>0));
nVox = length(unique(ceil(vert ./ repmat(header.voxel_size, size(vert,1),1)), 'rows'));
end
end
4 changes: 2 additions & 2 deletions along_trk_stats/trk_stats_overlay.m → trk_stats_overlay.m
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function trk_stats_overlay(exptDir,subDir,tract_info,corrected)

% Author: John Colby ([email protected])
% UCLA Developmental Cognitive Neuroimaging Group (Sowell Lab)
% Sept 2010 $Rev$ $Date$
% Sept 2010

%% Load files and setup
% Load the statistical results dataset from R
Expand Down Expand Up @@ -91,4 +91,4 @@ function trk_stats_overlay(exptDir,subDir,tract_info,corrected)

% Save the results for final visualization in TrackVis
savePath = fullfile(exptDir, 'results.trk');
trk_write(header_mean_sc, track_mean_sc_str, savePath)
trk_write(header_mean_sc, track_mean_sc_str, savePath)
4 changes: 2 additions & 2 deletions along_trk_stats/trk_stats_quick.m → trk_stats_quick.m
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

% Author: John Colby ([email protected])
% UCLA Developmental Cognitive Neuroimaging Group (Sowell Lab)
% Mar 2010 $Rev$ $Date$
% Mar 2010

% Input argument defaults
if nargin < 4 || isempty(method), method = 'quick'; end
Expand All @@ -58,4 +58,4 @@
% Calculate descriptive statistics
meanInt = mean(ints(ints>0));
stdInt = std(ints(ints>0));
nVox = length(unique(vert_vox_rnd, 'rows'));
nVox = length(unique(vert_vox_rnd, 'rows'));
4 changes: 2 additions & 2 deletions along_trk_stats/trk_write.m → trk_write.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function trk_write(header,tracks,savePath)

% Author: John Colby ([email protected])
% UCLA Developmental Cognitive Neuroimaging Group (Sowell Lab)
% Apr 2010 $Rev$ $Date$
% Apr 2010

fid = fopen(savePath, 'w');

Expand Down Expand Up @@ -66,4 +66,4 @@ function trk_write(header,tracks,savePath)
end
end

fclose(fid);
fclose(fid);
4 changes: 2 additions & 2 deletions along_trk_stats/trk_write_ascii.m → trk_write_ascii.m
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function trk_write_ascii(tracks,filePath)

% Author: John Colby ([email protected])
% UCLA Developmental Cognitive Neuroimaging Group (Sowell Lab)
% Oct 2010 $Rev$ $Date$
% Oct 2010

if nargin < 2 || isempty(filePath); filePath = fullfile(pwd, 'tracks.txt'); end
if nargin < 1 || isempty(tracks); error('Must supply tracks to write.'); end
Expand All @@ -45,4 +45,4 @@ function trk_write_ascii(tracks,filePath)
fprintf(fid, 'Streamline\tPoint\tx\ty\tz\tFA\n');
fprintf(fid, '%i\t%i\t%f\t%f\t%f\t%0.4f\n', permute(outmat,[2 1 3]));

fclose(fid);
fclose(fid);

0 comments on commit 87556a3

Please sign in to comment.