Skip to content

Add dp to rdts #890

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
wants to merge 3 commits into
base: master
Choose a base branch
from
+14 −4
Open

Add dp to rdts #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cf8b03
adds dp as parameter
oscarxblanco Jan 14, 2025
75fcd4f
computes the rdts with energy offset dp
oscarxblanco Jan 14, 2025
150cd6e
black
oscarxblanco Jan 14, 2025
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: 11 additions & 3 deletions atmat/atphysics/NonLinearDynamics/computeRDT.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,35 @@
%
% RDT=computeRDT(ring, index, varargin)
%
% INPUTS
% ring is the AT lattice
% index is the vector of indexes where one wants to compute RDTs
% The additional arguments can be up to five strings:
% chromatic, coupling, geometric1, geometric2 and tuneshifts
%
% OPTIONS (order does not matter)
% dp: Default 0. Energy offset to calculate the optics parameters.
%
% example:
% EXAMPLES
% RDT=computeRDT(ring, indexBPM, 'geometric1', 'tuneshifts');
% creates an array of structs (the length of the array is the number of
% indexes where you want to compute driving terms) with first order
% geometric driving terms and tune shifts with amplitude.
% The driving terms are complex numbers, the tune shifts are real.
%
% RDT=computeRDT(ring, indexBPM, 'geometric1', 'dp',0.01);
% Calculate the first order geometric RDTs using the optics with
% 0.01 energy offset.

naddvar=length(varargin);
[dp,args] = getoption(varargin,'dp',0);
chromatic=0;
coupling=0;
geometric1=0;
geometric2=0;
tuneshifts=0;
for ii=1:naddvar
switch varargin{ii}
switch args{ii}
case 'chromatic'
chromatic=1;
case 'coupling'
Expand Down Expand Up @@ -55,7 +63,7 @@

indDQSO=findcells(ring,'Class','Bend','Quadrupole','Sextupole','Octupole','Multipole');

[~,AVEBETA,AVEMU,AVEDISP,~,~]=atavedata(ring,0,1:length(ring));
[~,AVEBETA,AVEMU,AVEDISP,~,~]=atavedata(ring,dp,1:length(ring));

Lin=atlinopt(ring,0,1:(length(ring)+1));

Expand Down
4 changes: 3 additions & 1 deletion pyat/at/physics/rdt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@ def get_rdts(
second_order: bool = False,
use_mp: bool = False,
pool_size: int = None,
dp: float = 0.0,
):
"""
:py:func:`get_rdts` computes the ring RDTs based on the original implementation
Expand Down Expand Up @@ -443,6 +444,7 @@ def get_rdts(
Computation is significantly longer using this method
use_mp: Activate parallel calculation
pool_size: Number of processes used for parallelization
dp: default 0. Energy offset to calculate the optics parameters.

Returns:
rdts: rdt data (complex) at refpts
Expand Down Expand Up @@ -502,7 +504,7 @@ def get_rdts(

refpts = ring.uint32_refpts(refpts)
idx_mag = ring.get_uint32_index(Multipole)
lo, avebeta, avemu, avedisp, *_ = ring.avlinopt(refpts=All)
lo, avebeta, avemu, avedisp, *_ = ring.avlinopt(refpts=All, dp=dp)

sall = ring.get_s_pos(All)
smag = sall[idx_mag]
Expand Down
Loading