diff --git a/datasets/bathy/docker/oceaneyes/runner.py b/datasets/bathy/docker/oceaneyes/runner.py index d13cfc98..076bdbb7 100644 --- a/datasets/bathy/docker/oceaneyes/runner.py +++ b/datasets/bathy/docker/oceaneyes/runner.py @@ -278,14 +278,14 @@ def runClassifier(classifier, classifier_func, num_processes=6): pool.close() pool.join() for i in range(len(beam_list)): - if results[i] != None: + if results[i] is not None: beam_table[beam_list[i]][classifier] = results[i] else: beam_failures.append(beam_list[i]) else: for beam in beam_list: result = classifier_func(spot_table[beam], beam_table[beam]) - if result != None: + if result is not None: beam_table[beam][classifier] = result else: beam_failures.append(beam) diff --git a/datasets/bathy/endpoints/atl24g.lua b/datasets/bathy/endpoints/atl24g.lua index 11742a6a..0d4759db 100644 --- a/datasets/bathy/endpoints/atl24g.lua +++ b/datasets/bathy/endpoints/atl24g.lua @@ -243,8 +243,7 @@ for beam,dataframe in pairs(dataframes) do end failed_processing_run = failed_processing_run or failed_dataframe end --- delay clean up and exit because race condition exists for --- dataframes that otherwise might not have finished yet +-- exit here after all dataframes have finished if failed_processing_run then cleanup(crenv, transaction_id) return