@@ -4,7 +4,7 @@ const BaseModule = require('basemodule.js');
44const bis_genericio = require ( 'bis_genericio' ) ;
55const BisWebTextObject = require ( 'bisweb_textobject.js' ) ;
66const path = bis_genericio . getpathmodule ( ) ;
7- const fs = bis_genericio . getfsmodule ( ) ;
7+ // const fs=bis_genericio.getfsmodule();
88const baseutils = require ( "baseutils" ) ;
99
1010
@@ -232,9 +232,7 @@ class CalciumPreprocessModule extends BaseModule {
232232 vals . odir = vals . odir || '' ;
233233 if ( vals . odir . length < 1 ) {
234234 console . log ( '_ No output directory specified, specify this using the --odir flag' ) ;
235- reject ( '' ) ;
236- return ;
237-
235+ return Promise . reject ( '' ) ;
238236 }
239237
240238 let tmpdir = '' ;
@@ -254,7 +252,7 @@ class CalciumPreprocessModule extends BaseModule {
254252
255253
256254 let nodejscommand = process . argv [ 0 ] + ' ' + process . argv [ 1 ] ;
257- console . log ( 'Command=' , nodejscommand )
255+ console . log ( 'Command=' , nodejscommand ) ;
258256
259257 let pythoncommand = 'biswebpy' ;
260258
@@ -313,7 +311,7 @@ class CalciumPreprocessModule extends BaseModule {
313311 outnames . push ( outname2 ) ;
314312 outtext = outtext + outname2 + ' : ' + outname + '\n\t' + nodejscommand + ` largesmoothfilter -i ${ outname } ` ;
315313 outtext += ` -o ${ outname2 } ` ;
316- outtext += ` --sigma ${ vals [ 'sigma' ] } --inmm ${ vals [ 'inmm' ] } --fwhmax ${ vals [ 'fwhmax' ] } `
314+ outtext += ` --sigma ${ vals [ 'sigma' ] } --inmm ${ vals [ 'inmm' ] } --fwhmax ${ vals [ 'fwhmax' ] } ` ;
317315 if ( ! debug ) outtext += ` > ${ outname2 } .log 2>&1` ;
318316 outtext += `\n\n` ;
319317 step1 . push ( outname2 ) ;
@@ -378,9 +376,9 @@ class CalciumPreprocessModule extends BaseModule {
378376 }
379377 if ( dff ) {
380378 suffix = suffix + '_dff' ;
381- } ;
382-
379+ }
383380
381+
384382
385383 let outname4 = f2 . substr ( 0 , ind4 ) + suffix + '.nii.gz' ;
386384 outnames . push ( outname4 ) ;
@@ -397,7 +395,7 @@ class CalciumPreprocessModule extends BaseModule {
397395 outname5 = path . join ( vals . odir , path . basename ( outname5 ) ) ;
398396 outnames . push ( outname5 ) ;
399397 step3 . push ( outname5 ) ;
400- let maskname = this . inputs [ 'mask' ] . getFilename ( ) ;
398+ // let maskname=this.inputs['mask'].getFilename();
401399
402400 outtext += outname5 + ' : ' + outname4 + '\n\t' + nodejscommand + ` largemaskimage -i ${ outname4 } -m ${ this . resampledmaskname } -o ${ outname5 } ` ;
403401 outtext += ` --dilation ${ vals [ 'dilation' ] } ` ;
@@ -406,7 +404,7 @@ class CalciumPreprocessModule extends BaseModule {
406404
407405 }
408406
409- console . log ( 'outtext=' , outtext )
407+ console . log ( 'outtext=' , outtext ) ;
410408
411409 let makefile = path . join ( vals . odir , 'makefile' ) ;
412410
@@ -420,13 +418,11 @@ class CalciumPreprocessModule extends BaseModule {
420418 outtext = top + outtext ;
421419
422420 await bis_genericio . write ( makefile , outtext ) ;
423- console . log ( 'Makefile saved in ' , makefile )
424-
425-
421+ console . log ( 'Makefile saved in ' , makefile ) ;
426422
427423 return Promise . resolve ( 'Done' ) ;
428424
429425 }
430- } ;
426+ }
431427
432428module . exports = CalciumPreprocessModule ;
0 commit comments