@@ -347,7 +347,6 @@ def __init__(self, npx_input_dir: str, ks_output_dir: str,
347347 self ._json_directory = self ._ks_output_dir / 'json_configs'
348348 self ._json_directory .mkdir (parents = True , exist_ok = True )
349349
350- self ._median_subtraction_finished = False
351350 self .ks_input_params = None
352351 self ._modules_input_hash = None
353352 self ._modules_input_hash_fp = None
@@ -428,13 +427,6 @@ def run_modules(self):
428427 if module_status ['completion_time' ] is not None :
429428 continue
430429
431- if module == 'median_subtraction' and self ._median_subtraction_finished :
432- self ._update_module_status (
433- {module : {'start_time' : datetime .utcnow (),
434- 'completion_time' : datetime .utcnow (),
435- 'duration' : 0 }})
436- continue
437-
438430 module_output_json = self ._get_module_output_json_filename (module )
439431 command = [sys .executable ,
440432 '-W' , 'ignore' , '-m' , 'ecephys_spike_sorting.modules.' + module ,
@@ -477,7 +469,11 @@ def _get_raw_data_filepaths(self):
477469 for line in f .readlines ():
478470 if (line .startswith ('ecephys spike sorting: median subtraction module' )
479471 and previous_line .startswith ('Total processing time:' )):
480- self ._median_subtraction_finished = True
472+ duration = int (re .search ('\d+\.?\d+' , previous_line ).group ())
473+ median_subtraction_status = self ._get_module_status ('median_subtraction' )
474+ median_subtraction_status ['duration' ] = duration
475+ median_subtraction_status ['completion_time' ] = datetime .strptime (median_subtraction_status ['start_time' ], '%Y-%m-%d %H:%M:%S.%f' ) + timedelta (seconds = duration )
476+ self ._update_module_status ({'median_subtraction' : median_subtraction_status })
481477 return continuous_file
482478 previous_line = line
483479
0 commit comments