Skip to content
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.

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

Release/0.2.3 #38

Merged
merged 3 commits into from
Mar 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions examples/000a_sps_tune_shift.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

import xwakes as xw
import xtrack as xt
import xfields as xf
import xpart as xp
import nafflib

Expand Down Expand Up @@ -64,7 +63,7 @@
)

# initialize a damper with 100 turns gain
transverse_damper = xf.TransverseDamper(
transverse_damper = xw.TransverseDamper(
gain_x=2/100, gain_y=2/100,
zeta_range=(-0.5*bucket_length, 0.5*bucket_length),
num_slices=100,
Expand All @@ -73,7 +72,7 @@
)

# initialize a monitor for the average transverse positions
monitor = xf.CollectiveMonitor(
monitor = xw.CollectiveMonitor(
base_file_name=f'sps_tune_shift',
monitor_bunches=True,
monitor_slices=False,
Expand Down
6 changes: 2 additions & 4 deletions examples/000b_sps_tune_shift_multibunch.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
# Copyright (c) CERN, 2024. #
# ######################################### #

import matplotlib.pyplot as plt
import numpy as np
import pathlib
import h5py

import xwakes as xw
import xtrack as xt
import xfields as xf
import xpart as xp
import nafflib

Expand Down Expand Up @@ -71,7 +69,7 @@
)

# initialize a damper with 100 turns gain
transverse_damper = xf.TransverseDamper(
transverse_damper = xw.TransverseDamper(
gain_x=2/100, gain_y=2/100,
zeta_range=(-0.5*bucket_length, 0.5*bucket_length),
num_slices=100,
Expand All @@ -81,7 +79,7 @@
)

# initialize a monitor for the average transverse positions
monitor = xf.CollectiveMonitor(
monitor = xw.CollectiveMonitor(
base_file_name=f'sps_tune_shift',
monitor_bunches=True,
monitor_slices=False,
Expand Down
5 changes: 2 additions & 3 deletions examples/000c_sps_tune_shift_multibunch_mpi.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

import xwakes as xw
import xtrack as xt
import xfields as xf
import xpart as xp
import nafflib

Expand Down Expand Up @@ -77,7 +76,7 @@
)

# initialize a damper with 100 turns gain
transverse_damper = xf.TransverseDamper(
transverse_damper = xw.TransverseDamper(
gain_x=2/100, gain_y=2/100,
zeta_range=(-0.5*bucket_length, 0.5*bucket_length),
num_slices=100,
Expand All @@ -88,7 +87,7 @@

# initialize a monitor for the average transverse positions
my_rank = MPI.COMM_WORLD.Get_rank()
monitor = xf.CollectiveMonitor(
monitor = xw.CollectiveMonitor(
base_file_name=f'sps_tune_shift_rank{my_rank}',
monitor_bunches=True,
monitor_slices=False,
Expand Down
2 changes: 1 addition & 1 deletion xwakes/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# Copyright (c) CERN, 2024. #
# ######################################### #

__version__ = '0.2.2'
__version__ = '0.2.3'
2 changes: 2 additions & 0 deletions xwakes/beam_elements/collective_monitor.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ class CollectiveMonitor(ElementWithSlicer):
Use flattened wakes
"""

iscollective = True

_stats_to_store = [
'mean_x', 'mean_px', 'mean_y', 'mean_py', 'mean_zeta',
'mean_delta', 'sigma_x', 'sigma_y', 'sigma_zeta',
Expand Down