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.

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

MAD-X: Add TKICKER, HKICKER and VKICKER to accepted input #420

Merged
merged 5 commits into from
Aug 28, 2023
Merged

MAD-X: Add TKICKER, HKICKER and VKICKER to accepted input #420

merged 5 commits into from
Aug 28, 2023

Conversation

n01r
Copy link
Member

@n01r n01r commented Aug 18, 2023 •
edited
Loading

We add HKICKER and VKICKER semantically as available elements of type KICKER.
We also add TKICKER and treat it exactly the same as KICKER.

Depends on #419, merge only after rebase

@n01r n01r requested review from ax3l and cemitch99 August 18, 2023 01:24
@n01r n01r added enhancement New feature or request changes input scripts / defaults Changes the syntax or meaning of input scripts and/or defaults labels Aug 18, 2023
@n01r n01r added this to the Advanced Methods (SciDAC) milestone Aug 18, 2023
@n01r n01r mentioned this pull request Aug 18, 2023
Closed
5 tasks
@ax3l
Copy link
Member

ax3l commented Aug 22, 2023

@n01r ready for rebase :)

@n01r
Accept KICKER in MAD-X input
c4f4266 
Added the logic to read lines from MAD-X input files that contain
kicker elements. Also added a MAD-X example input and a Python file that
reads it. The output and analysis script results match with the original
kicker example.
@n01r
Add HKICKER and VKICKER to MAD-X input
53d2aae
@n01r n01r force-pushed the topic-addHKickerAndVKickerToMADXArguments branch from 9714f9d to 53d2aae Compare August 22, 2023 23:46
@n01r
Copy link
Member Author

n01r commented Aug 22, 2023

@ax3l Rebase completed 👍

n01r and others added 2 commits August 22, 2023 18:22
@n01r
Add TKICKER as possible input
e33eb5e 
We treat TKICKER completely the same as KICKER elements.
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
6206242 
for more information, see https://pre-commit.ci
@n01r n01r changed the title MAD-X: Add HKICKER and VKICKER to accepted input MAD-X: Add TKICKER, HKICKER and VKICKER to accepted input Aug 23, 2023
@n01r
Copy link
Member Author

n01r commented Aug 23, 2023

I took the freedom to combine the test for KICKER and TKICKER since we treat them exactly the same.

ax3l
ax3l approved these changes Aug 28, 2023
View reviewed changes
Copy link
Member

@ax3l ax3l left a comment

Choose a reason for hiding this comment

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

Thank you, Marco! :)

cemitch99
cemitch99 approved these changes Aug 28, 2023
View reviewed changes
Copy link
Member

@cemitch99 cemitch99 left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@ax3l ax3l merged commit 82ccc62 into ECP-WarpX:development Aug 28, 2023
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cemitch99 cemitch99 cemitch99 approved these changes

@ax3l ax3l ax3l approved these changes

Assignees
No one assigned
Labels
changes input scripts / defaults Changes the syntax or meaning of input scripts and/or defaults enhancement New feature or request
Projects
None yet
Milestone
Advanced Methods (SciDAC-5)
Development

Successfully merging this pull request may close these issues.
3 participants
@n01r @ax3l @cemitch99