@@ -120,8 +120,11 @@ def create_allpoints_cmat(streamlines, roiData, voxelSize, n_rois):
120
120
121
121
connectivity_matrix = get_connectivity_matrix (n_rois , list_of_roi_crossed_lists )
122
122
dis = n_fib - len (final_fiber_ids )
123
- iflogger .info ("Found %i (%f percent out of %i fibers) fibers that start or terminate in a voxel which is not labeled. (orphans)" % (dis , dis * 100.0 / n_fib , n_fib ))
124
- iflogger .info ("Valid fibers: %i (%f percent)" % (n_fib - dis , 100 - dis * 100.0 / n_fib ))
123
+ iflogger .info ('Found %i (%f percent out of %i fibers) fibers that start or '
124
+ 'terminate in a voxel which is not labeled. (orphans)' ,
125
+ dis , dis * 100.0 / n_fib , n_fib )
126
+ iflogger .info ('Valid fibers: %i (%f percent)' , n_fib - dis ,
127
+ 100 - dis * 100.0 / n_fib )
125
128
iflogger .info ('Returning the intersecting point connectivity matrix' )
126
129
return connectivity_matrix , final_fiber_ids
127
130
@@ -181,7 +184,7 @@ def cmat(track_file, roi_file, resolution_network_file, matrix_name, matrix_mat_
181
184
en_fname = op .abspath (endpoint_name + '_endpoints.npy' )
182
185
en_fnamemm = op .abspath (endpoint_name + '_endpointsmm.npy' )
183
186
184
- iflogger .info ('Reading Trackvis file {trk}' . format ( trk = track_file ) )
187
+ iflogger .info ('Reading Trackvis file %s' , track_file )
185
188
fib , hdr = nb .trackvis .read (track_file , False )
186
189
stats ['orig_n_fib' ] = len (fib )
187
190
@@ -191,13 +194,13 @@ def cmat(track_file, roi_file, resolution_network_file, matrix_name, matrix_mat_
191
194
(endpoints , endpointsmm ) = create_endpoints_array (fib , roiVoxelSize )
192
195
193
196
# Output endpoint arrays
194
- iflogger .info ('Saving endpoint array: {array}' . format ( array = en_fname ) )
197
+ iflogger .info ('Saving endpoint array: %s' , en_fname )
195
198
np .save (en_fname , endpoints )
196
- iflogger .info ('Saving endpoint array in mm: {array}' . format ( array = en_fnamemm ) )
199
+ iflogger .info ('Saving endpoint array in mm: %s' , en_fnamemm )
197
200
np .save (en_fnamemm , endpointsmm )
198
201
199
202
n = len (fib )
200
- iflogger .info ('Number of fibers {num}' . format ( num = n ) )
203
+ iflogger .info ('Number of fibers: %i' , n )
201
204
202
205
# Create empty fiber label array
203
206
fiberlabels = np .zeros ((n , 2 ))
@@ -244,7 +247,8 @@ def cmat(track_file, roi_file, resolution_network_file, matrix_name, matrix_mat_
244
247
startROI = int (roiData [endpoints [i , 0 , 0 ], endpoints [i , 0 , 1 ], endpoints [i , 0 , 2 ]])
245
248
endROI = int (roiData [endpoints [i , 1 , 0 ], endpoints [i , 1 , 1 ], endpoints [i , 1 , 2 ]])
246
249
except IndexError :
247
- iflogger .error (("AN INDEXERROR EXCEPTION OCCURED FOR FIBER %s. PLEASE CHECK ENDPOINT GENERATION" % i ))
250
+ iflogger .error ('AN INDEXERROR EXCEPTION OCCURED FOR FIBER %s. '
251
+ 'PLEASE CHECK ENDPOINT GENERATION' , i )
248
252
break
249
253
250
254
# Filter
@@ -256,7 +260,7 @@ def cmat(track_file, roi_file, resolution_network_file, matrix_name, matrix_mat_
256
260
if startROI > nROIs or endROI > nROIs :
257
261
iflogger .error ("Start or endpoint of fiber terminate in a voxel which is labeled higher" )
258
262
iflogger .error ("than is expected by the parcellation node information." )
259
- iflogger .error ("Start ROI: %i, End ROI: %i" % ( startROI , endROI ) )
263
+ iflogger .error ("Start ROI: %i, End ROI: %i" , startROI , endROI )
260
264
iflogger .error ("This needs bugfixing!" )
261
265
continue
262
266
@@ -296,8 +300,10 @@ def cmat(track_file, roi_file, resolution_network_file, matrix_name, matrix_mat_
296
300
# make final fiber labels as array
297
301
final_fiberlabels_array = np .array (final_fiberlabels , dtype = int )
298
302
299
- iflogger .info ("Found %i (%f percent out of %i fibers) fibers that start or terminate in a voxel which is not labeled. (orphans)" % (dis , dis * 100.0 / n , n ))
300
- iflogger .info ("Valid fibers: %i (%f percent)" % (n - dis , 100 - dis * 100.0 / n ))
303
+ iflogger .info ('Found %i (%f percent out of %i fibers) fibers that start or '
304
+ 'terminate in a voxel which is not labeled. (orphans)' ,
305
+ dis , dis * 100.0 / n , n )
306
+ iflogger .info ('Valid fibers: %i (%f%%)' , n - dis , 100 - dis * 100.0 / n )
301
307
302
308
numfib = nx .Graph ()
303
309
numfib .add_nodes_from (G )
@@ -326,7 +332,7 @@ def cmat(track_file, roi_file, resolution_network_file, matrix_name, matrix_mat_
326
332
fibmedian .add_edge (u , v , weight = di ['fiber_length_median' ])
327
333
fibdev .add_edge (u , v , weight = di ['fiber_length_std' ])
328
334
329
- iflogger .info ('Writing network as {ntwk}' . format ( ntwk = matrix_name ) )
335
+ iflogger .info ('Writing network as %s' , matrix_name )
330
336
nx .write_gpickle (G , op .abspath (matrix_name ))
331
337
332
338
numfib_mlab = nx .to_numpy_matrix (numfib , dtype = int )
@@ -341,45 +347,49 @@ def cmat(track_file, roi_file, resolution_network_file, matrix_name, matrix_mat_
341
347
if intersections :
342
348
path , name , ext = split_filename (matrix_name )
343
349
intersection_matrix_name = op .abspath (name + '_intersections' ) + ext
344
- iflogger .info ('Writing intersection network as {ntwk}' . format ( ntwk = intersection_matrix_name ) )
350
+ iflogger .info ('Writing intersection network as %s' , intersection_matrix_name )
345
351
nx .write_gpickle (I , intersection_matrix_name )
346
352
347
353
path , name , ext = split_filename (matrix_mat_name )
348
354
if not ext == '.mat' :
349
355
ext = '.mat'
350
356
matrix_mat_name = matrix_mat_name + ext
351
357
352
- iflogger .info ('Writing matlab matrix as {mat}' . format ( mat = matrix_mat_name ) )
358
+ iflogger .info ('Writing matlab matrix as %s' , matrix_mat_name )
353
359
sio .savemat (matrix_mat_name , numfib_dict )
354
360
355
361
if intersections :
356
362
intersect_dict = {'intersections' : intersection_matrix }
357
363
intersection_matrix_mat_name = op .abspath (name + '_intersections' ) + ext
358
- iflogger .info ('Writing intersection matrix as {mat}' . format ( mat = intersection_matrix_mat_name ) )
364
+ iflogger .info ('Writing intersection matrix as %s' , intersection_matrix_mat_name )
359
365
sio .savemat (intersection_matrix_mat_name , intersect_dict )
360
366
361
367
mean_fiber_length_matrix_name = op .abspath (name + '_mean_fiber_length' ) + ext
362
- iflogger .info ('Writing matlab mean fiber length matrix as {mat}' .format (mat = mean_fiber_length_matrix_name ))
368
+ iflogger .info ('Writing matlab mean fiber length matrix as %s' ,
369
+ mean_fiber_length_matrix_name )
363
370
sio .savemat (mean_fiber_length_matrix_name , fibmean_dict )
364
371
365
372
median_fiber_length_matrix_name = op .abspath (name + '_median_fiber_length' ) + ext
366
- iflogger .info ('Writing matlab median fiber length matrix as {mat}' .format (mat = median_fiber_length_matrix_name ))
373
+ iflogger .info ('Writing matlab median fiber length matrix as %s' ,
374
+ median_fiber_length_matrix_name )
367
375
sio .savemat (median_fiber_length_matrix_name , fibmedian_dict )
368
376
369
377
fiber_length_std_matrix_name = op .abspath (name + '_fiber_length_std' ) + ext
370
- iflogger .info ('Writing matlab fiber length deviation matrix as {mat}' .format (mat = fiber_length_std_matrix_name ))
378
+ iflogger .info ('Writing matlab fiber length deviation matrix as %s' ,
379
+ fiber_length_std_matrix_name )
371
380
sio .savemat (fiber_length_std_matrix_name , fibdev_dict )
372
381
373
382
fiberlengths_fname = op .abspath (endpoint_name + '_final_fiberslength.npy' )
374
- iflogger .info (" Storing final fiber length array as %s" % fiberlengths_fname )
383
+ iflogger .info (' Storing final fiber length array as %s' , fiberlengths_fname )
375
384
np .save (fiberlengths_fname , final_fiberlength_array )
376
385
377
386
fiberlabels_fname = op .abspath (endpoint_name + '_filtered_fiberslabel.npy' )
378
- iflogger .info (" Storing all fiber labels (with orphans) as %s" % fiberlabels_fname )
387
+ iflogger .info (' Storing all fiber labels (with orphans) as %s' , fiberlabels_fname )
379
388
np .save (fiberlabels_fname , np .array (fiberlabels , dtype = np .int32 ),)
380
389
381
390
fiberlabels_noorphans_fname = op .abspath (endpoint_name + '_final_fiberslabels.npy' )
382
- iflogger .info ("Storing final fiber labels (no orphans) as %s" % fiberlabels_noorphans_fname )
391
+ iflogger .info ('Storing final fiber labels (no orphans) as %s' ,
392
+ fiberlabels_noorphans_fname )
383
393
np .save (fiberlabels_noorphans_fname , final_fiberlabels_array )
384
394
385
395
iflogger .info ("Filtering tractography - keeping only no orphan fibers" )
@@ -389,7 +399,7 @@ def cmat(track_file, roi_file, resolution_network_file, matrix_name, matrix_mat_
389
399
stats ['intersections_percent' ] = float (stats ['intersections_n_fib' ]) / float (stats ['orig_n_fib' ]) * 100
390
400
391
401
out_stats_file = op .abspath (endpoint_name + '_statistics.mat' )
392
- iflogger .info (" Saving matrix creation statistics as %s" % out_stats_file )
402
+ iflogger .info (' Saving matrix creation statistics as %s' , out_stats_file )
393
403
sio .savemat (out_stats_file , stats )
394
404
395
405
@@ -401,7 +411,7 @@ def save_fibers(oldhdr, oldfib, fname, indices):
401
411
outstreams .append (oldfib [i ])
402
412
n_fib_out = len (outstreams )
403
413
hdrnew ['n_count' ] = n_fib_out
404
- iflogger .info (" Writing final non-orphan fibers as %s" % fname )
414
+ iflogger .info (' Writing final non-orphan fibers as %s' , fname )
405
415
nb .trackvis .write (fname , outstreams , hdrnew )
406
416
return n_fib_out
407
417
@@ -620,22 +630,22 @@ class ROIGen(BaseInterface):
620
630
def _run_interface (self , runtime ):
621
631
aparc_aseg_file = self .inputs .aparc_aseg_file
622
632
aparcpath , aparcname , aparcext = split_filename (aparc_aseg_file )
623
- iflogger .info ('Using Aparc+Aseg file: {name}' . format ( name = aparcname + aparcext ) )
633
+ iflogger .info ('Using Aparc+Aseg file: %s' , aparcname + aparcext )
624
634
niiAPARCimg = nb .load (aparc_aseg_file , mmap = NUMPY_MMAP )
625
635
niiAPARCdata = niiAPARCimg .get_data ()
626
636
niiDataLabels = np .unique (niiAPARCdata )
627
637
numDataLabels = np .size (niiDataLabels )
628
- iflogger .info ('Number of labels in image: {n}' . format ( n = numDataLabels ) )
638
+ iflogger .info ('Number of labels in image: %s' , numDataLabels )
629
639
630
640
write_dict = True
631
641
if self .inputs .use_freesurfer_LUT :
632
642
self .LUT_file = self .inputs .freesurfer_dir + '/FreeSurferColorLUT.txt'
633
- iflogger .info ('Using Freesurfer LUT: {name}' . format ( name = self .LUT_file ) )
643
+ iflogger .info ('Using Freesurfer LUT: %s' , self .LUT_file )
634
644
prefix = 'fsLUT'
635
645
elif not self .inputs .use_freesurfer_LUT and isdefined (self .inputs .LUT_file ):
636
646
self .LUT_file = op .abspath (self .inputs .LUT_file )
637
647
lutpath , lutname , lutext = split_filename (self .LUT_file )
638
- iflogger .info ('Using Custom LUT file: {name}' . format ( name = lutname + lutext ) )
648
+ iflogger .info ('Using Custom LUT file: %s' , lutname + lutext )
639
649
prefix = lutname
640
650
else :
641
651
prefix = 'hardcoded'
@@ -652,14 +662,14 @@ def _run_interface(self, runtime):
652
662
dict_file = op .abspath (prefix + '_' + aparcname + '.pck' )
653
663
654
664
if write_dict :
655
- iflogger .info ('Lookup table: {name}' . format ( name = op .abspath (self .LUT_file ) ))
665
+ iflogger .info ('Lookup table: %s' , op .abspath (self .LUT_file ))
656
666
LUTlabelsRGBA = np .loadtxt (self .LUT_file , skiprows = 4 , usecols = [0 , 1 , 2 , 3 , 4 , 5 ], comments = '#' ,
657
667
dtype = {'names' : ('index' , 'label' , 'R' , 'G' , 'B' , 'A' ), 'formats' : ('int' , '|S30' , 'int' , 'int' , 'int' , 'int' )})
658
668
numLUTLabels = np .size (LUTlabelsRGBA )
659
669
if numLUTLabels < numDataLabels :
660
670
iflogger .error ('LUT file provided does not contain all of the regions in the image' )
661
671
iflogger .error ('Removing unmapped regions' )
662
- iflogger .info ('Number of labels in LUT: {n}' . format ( n = numLUTLabels ) )
672
+ iflogger .info ('Number of labels in LUT: %s' , numLUTLabels )
663
673
LUTlabelDict = {}
664
674
665
675
""" Create dictionary for input LUT table"""
@@ -687,7 +697,7 @@ def _run_interface(self, runtime):
687
697
iflogger .info ('Grey matter mask created' )
688
698
greyMaskLabels = np .unique (niiGM )
689
699
numGMLabels = np .size (greyMaskLabels )
690
- iflogger .info ('Number of grey matter labels: {num}' . format ( num = numGMLabels ) )
700
+ iflogger .info ('Number of grey matter labels: %s' , numGMLabels )
691
701
692
702
labelDict = {}
693
703
GMlabelDict = {}
@@ -697,7 +707,7 @@ def _run_interface(self, runtime):
697
707
if write_dict :
698
708
GMlabelDict ['originalID' ] = mapDict [label ]
699
709
except :
700
- iflogger .info ('Label {lbl} not in provided mapping' . format ( lbl = label ) )
710
+ iflogger .info ('Label %s not in provided mapping' , label )
701
711
if write_dict :
702
712
del GMlabelDict
703
713
GMlabelDict = {}
@@ -708,11 +718,11 @@ def _run_interface(self, runtime):
708
718
709
719
roi_image = nb .Nifti1Image (niiGM , niiAPARCimg .affine ,
710
720
niiAPARCimg .header )
711
- iflogger .info ('Saving ROI File to {path}' . format ( path = roi_file ) )
721
+ iflogger .info ('Saving ROI File to %s' , roi_file )
712
722
nb .save (roi_image , roi_file )
713
723
714
724
if write_dict :
715
- iflogger .info ('Saving Dictionary File to {path} in Pickle format' . format ( path = dict_file ) )
725
+ iflogger .info ('Saving Dictionary File to %s in Pickle format' , dict_file )
716
726
with open (dict_file , 'w' ) as f :
717
727
pickle .dump (labelDict , f )
718
728
return runtime
@@ -785,7 +795,7 @@ class CreateNodes(BaseInterface):
785
795
def _run_interface (self , runtime ):
786
796
iflogger .info ('Creating nodes...' )
787
797
create_nodes (self .inputs .roi_file , self .inputs .resolution_network_file , self .inputs .out_filename )
788
- iflogger .info ('Saving node network to {path}' . format ( path = op .abspath (self .inputs .out_filename ) ))
798
+ iflogger .info ('Saving node network to %s' , op .abspath (self .inputs .out_filename ))
789
799
return runtime
790
800
791
801
def _list_outputs (self ):
0 commit comments