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

Enhancement/13/optics measurements #49

Merged
merged 74 commits into from
Aug 6, 2019

Conversation

lmalina
Copy link
Member

@lmalina lmalina commented May 7, 2019

Draft pull request for optics measurements
There are still some TODOs:
Coupling
Tests: decide on whether to put test files into this repository
Redesign accelerator class

lmalina and others added 30 commits January 8, 2019 15:24
Optics measurements run with python 3
all imports are absolute and cleaned up
included measurements from 3d kicks:
    - normalised dispersion and corresponding dispersion
    - dispersion calculated straight from synchrotron oscillation
includes second order dispersion calculation
refactoring and bug fixes in beta from phase:
    - fixed which models are used
    - fixed the swapped driven and free tunes
    - fixed the systematic error calculation (only the systematic errors from left side of probed BPM were taken into account)
    - simplified the model management
    - joined the ABB, BAB, BBA cases into one
    - reduced method signatures (a lot)
made accelerator class and model manager python 3 compatible
   also can use config files or dictionaries as the input
- entrypoint was moved to parser/ (sloppy merge)
- a few lines in n_bpm_method were mistakenly inside the loop over BPMs
    plane dependency is still to be removed from dispersion from 3D kicks and kick calculation
    further simplification likely once we decide on driven analysis
    additionally combination simplifications in beta_from_phase
compared to python 2 version different cleaning in the two planes is not a problem
single plane RDTs are separated and from all good BPMs in the given plane
added search for second BPM closest to 90 degree phase advance from the first BPM in a pair
   this was embedded in phase output (python2), but did not have an equivalent yet
needless to say that the module is got vectorised
this commit is mostly for the reference since more changes in RDT amplitude fit are foreseen
   now contains multiple solutions of the same thing
JoschD and others added 12 commits July 10, 2019 15:18
* harpy/handler.py: added TIME to headers of lin-files
* Refactored kick.py to use only constants as Column names, added time from lin-files
* accelerator.py: refactored strings of element types to AccElementTypes class
* #64 Cleaned gitignore

* #78 Added plane to RescaleFactor in kick.py

* Added micoseconds to kick-timestamp

* #83 renamed --accelerator to --tbt_datatype
@lmalina lmalina marked this pull request as ready for review August 6, 2019 11:46
@lmalina
Copy link
Member Author

lmalina commented Aug 6, 2019

Fixes #64, #69, # 73, #78, #80, #83 and #84.

Model creators, coupling calculation and overall accuracy are treated in separated issues: #30, #87, #88.

@codeclimate
Copy link

codeclimate bot commented Aug 6, 2019

Code Climate has analyzed commit 9c6a9ae and detected 0 issues on this pull request.

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

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

View more on Code Climate.

@lmalina lmalina requested a review from JoschD August 6, 2019 12:11
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.

Good. A lot. But good

@lmalina lmalina merged commit 16aaa8b into master Aug 6, 2019
@lmalina lmalina deleted the enhancement/13/optics_measurements branch August 6, 2019 12:53
@mihofer mihofer restored the enhancement/13/optics_measurements branch August 6, 2019 13:19
@lmalina lmalina deleted the enhancement/13/optics_measurements branch August 6, 2019 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Feature A (suggetion for a) new feature or enhancement in functionality.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants