diff --git a/main.py b/main.py index 119f110..5b38218 100644 --- a/main.py +++ b/main.py @@ -29,9 +29,9 @@ if __name__ == "__main__": start = time.time() logging.info("Starting to process DAT to ASC") + batch_checkpoint = time.time() if dat_file_count != asc_file_count: batch.process_nimrod_files() - batch_checkpoint = time.time() elapsed_time = batch_checkpoint - start logging.info(f"DAT to ASC completed in {elapsed_time:.2f} seconds") else: @@ -47,7 +47,10 @@ if __name__ == "__main__": logging.info(f"{place[0]} completed in {since_asc_create:.2f} seconds") logging.info(f'total time so far {elapsed_time:.2f} seconds') + logging.info('combining CSVs into groups') combiner.combine_csv_files() - - - logging.info(f'All Complete') \ No newline at end of file + logging.info('CSVs combined!') + end = time.time() + elapsed_time = end - start + + logging.info(f'All Complete total time {elapsed_time:.2f} seconds') \ No newline at end of file diff --git a/modules/batch_nimrod.py b/modules/batch_nimrod.py index 6d8c65b..46964db 100644 --- a/modules/batch_nimrod.py +++ b/modules/batch_nimrod.py @@ -32,6 +32,9 @@ class BatchNimrod(): with open(out_file_path, "w") as outfile: image.extract_asc(outfile) + + # delete dat file here + logging.debug(f"Successfully processed: {in_file_full}") except Nimrod.HeaderReadError as e: diff --git a/modules/combine_timeseries.py b/modules/combine_timeseries.py index 2281c33..29ff408 100644 --- a/modules/combine_timeseries.py +++ b/modules/combine_timeseries.py @@ -19,7 +19,6 @@ class CombineTimeseries: def combine_csv_files(self): for group, loc_list in self.grouped_locations.items(): - print(f"Group {group}:") combined_df = None for loc in loc_list: csv_to_load = f'./csv_files/{loc[0]}_timeseries_data.csv'