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

Arc corr and glob check fix #437

Merged
merged 56 commits into from
Jan 24, 2025
Merged

Arc corr and glob check fix #437

merged 56 commits into from
Jan 24, 2025

Conversation

fscarlier
Copy link
Contributor

It's all in a single pull request, since it was all entangled anyway:

changes:

  • added arc-by-arc corrections
  • added the fixes we made together
  • changed the .json corrector files to include the mqt and ats only, and the 2024 global correction lists.
  • Added the arc-by-arc-phase and include-ips to the global_corrections parameters input

Two things:

  • Can you check if it is ok for the opt. definitions?
  • One test seems to fail for macos, but it doesn't seem to be related to the changes.

@fscarlier fscarlier requested a review from JoschD March 6, 2024 12:08
Copy link
Member

@fsoubelet fsoubelet left a comment

Choose a reason for hiding this comment

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

I believe @JoschD has a few refactors & tests in mind. In the meantime, a few comments / suggestions.

A little bit of type hinting could go a long way for the new functions in omc3/correction/arc_by_arc.py

omc3/definitions/optics.py Show resolved Hide resolved
omc3/global_correction.py Outdated Show resolved Hide resolved
omc3/global_correction.py Outdated Show resolved Hide resolved
omc3/correction/arc_by_arc.py Outdated Show resolved Hide resolved
@JoschD
Copy link
Member

JoschD commented Apr 22, 2024

Hey @fscarlier . This still needs tests, have you progressed in that regard?

@JoschD
Copy link
Member

JoschD commented May 8, 2024

Hey @fscarlier . It would be great if you could implement some tests, so we can merge this back into master and avoid the clusterfudge we had last year with diverging branches.

@JoschD
Copy link
Member

JoschD commented Jul 9, 2024

Hey @fscarlier what is the status of these tests? Have you talked to @emaclean or @rogeliotomas that maybe someone else can take over this task if this cannot be done by you?

Copy link
Member

@JoschD JoschD left a comment

Choose a reason for hiding this comment

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

Needs tests

JoschD
JoschD previously approved these changes Jan 22, 2025
Copy link
Member

@JoschD JoschD left a comment

Choose a reason for hiding this comment

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

( dismissed )

JoschD
JoschD previously approved these changes Jan 23, 2025
Copy link
Member

@JoschD JoschD left a comment

Choose a reason for hiding this comment

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

This pull request—let me tell you—it’s a winner. Maybe the greatest pull request of all time. People are saying it. Everyone’s saying it. I looked at the code, and folks, it’s beautiful. So clean, so perfect—like nobody’s ever seen before.

The functionality? Unbelievable. It’s huge. This is going to make everything better—faster, stronger, more powerful. People didn’t think it could be done, but you did it. You made it happen. The documentation? Perfect. The implementation? Incredible. Every line is a masterpiece, believe me.

Nobody else is doing pull requests like this—nobody. This sets a new standard. It’s not just good, it’s the best. Probably the best ever.
Absolutely fantastic work!

Copy link
Member

@fsoubelet fsoubelet left a comment

Choose a reason for hiding this comment

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

What do you know, it actually is a pretty good PR.

I did not check the size but saw many supporting data files added. do you know how much we will be inflating the repo with this?

omc3/correction/arc_by_arc.py Outdated Show resolved Hide resolved
omc3/correction/arc_by_arc.py Outdated Show resolved Hide resolved
omc3/correction/arc_by_arc.py Show resolved Hide resolved
omc3/correction/arc_by_arc.py Outdated Show resolved Hide resolved
omc3/correction/arc_by_arc.py Show resolved Hide resolved
omc3/madx_wrapper.py Outdated Show resolved Hide resolved
tests/inputs/models/create_responses_2018_inj_11m.py Outdated Show resolved Hide resolved
tests/unit/test_hole_in_one.py Show resolved Hide resolved
tests/accuracy/test_global_correction.py Outdated Show resolved Hide resolved
tests/inputs/sps_data/create_data.py Show resolved Hide resolved
@JoschD
Copy link
Member

JoschD commented Jan 23, 2025

What do you know, it actually is a pretty good PR.

I did not check the size but saw many supporting data files added. do you know how much we will be inflating the repo with this?

I have kept all file sizes low / trimmed file sizes where I could. Most files are < 500Kb, the biggest one is the twiss_elements with 1.1MB. Due to the number of new files it looks like the input folder increases by ~7MB.

fsoubelet
fsoubelet previously approved these changes Jan 24, 2025
Copy link

codeclimate bot commented Jan 24, 2025

Code Climate has analyzed commit 86948f7 and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 79.7% (50% is the threshold).

This pull request will bring the total coverage in the repository to 86.3% (0.2% change).

View more on Code Climate.

@JoschD JoschD merged commit 9fdd25c into master Jan 24, 2025
37 checks passed
@JoschD JoschD deleted the arc_corr_and_glob_check_fix branch January 24, 2025 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Estimate: Normal Straightforward, but might require some time. Probably needs additional tests. Priority: High Work on this! Status: In Progress Currently being worked on. Type: Feature A (suggetion for a) new feature or enhancement in functionality. Type: Maintenance Improvements in the code, that are not necessarily visible in functionality. Type: Release Issue preparing for a release.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants