diff --git a/picasso_workflow/analyse.py b/picasso_workflow/analyse.py index 2e7e3e2..1d2b311 100644 --- a/picasso_workflow/analyse.py +++ b/picasso_workflow/analyse.py @@ -1362,9 +1362,7 @@ def nneighbor(self, i, parameters, results): alldist = np.sort(alldist, axis=1) logger.debug("sorted all distances") else: - k = max([ - parameters['nth_NN'] + 3, - parameters["nth_rdf"] + 3]) + k = max([parameters["nth_NN"] + 3, parameters["nth_rdf"] + 3]) tree = KDTree(points) alldist, indices = tree.query(points, k=k) alldist = np.sort(alldist, axis=1) @@ -2271,7 +2269,6 @@ def ripleysk(self, i, parameters, results): ), ) ) - ) if isinstance(parameters["fp_combined_locs"], list): fp_combined_locs = parameters["fp_combined_locs"][0] diff --git a/picasso_workflow/tests/test_picasso_outpost.py b/picasso_workflow/tests/test_picasso_outpost.py index b023be7..3740af8 100644 --- a/picasso_workflow/tests/test_picasso_outpost.py +++ b/picasso_workflow/tests/test_picasso_outpost.py @@ -251,6 +251,7 @@ def test_06c_picked_locs(self): gold_locs = picasso_outpost.picked_locs( locs, info, centers, pick_diameter=0.5 ) - ngold_locs = np.sum([len(lcs) for lcs in gold_locs]) + print(gold_locs) + ngold_locs = len(gold_locs) assert ngold_locs == len(centers) * info[0]["Frames"]