Thanks to visit codestin.com
Credit goes to github.com

Skip to content

more elens changes #841

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

Jump to bottom
Merged
merged 41 commits into from
Feb 20, 2020
Merged

more elens changes #841

merged 41 commits into from
Feb 20, 2020

Conversation

amereghe
Copy link
Contributor

@amereghe amereghe commented Apr 18, 2019 •
edited
Loading

This PR is a continuation of PR #839 - separated, though, not to mix modifications necessary by fox with other stuff.

Changes:

  • write statements involving exponential notation are all converted to 1pe22.15;
  • remaining signs of chebyshev maps in elens module have been removed;
  • gamma_electron added to computation of kick by elens. Documentation and tests updated accordingly;
  • fixing plotting scripts and plots of radial integrated currents and kicks of elenses with measured radial profiles; fix in SixTrack code will actually come with PR foxifying e-lenses #839, where it was found and fixed immediately in order not to forget to do it;
  • elens module fully dynamic allocatable;
  • give possibility to express R_1 and R_2 in sigma;
  • add any ion species to be defined as possible lens beam;
  • perform checks on sensible values of R_1 and R_2, eg they fall inside the domain of the ASCII map;
  • review plots of tests and optimise storage space in git;

A change in the printout format of dynkset.dat was necessary - hence, all the tests with this file among the extra checks have been updated.

@amereghe amereghe mentioned this pull request Jan 21, 2020
Closed
@amereghe
Copy link
Contributor Author

Hi @vkbo ,
have you implemented the generalised storage of optics functions at specific elements?

I am implementing in the elens module the fact of specifying R1 and R2 in normalised units, hence this functionality would be really beneficial for me.

Thanks!

amereghe added 15 commits January 27, 2020 15:24
@amereghe
adding possibility to express R1 and R2 in normalised units
565c6c4
@amereghe
sigma of electron beam can be expressed in normalised units
311a3a1
@amereghe
Merge branch 'master' into eLenses_step2
9c79aea
@amereghe
test-driven changes
f41bae9
@amereghe
updating manual accordingly
1a6c5e8
@amereghe
changes manual-driven
e2acaea
@amereghe
applying to FOX and INTER keyword the same interface as in EMIN and S…
fc4bd2a 
…IGDPP for repetition of settings to different e-lenses
@amereghe
updating manual, following previous commit
536117f
@amereghe
from elens_normalise_geo to elens_post_linopt
fd362a2
@amereghe
adding the check that R1 and R2 actually fall in the range of the map…
d921b6c 
… of the radial profile
@amereghe
updating user manual following last commit
8277784
@amereghe
fixing printing format in dynk_fileUnit
96b26ec
@amereghe
elenses have e-beams by default
0d03c05
@amereghe
a bit of house-keeping work
aa74a73
@amereghe
adding user interface for specifying particle species of lenses
13837f6
@amereghe amereghe changed the title WIP: more elens changes more elens changes Feb 11, 2020
vkbo
vkbo requested changes Feb 17, 2020
View reviewed changes
Copy link
Member

@vkbo vkbo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly looked at the parsing and such, so my review is not a full review.

@amereghe
Copy link
Contributor Author

Hi @vkbo ,
I have applied all the changes you have requested. Hope the code is fine, now
Cheers,
A.

@amereghe amereghe merged commit 54ee9d8 into SixTrack:master Feb 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vkbo vkbo vkbo approved these changes

@rdemaria rdemaria Awaiting requested review from rdemaria

@tpersson tpersson Awaiting requested review from tpersson

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@amereghe @vkbo