Skip to content

Commit

Permalink
tests run through
Browse files Browse the repository at this point in the history
  • Loading branch information
Heerpa committed Sep 25, 2024
1 parent fe3f401 commit 34d545a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
5 changes: 1 addition & 4 deletions picasso_workflow/analyse.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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]
Expand Down
3 changes: 2 additions & 1 deletion picasso_workflow/tests/test_picasso_outpost.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

0 comments on commit 34d545a

Please sign in to comment.