From 50cd072b69cf524909bb7364a9d6cedd6a999724 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 8 Jan 2024 09:03:59 -0800 Subject: [PATCH] added support for multiple tiles --- sam/onyx/generate_matrices.py | 11 +++++++---- sam/onyx/hw_nodes/read_scanner_node.py | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sam/onyx/generate_matrices.py b/sam/onyx/generate_matrices.py index dbba52a1..016d94a8 100644 --- a/sam/onyx/generate_matrices.py +++ b/sam/onyx/generate_matrices.py @@ -440,17 +440,20 @@ def create_matrix_from_point_list(name, pt_list, shape) -> MatrixGenerator: return mg -def convert_aha_glb_output_file(glbfile, output_dir): +def convert_aha_glb_output_file(glbfile, output_dir, tiles): glbfile_s = os.path.basename(glbfile).rstrip(".txt") + files = [] if 'mode_vals' in glbfile: # num_blocks = 1 - files = [f"{output_dir}/{glbfile_s}"] + for i in range(tiles): + files.append(f"{output_dir}/{glbfile_s}_tile{i}") else: # num_blocks = 2 - files = [f"{output_dir}/{glbfile_s}_seg", - f"{output_dir}/{glbfile_s}_crd"] + for i in range(tiles): + files.append(f"{output_dir}/{glbfile_s}_seg_tile{i}") + files.append(f"{output_dir}/{glbfile_s}_crd_tile{i}") straightline = [] diff --git a/sam/onyx/hw_nodes/read_scanner_node.py b/sam/onyx/hw_nodes/read_scanner_node.py index 14c2bd18..9c1d0d54 100644 --- a/sam/onyx/hw_nodes/read_scanner_node.py +++ b/sam/onyx/hw_nodes/read_scanner_node.py @@ -298,7 +298,7 @@ def configure(self, attributes): lookup = 1 elif attributes['mode'].strip('"') == 'vals': # stop_lvl = 0 - lookup = 0 + lookup = 1 else: lookup = 0 block_mode = int(attributes['type'].strip('"') == 'fiberwrite')