From ea14493fb94b99046310d5836ed57f1865943897 Mon Sep 17 00:00:00 2001 From: Konstantin Butenko Date: Thu, 15 Feb 2024 17:52:29 +0100 Subject: [PATCH 1/3] FIX: collapse VTA in initialization --- ossdbs/api.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ossdbs/api.py b/ossdbs/api.py index a3aae3ed..24a22736 100644 --- a/ossdbs/api.py +++ b/ossdbs/api.py @@ -257,6 +257,7 @@ def generate_point_models(settings: dict): center=center, distance=distance, direction=direction, + collapse_vta=collapse_vta, ) ) From c93559c77631eaa75ca8f052294991228d81aa0d Mon Sep 17 00:00:00 2001 From: Konstantin Butenko Date: Thu, 15 Feb 2024 18:06:03 +0100 Subject: [PATCH 2/3] REF: remove excessive assignment --- ossdbs/api.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/ossdbs/api.py b/ossdbs/api.py index 24a22736..ce13e228 100644 --- a/ossdbs/api.py +++ b/ossdbs/api.py @@ -261,8 +261,6 @@ def generate_point_models(settings: dict): ) ) - collapse_vta = settings["PointModel"]["Lattice"]["CollapseVTA"] - point_models[-1].collapse_vta = collapse_vta if settings["PointModel"]["VoxelLattice"]["Active"]: _logger.info("from voxel lattice") From deb1f4b05d0222b7d581262322cc9ce51a53f48d Mon Sep 17 00:00:00 2001 From: Julius Zimmermann Date: Thu, 15 Feb 2024 18:11:29 +0100 Subject: [PATCH 3/3] pass collapse vta properly --- ossdbs/api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ossdbs/api.py b/ossdbs/api.py index ce13e228..8102d1ef 100644 --- a/ossdbs/api.py +++ b/ossdbs/api.py @@ -250,6 +250,7 @@ def generate_point_models(settings: dict): dir_par = settings["PointModel"]["Lattice"]["Direction"] direction = dir_par["x[mm]"], dir_par["y[mm]"], dir_par["z[mm]"] distance = settings["PointModel"]["Lattice"]["PointDistance[mm]"] + collapse_vta = settings["PointModel"]["Lattice"]["CollapseVTA"] point_models.append( Lattice( @@ -261,7 +262,6 @@ def generate_point_models(settings: dict): ) ) - if settings["PointModel"]["VoxelLattice"]["Active"]: _logger.info("from voxel lattice") center_par = settings["PointModel"]["Lattice"]["Center"] @@ -440,7 +440,7 @@ def run_volume_conductor_model(settings, volume_conductor): point_models=point_models, activation_threshold=settings["ActivationThresholdVTA"], out_of_core=out_of_core, - export_frequency=export_frequency + export_frequency=export_frequency, ) return vcm_timings