Skip to content

Added kwargs to xp.pencil calls (such that e.g. method='4d' can be pa… #142

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
merged 1 commit into from
Jun 5, 2025
+10 −6
Merged

Added kwargs to xp.pencil calls (such that e.g. method='4d' can be pa… #142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions xcoll/initial_distribution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# copyright ############################### #
# This file is part of the Xcoll package. #
# Copyright (c) CERN, 2024. #
# Copyright (c) CERN, 2025. #
# ######################################### #

import numpy as np
Expand Down Expand Up @@ -88,11 +88,14 @@ def generate_pencil_on_collimator(line, name, num_particles, *, side='+-', penci
if side == '+-':
num_plus = int(num_particles/2)
num_min = int(num_particles - num_plus)
coords_plus = _generate_4D_pencil_one_jaw(line, name, num_plus, plane, '+', impact_parameter, dr_sigmas, at_element, is_converging, tw_at_s)
coords_min = _generate_4D_pencil_one_jaw(line, name, num_min, plane, '-', impact_parameter, dr_sigmas, at_element, is_converging, tw_at_s)
coords_plus = _generate_4D_pencil_one_jaw(line, name, num_plus, plane, '+', impact_parameter, dr_sigmas,
at_element, is_converging, tw_at_s, **kwargs)
coords_min = _generate_4D_pencil_one_jaw(line, name, num_min, plane, '-', impact_parameter, dr_sigmas,
at_element, is_converging, tw_at_s, **kwargs)
coords = [ [*c_plus, *c_min] for c_plus, c_min in zip(coords_plus, coords_min)]
else:
coords = _generate_4D_pencil_one_jaw(line, name, num_particles, plane, side, impact_parameter, dr_sigmas, at_element, is_converging, tw_at_s)
coords = _generate_4D_pencil_one_jaw(line, name, num_particles, plane, side, impact_parameter,
dr_sigmas, at_element, is_converging, tw_at_s, **kwargs)
pencil = coords[0]
p_pencil = coords[1]
transverse_norm = coords[2]
Expand Down Expand Up @@ -183,7 +186,8 @@ def generate_delta_from_dispersion(line, at_element, *, plane, position_mm, nemi


def _generate_4D_pencil_one_jaw(line, name, num_particles, plane, side, impact_parameter,
dr_sigmas, at_element, is_converging, tw_at_s=None):
dr_sigmas, at_element, is_converging, tw_at_s=None,
_capacity=None, **kwargs):
coll = line[name]

if side == '+':
Expand All @@ -209,7 +213,7 @@ def _generate_4D_pencil_one_jaw(line, name, num_particles, plane, side, impact_p
pencil, p_pencil = xp.generate_2D_pencil_with_absolute_cut(
num_particles, plane=plane, absolute_cut=pencil_pos, line=line,
dr_sigmas=dr_sigmas, nemitt_x=coll.nemitt_x, nemitt_y=coll.nemitt_y,
at_element=at_element, side=side, twiss=tw_at_s
at_element=at_element, side=side, twiss=tw_at_s, **kwargs
)

# Other plane: generate gaussian distribution in normalized coordinates
Expand Down