Skip to content

Commit

Permalink
Fixed errors when blur is off
Browse files Browse the repository at this point in the history
  • Loading branch information
daducci committed Oct 22, 2020
1 parent c7c3080 commit 659cbe4
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions commit/trk2dictionary/trk2dictionary.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,21 @@ cpdef run( filename_tractogram=None, path_out=None, filename_peaks=None, filenam
else :
ERROR( '"fiber_shift" must be a scalar or a vector with 3 elements' )

# check for invalid parameters
if len(blur_radii) != len(blur_samples) :
ERROR( 'The number of blur radii and blur samples must match' )

if np.count_nonzero( blur_radii<=0 ):
ERROR( 'A blur radius was <= 0; only positive radii can be used' )
# check for invalid parameters in the blur
if type(blur_radii)==list:
blur_radii = np.ndarray(blur_radii, np.double)
if type(blur_samples)==list:
blur_samples = np.ndarray(blur_samples, np.int32)

if blur_sigma > 0 :
if blur_radii.size != blur_samples.size :
ERROR( 'The number of blur radii and blur samples must match' )

if np.count_nonzero( blur_radii<=0 ):
ERROR( 'A blur radius was <= 0; only positive radii can be used' )

if np.count_nonzero( blur_samples<1 ):
ERROR( 'Please specify at least 1 sample per blur radius' )
if np.count_nonzero( blur_samples<1 ):
ERROR( 'Please specify at least 1 sample per blur radius' )

tic = time.time()
LOG( '\n-> Creating the dictionary from tractogram:' )
Expand Down Expand Up @@ -172,10 +178,6 @@ cpdef run( filename_tractogram=None, path_out=None, filename_peaks=None, filenam
blurSamples = np.array( [1], np.int32 )
blurWeights = np.array( [1], np.double )
else:
if type(blur_radii)==list:
blur_radii = np.ndarray(blur_radii, np.double)
if type(blur_samples)==list:
blur_samples = np.ndarray(blur_samples, np.int32)
nBlurRadii = len(blur_radii)+1
blurRadii = np.insert( blur_radii, 0, 0.0 ).astype(np.double)
blurSamples = np.insert( blur_samples, 0, 1 ).astype(np.int32)
Expand Down

0 comments on commit 659cbe4

Please sign in to comment.