Skip to content

Replace boolean indexing in impact management #144

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

Open
ekatralis wants to merge 4 commits into
base: master
Choose a base branch
from
+33 −34
Open

Replace boolean indexing in impact management #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b23ca6f
Quick fix for boolean indexing
ekatralis Jul 8, 2025
3bc4d09
Clean up and optimize scripts
ekatralis Jul 24, 2025
730e806
Newer setuptools
ekatralis Mar 6, 2026
80c1d2f
Update makefile to force Meson backend to avoid compilation errors
ekatralis Mar 6, 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
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ cern:
/afs/cern.ch/project/uslarp/opt/lxplus64/Python-2.7.2/bin/f2py -m boris_step -c boris_step.f
/afs/cern.ch/project/uslarp/opt/lxplus64/Python-2.7.2/bin/f2py -m vectsum -c vectsum.f
local:
$(F2PY) -m rhocompute -c compute_rho.f
$(F2PY) -m int_field_for -c interp_field_for.f
$(F2PY) -m hist_for -c compute_hist.f
$(F2PY) -m seg_impact -c update_seg_impact.f
$(F2PY) -m errffor -c errfff.f
$(F2PY) -m boris_step -c boris_step.f
$(F2PY) -m vectsum -c vectsum.f
$(F2PY) -m rhocompute -c --backend meson compute_rho.f
$(F2PY) -m int_field_for -c --backend meson interp_field_for.f
$(F2PY) -m hist_for -c --backend meson compute_hist.f
$(F2PY) -m seg_impact -c --backend meson update_seg_impact.f
$(F2PY) -m errffor -c --backend meson errfff.f
$(F2PY) -m boris_step -c --backend meson boris_step.f
$(F2PY) -m vectsum -c --backend meson vectsum.f
50 changes: 25 additions & 25 deletions impact_management_class.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
from . import seg_impact as segi
from scipy.constants import e as qe


class impact_management(object):
def __init__(
self, chamb, sey_mod,
Expand Down Expand Up @@ -170,7 +169,6 @@ def reset_cos_angle_hist(self):
def reset_lifetime_hist_line(self):
self.lifetime_hist_line *= 0.

# @profile
def backtrack_and_second_emiss(self, old_pos, MP_e, tt_curr=None):

self.Nel_impact_last_step = 0.
Expand Down Expand Up @@ -215,39 +213,41 @@ def backtrack_and_second_emiss(self, old_pos, MP_e, tt_curr=None):
# detect impact
flag_impact[:N_mp_old] = chamb.is_outside(
x_mp[0:N_mp_old], y_mp[0:N_mp_old])


idx = np.flatnonzero(flag_impact)
Nimpact = int(np.sum(flag_impact))

if Nimpact > 0:

# load segment endpoints
x_in = x_mp_old[flag_impact[:N_mp_old]]
y_in = y_mp_old[flag_impact[:N_mp_old]]
z_in = z_mp_old[flag_impact[:N_mp_old]]
x_out = x_mp[flag_impact]
y_out = y_mp[flag_impact]
z_out = z_mp[flag_impact]
x_in = x_mp_old[idx]
y_in = y_mp_old[idx]
z_in = z_mp_old[idx]

x_out = x_mp[idx]
y_out = y_mp[idx]
z_out = z_mp[idx]

# backtracking and surface normal generation
[x_impact, y_impact, z_impact, Norm_x, Norm_y, i_found] =\
chamb.impact_point_and_normal(
x_in, y_in, z_in, x_out, y_out, z_out)

# load velocities and charges
vx_impact = vx_mp[flag_impact]
vy_impact = vy_mp[flag_impact]
vz_impact = vz_mp[flag_impact]
nel_impact = nel_mp[flag_impact]
vx_impact = vx_mp[idx]
vy_impact = vy_mp[idx]
vz_impact = vz_mp[idx]
nel_impact = nel_mp[idx]

# add to lifetime histogram
if self.flag_lifetime_hist:
lifetime_impact = tt_curr - MP_e.t_last_impact[flag_impact]
if sum(MP_e.t_last_impact[flag_impact] > 0) > 0:
histf.compute_hist(lifetime_impact[MP_e.t_last_impact[flag_impact] > 0],
nel_impact[MP_e.t_last_impact[flag_impact] > 0],
lifetime_impact = tt_curr - MP_e.t_last_impact[idx]
if sum(MP_e.t_last_impact[idx] > 0) > 0:
histf.compute_hist(lifetime_impact[MP_e.t_last_impact[idx] > 0],
nel_impact[MP_e.t_last_impact[idx] > 0],
0., Dt_lifetime_hist, self.lifetime_hist_line)

MP_e.t_last_impact[flag_impact] = tt_curr
MP_e.t_last_impact[idx] = tt_curr

# compute impact velocities, energy and angle
v_impact_mod = np.sqrt(
Expand Down Expand Up @@ -310,13 +310,13 @@ def backtrack_and_second_emiss(self, old_pos, MP_e, tt_curr=None):
self.Nel_emit_last_step = np.sum(nel_emit_tot_events)

# Replace old MPs
x_mp[flag_impact] = x_replace
y_mp[flag_impact] = y_replace
z_mp[flag_impact] = z_replace
vx_mp[flag_impact] = vx_replace
vy_mp[flag_impact] = vy_replace
vz_mp[flag_impact] = vz_replace
nel_mp[flag_impact] = nel_replace
x_mp[idx] = x_replace
y_mp[idx] = y_replace
z_mp[idx] = z_replace
vx_mp[idx] = vx_replace
vy_mp[idx] = vy_replace
vz_mp[idx] = vz_replace
nel_mp[idx] = nel_replace

# subtract replaced macroparticles
v_replace_mod = np.sqrt(
Expand Down
3 changes: 1 addition & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import numpy
from distutils.core import setup
from distutils.extension import Extension
from setuptools import setup, Extension
from Cython.Build import cythonize

setup(
Expand Down