Skip to content

Squash bug when matching FoF catalogues #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robjmcgibbon merged 2 commits into from
Sep 28, 2026
Merged

Squash bug when matching FoF catalogues #236

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d3715e
Squash bug when matching FoF catalogues
robjmcgibbon Sep 28, 2026
8e1ca98
Don't modify array in-place
robjmcgibbon Sep 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion misc/match_group_membership.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ def load_particle_data(snap_basename, membership_basename, ptypes, match_fof, co

# Remove any particles which are not bound to a subhalo
mask = halo_catalogue_idx != -1
if match_fof:
# SWIFT sets FOFGroupIDs to this value for particles not in a group
mask &= halo_catalogue_idx != 2147483647
particle_ids = particle_ids[mask]
halo_catalogue_idx = halo_catalogue_idx[mask]
rank_bound = rank_bound[mask]
Expand Down Expand Up @@ -158,6 +161,8 @@ def match_sim(
host_halo_catalogue_idx = psort.fetch_elements(
catalogue_to_match["halo_catalogue_idx"], host_halo_idx, comm=comm
)
# Copy so we don't modify the caller's array
particle_halo_ids_to_match = particle_halo_ids_to_match.copy()
particle_halo_ids_to_match[is_sat] = host_halo_catalogue_idx

# Sort particles
Expand Down Expand Up @@ -267,7 +272,7 @@ def match_sim(
match_count = np.zeros_like(catalogue["halo_catalogue_idx"])

# Retrieve the values we require, skipping halos which don't have a match
idx = psort.parallel_match(catalogue["halo_catalogue_idx"], halo_ids)
idx = psort.parallel_match(catalogue["halo_catalogue_idx"], halo_ids, comm=comm)
match_index[idx != -1] = psort.fetch_elements(
matched_catalogue_idx, idx[idx != -1], comm=comm
)
Expand Down
Loading