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

SPS & LHC OTFB merge #203

Open
wants to merge 202 commits into
base: lhcotfb
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
202 commits
Select commit Hold shift + click to select a range
1672f37
Added kde4 project file ignore
May 28, 2021
894abd6
Bumped up appveyor and travis versions to 3.9
Jun 6, 2021
b8e834c
Appveyor: trying python 3.9 with VS2019
Jun 6, 2021
af58c95
Added Python 3.9 to Travis
Jun 6, 2021
56071ef
Made a new SPSOneTurnFeedback object with arrays with a length of two…
Aug 24, 2021
9aa7d88
Corrected typo.
BirkKarlsen Aug 25, 2021
c5c1699
Removed edge effect at the start of each turn.
BirkKarlsen Aug 31, 2021
cc53b16
Included beam into the OTFB.
BirkKarlsen Sep 8, 2021
b47515d
Added the SPSCavityFeedback object.
BirkKarlsen Sep 25, 2021
58d0ba1
Started benchmarking the OTFB with a batched beam.
BirkKarlsen Oct 21, 2021
1e0f45c
Made the new cavity into the default cavity_feedback model.
BirkKarlsen Dec 5, 2021
217934e
Made the new cavity into the default cavity_feedback model.
BirkKarlsen Dec 5, 2021
2fcb6af
Made the new cavity into the default cavity_feedback model.
BirkKarlsen Dec 5, 2021
4457af5
Merge pull request #2 from blond-admin/master
BirkKarlsen Dec 6, 2021
77af345
Merge pull request #1 from BirkKarlsen/new_cavity
BirkKarlsen Dec 6, 2021
dcefc0a
Updated the central frequency of the SPS 3- and 4-section cavities.
BirkKarlsen Dec 7, 2021
e4d26ec
Merge pull request #3 from BirkKarlsen/new_cavity
BirkKarlsen Dec 7, 2021
c485356
Various changes to merge with blond-admin master.
BirkKarlsen Dec 7, 2021
f6189e4
Merge pull request #4 from blond-admin/master
BirkKarlsen Dec 7, 2021
b620e5e
Various changes to merge with blond-admin master with corrected typos.
BirkKarlsen Dec 7, 2021
4498ea6
Merge pull request #202 from BirkKarlsen/new_cavity
htimko Dec 7, 2021
2bee3be
Merge pull request #197 from mvadai/master
htimko Dec 7, 2021
1b75280
Corrected a few typos
BirkKarlsen Dec 16, 2021
c862e25
Merge remote-tracking branch 'origin/master'
BirkKarlsen Dec 16, 2021
1b9eab4
Added an option to shift the central frequency of the TWCs from the O…
BirkKarlsen Dec 20, 2021
6ec431b
Fixed a typo.
BirkKarlsen Dec 20, 2021
a400017
Changed default value of the shift in central frequency.
BirkKarlsen Dec 20, 2021
6e1e16a
Add option to change sign of phase correction in the OTFB.
BirkKarlsen Dec 30, 2021
91591a1
Fixed some typos and tried changing some signs for the OTFB.
BirkKarlsen Jan 20, 2022
157ec55
Fixed a typo.
BirkKarlsen Jan 20, 2022
fe0c15b
Fixed a sign.
BirkKarlsen Jan 20, 2022
343ad45
Fixed option to rotate the IQ-signals in the complex plane.
BirkKarlsen Jan 26, 2022
7160383
Minor corrections to the phase correction from the SPS OTFB.
BirkKarlsen Jan 27, 2022
73247e9
Corrected sign of the phase corrections from the OTFB into the tracker.
BirkKarlsen Jan 28, 2022
c4446c4
Added a paragraph to the doc about the SPS cavity controller.
BirkKarlsen Jan 31, 2022
98a4875
Corrected the format for the cavity_feedback code and started reworki…
BirkKarlsen Feb 1, 2022
9b4884a
Updated unittests related to the new SPSCavityFeedback object.
BirkKarlsen Feb 1, 2022
070fcac
Minor Fixes.
BirkKarlsen Feb 1, 2022
e13dc70
Made a modification to the signs of the signals in the OTFB and to th…
BirkKarlsen Feb 2, 2022
2fb91f8
Continued investigating the signs in the SPS OTFB model.
BirkKarlsen Feb 3, 2022
270009b
Continued with sign study of OTFB.
BirkKarlsen Feb 7, 2022
1a61259
Fixed 2 typos in beam.eliminate-lost-particles.
Feb 7, 2022
7a70b3f
Merge pull request #204 from fschuderer/fixed-typo-in-eliminate-lost-…
htimko Feb 7, 2022
31f6183
Fixed bug in beam.eliminate-lost-particles.
Feb 7, 2022
8831ff1
Started modifying the rf beam current for the phases to be consistent…
BirkKarlsen Feb 7, 2022
e1fcb33
Merge remote-tracking branch 'origin/master'
BirkKarlsen Feb 7, 2022
620e545
Merge pull request #205 from fschuderer/fixed-typo-in-eliminate-lost-…
htimko Feb 8, 2022
32030d2
Made a phase correction to the RF current in the OTFB.
BirkKarlsen Feb 9, 2022
5bcdf0e
Looked further into the phase of the RF current.
BirkKarlsen Feb 10, 2022
1bbc7b8
Fixed response functions for the generator part.
BirkKarlsen Feb 11, 2022
cfbda84
Resolved issue regarding signs in the I/Q signals in the SPS OTFB model.
BirkKarlsen Feb 11, 2022
0d9e9e3
Made changes to the phase correction with respect to the generator in…
BirkKarlsen Feb 11, 2022
ad5c8d8
Currently looking into sign of the bunch-by-bunch offset generated by…
BirkKarlsen Feb 16, 2022
2e52849
bigaussian initializer: now separate random generators for dt and dE.…
Mar 2, 2022
9770c11
Updated the FF coefficients for the 3-section and 4-section TWCs.
BirkKarlsen Mar 3, 2022
3b2e12b
Updated the unittests for the SPS OTFB.
BirkKarlsen Mar 3, 2022
fd16d9a
Made a first implementation of the SPS FF.
BirkKarlsen Mar 8, 2022
049a9f4
Merge pull request #5 from BirkKarlsen/lw_otfb
BirkKarlsen Mar 10, 2022
93a41f9
Removed and added a few comments.
BirkKarlsen Mar 10, 2022
713a14f
Merge branch 'master' into lw_otfb
BirkKarlsen Mar 10, 2022
a77f063
Merge pull request #6 from BirkKarlsen/lw_otfb
BirkKarlsen Mar 10, 2022
7344549
Changed signs in down and upmodulation.
BirkKarlsen Mar 11, 2022
2dd2576
Minor changes to the FF model.
BirkKarlsen Mar 11, 2022
37bb8c0
Reverted merger with master.
BirkKarlsen Mar 11, 2022
3b5771a
Merge pull request #7 from BirkKarlsen/lw_otfb
BirkKarlsen Mar 11, 2022
4e79cec
Started implementing FF arrays spanning two turns.
BirkKarlsen Mar 11, 2022
e3a5397
Changed OTFB currents to be in Ampere units, corrected modulator func…
BirkKarlsen Mar 14, 2022
498aaaf
Minor changes.
BirkKarlsen Mar 14, 2022
e97f50e
Implemented two turn arrays and modulation for the SPS FF.
BirkKarlsen Mar 15, 2022
3aa7380
Fixed typos.
BirkKarlsen Mar 15, 2022
491f55d
Updated files for easier merger with BLonD-admin master.
BirkKarlsen Mar 23, 2022
3fd9e47
Merge branch 'new_cavity'
BirkKarlsen Mar 23, 2022
1b9ea9b
Merge branch 'blond-admin:master' into master
BirkKarlsen Mar 23, 2022
e54a785
Made a correction to the resampling of the FF beam current.
BirkKarlsen Mar 23, 2022
e90177a
Updated the SPS FF filters.
BirkKarlsen Mar 23, 2022
1cb2e92
Merge pull request #207 from fschuderer/fix-initialization-bug-bigaus…
htimko Mar 23, 2022
efb322b
Merge pull request #11 from blond-admin/master
BirkKarlsen Mar 23, 2022
1126763
Merge pull request #208 from BirkKarlsen/master
htimko Mar 23, 2022
157368a
small bug fix
kiliakis Jun 28, 2022
80705de
Update Windows GCC install instructions
kiliakis Sep 7, 2022
62df2e3
Update boost installation instructions
alicevanel Dec 1, 2022
70056f3
Merge pull request #211 from alicevanel/patch-1
kiliakis Dec 1, 2022
e0503fd
New GPU backend based on CuPy (#210)
kiliakis Feb 23, 2023
484cb55
Synchrotron frequency tracker bugfixes: (#216)
Onaumenk Apr 4, 2023
33a6376
Sets up gitlab CI/CD
kiliakis Apr 28, 2023
394b0a8
Merge branch 'gitlab-support' into 'master'
kiliakis Apr 28, 2023
ddda61c
Removes various C++ code warnings
kiliakis May 2, 2023
b840ff9
Merge branch 'fix-compilation-warnings' into 'master'
kiliakis May 2, 2023
771c55d
Fix swap in {fwhm, rms}_multibunch return values
kiliakis May 2, 2023
af2c415
minor modifications to support python3.6
kiliakis May 2, 2023
07da117
Merge branch 'fix-swap-fwhm-rms-multibunch' into 'master'
kiliakis May 2, 2023
77366c8
changes readme format to md
kiliakis May 3, 2023
3f4bb0b
Merge branch 'master' into 'master'
kiliakis May 3, 2023
b49e0ac
fix upload url
kiliakis May 3, 2023
736142d
Merge branch 'python36-support' into 'master'
kiliakis May 4, 2023
673b32d
fix warning in histogram
kiliakis May 9, 2023
cb60411
Automatic Compilation and Upload of BLonD documentation
kiliakis May 9, 2023
bb8c26b
Merge branch 'fix-docs' into 'master'
kiliakis May 9, 2023
a676f77
Merge branch 'fix-warnings' into 'master'
kiliakis May 9, 2023
b181411
adds gpu option in compile step
kiliakis May 9, 2023
540c0d2
Adds badges in Readme top
kiliakis May 9, 2023
de68701
Merge branch 'compile-gpu' into 'master'
kiliakis May 9, 2023
5e8f82c
Merge branch 'kiliakis-master-patch-53863' into 'master'
kiliakis May 9, 2023
c89106b
Adds python-only backend
kiliakis May 23, 2023
98803f2
Merge branch 'python-only' into 'master'
kiliakis May 23, 2023
914ea7c
Removes warning message when library not compiled, improves readme
kiliakis May 23, 2023
9253800
Merge branch 'python-only' into 'master'
kiliakis May 23, 2023
2b584c5
New and improved sanity_check script
kiliakis Jun 5, 2023
0543c13
Merge branch 'sanity-checker' into 'master'
kiliakis Jun 5, 2023
94274de
Adds show_plot argument to Plot class to show plots directly in Conso…
Jun 5, 2023
c5841ea
Merge branch 'PlotsInConsole' into 'master'
kiliakis Jun 5, 2023
ee1789e
No compile setup
kiliakis Jun 5, 2023
8485650
Merge branch 'no-compile-setup' into 'master'
kiliakis Jun 5, 2023
0d76753
adds function that verifies proper installation
kiliakis Jun 5, 2023
6d5c5ac
Merge branch 'add-verify-installation-test' into 'master'
kiliakis Jun 5, 2023
8321247
Merge branch 'master' into 'master'
alasheen Jun 6, 2023
be2de48
Adding a parabolic function in beam generation
alasheen Jun 6, 2023
e456483
Fixing the implementation (if statement)
alasheen Jun 6, 2023
f088ade
Fixing the documentation
alasheen Jun 6, 2023
9c04c66
Added parabolic distribution as comment in EX_01
alasheen Jun 6, 2023
03f4946
Updating Ring docs
alasheen Jun 6, 2023
ebe4dbf
Merge branch 'master' into 'master'
alasheen Jun 6, 2023
ce56959
Fixed matplotlib future warning
Jun 6, 2023
1ccef3c
Merge branch 'matplotlib_warning' into 'master'
kiliakis Jun 6, 2023
f75432c
create directory for .h5 file if not existing
kiliakis Jun 9, 2023
e532564
Added automatic default value for alpha of longitudinal phase space p…
Jun 9, 2023
cbb7d05
Merge branch 'plot_alpha' into 'master'
kiliakis Jun 12, 2023
705c85c
Merge branch 'create-dir-monitor' into 'master'
kiliakis Jun 12, 2023
9bda377
direct slicing enabled by default
kiliakis Jun 12, 2023
09386f9
Merge branch 'direct-slicing-true' into 'master'
kiliakis Jun 12, 2023
83def7a
fixes warning coming from calculate_phi_s in rf_params
kiliakis Jun 12, 2023
dd3e51a
Merge branch 'fix-warning-rf-params' into 'master'
kiliakis Jun 13, 2023
47554f3
Improvements to plot_impedance
Jun 15, 2023
d18d814
Merge branch 'plot_impedance_improvements' into 'master'
kiliakis Jun 15, 2023
e04d7c2
Bumps minimum required python to 3.8
kiliakis Jun 19, 2023
59cc124
Merge branch 'minimum-python-3.8' into 'master'
kiliakis Jun 19, 2023
3cd57c2
tests correct required packages versions
kiliakis Jun 21, 2023
a286e89
Merge branch 'improve-test' into 'master'
kiliakis Jun 21, 2023
4eb451b
Merge fork with latest benchmarked SPS and LHC cavity loops
Oct 24, 2023
d28b2a7
Merge branch 'master' into 'master'
kiliakis Oct 24, 2023
5339943
Numba Computational Backend
kiliakis Nov 16, 2023
6c3615c
Merge branch 'numba' into 'master'
kiliakis Nov 16, 2023
8173ebd
clean up TrackIteration
scpalbright Nov 28, 2023
0e6c7c7
fixed TrackIteration unit tests
scpalbright Dec 4, 2023
93c144c
Merge branch 'master' into 'TrackIteration_cleanup'
scpalbright Dec 4, 2023
99d88a8
Removes commented out variables
kiliakis Dec 5, 2023
5c85f0a
Merge branch 'fix-rf-params-refs' into 'master'
kiliakis Dec 5, 2023
4a3eee5
Removes leftover print statement
kiliakis Dec 6, 2023
c4486ec
Merge branch '16-leftover-debugging-printinout-in-total-voltage' into…
kiliakis Dec 6, 2023
f739da2
Sanitize cpp cuda libraries
kiliakis Jan 18, 2024
38b19bf
Merge branch 'sanitize-cpp-cuda-libraries' into 'master'
kiliakis Jan 18, 2024
f62a27b
Adds random_normal and interp_const_bin functions
kiliakis Jan 18, 2024
34a43b7
includes necessary headers
kiliakis Jan 19, 2024
4aef360
adds unittests for the random normal distribution in C++
kiliakis Jan 26, 2024
0a4f217
adds unittests for interp_const_bin
kiliakis Jan 26, 2024
fd7be9d
fixes unittest for random normal
kiliakis Jan 26, 2024
233bff0
Add doc for random_normal and interp_const_bin
kiliakis Jan 31, 2024
5add4c7
Remove print in random_normal
kiliakis Jan 31, 2024
7f60426
Merge branch 'support_for_ibs' into 'master'
kiliakis Feb 1, 2024
9e27b1d
minor restructure of interpolations
scpalbright Mar 14, 2024
56c4d10
added Akima interpolation
scpalbright Mar 14, 2024
c1e065d
fix wrong bracket
scpalbright Mar 14, 2024
032ff6e
Merge branch 'AkimoInterp' into 'AkimaInterpolation'
scpalbright Mar 14, 2024
71d1150
added missing statement
scpalbright Mar 18, 2024
fbf9eca
Merge branch 'AkimoInterp' into 'AkimaInterpolation'
scpalbright Mar 18, 2024
e9ea253
fixed bad predicate type hint with protocol
scpalbright Mar 18, 2024
847a2f4
explicitly casting track_map to list to ensure it is mutable
scpalbright Mar 20, 2024
7f1f91c
Updated printing for parameter scaling
htimko Apr 22, 2024
3d6a6f0
added base muon parameters
l-thiele May 17, 2024
439af22
changed to Particle initialization
l-thiele May 17, 2024
47b8775
added original version of decay
l-thiele May 17, 2024
c7fc2d2
chanegd to intensity alteration
l-thiele May 17, 2024
b8b95e0
renamed to muplus/minus
l-thiele May 17, 2024
375e6a3
implemented muon mass as global constant
l-thiele May 17, 2024
0843dd8
implemented try except for losses, removed unnecessary brackets
l-thiele May 17, 2024
7160d14
losses decay documentation
l-thiele May 17, 2024
790b827
added type hint in losses decay
l-thiele May 17, 2024
d52bba3
changed multiplication for lifetime from intensity to ratio
l-thiele May 22, 2024
3682bcb
fixed documentaiton
l-thiele May 22, 2024
5c1caac
changed comment to ratio instead of intensity
l-thiele Jun 11, 2024
b4ce826
changed name of decay function to particle_decay
Jun 17, 2024
5297cee
changed life time to decay_rate, included it in the initialisation, a…
Jun 17, 2024
6b75436
adjusted documentation
Jun 17, 2024
0915d3a
corrected error of >0. for decay
Jun 17, 2024
bf3b111
made decay rate optional, removed try/except from particle_decay
Jun 17, 2024
cabaf4b
changed import statement to include encoding informations due to chan…
l-thiele Jun 17, 2024
03fecae
adapted for multiple RF stations
Jun 19, 2024
75775c8
adapted warnings for multiple RF
Jun 19, 2024
af57e30
adapted separatrix function for negative charges
Jun 19, 2024
7194a6e
including simon's minor comments from merge request
Jun 21, 2024
2d109d4
adding missing spaces
Jun 21, 2024
fa2d534
Merge branch 'TrackIteration_cleanup' into 'master'
scpalbright Jun 21, 2024
ed33d11
Merge branch 'AkimaInterpolation' into 'master'
scpalbright Jun 21, 2024
ba3d152
Merge branch '19-incompatabiliy-of-ex_02-with-changes-in-numpy-2-0' i…
Jun 21, 2024
6836882
Merge branch 'master' into MuonParticle
l-thiele Jun 21, 2024
e1726d9
Merge branch 'master' into separatrix_multiRF_negative
Jun 21, 2024
68dcda8
corrected Particle l.538 again
Jun 21, 2024
7445d1c
Merge branch 'MuonParticle' into 'master'
Jun 21, 2024
a3a0c98
Merge branch 'separatrix_multiRF_negative' into 'master'
Jun 21, 2024
433b133
Bugfix/importerror cumptrapz
Oct 7, 2024
c7b081b
Merge branch 'bugfix/importerror-cumptrapz' into 'master'
Oct 7, 2024
cf6712b
GPU simple_kick temporary fix
scpalbright Oct 14, 2024
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
24 changes: 10 additions & 14 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,17 @@ branch = True

# a list of packages or directories, the source to measure during execution.
source =
blond/beam
blond/impedances
blond/input_parameters
blond/llrf
blond/monitors
blond/plots
blond/synchrotron_radiation
blond/trackers
blond/utils
blond/toolbox
blond/

# a list of file name patterns, the files to include in measurement or reporting.
# include =

# a list of file name patterns, the files to leave out of measurement or reporting.
# omit =
# blond/*/*.cpp
# blond/*/*.h

omit =
*.cpp
*.h
*.cu
blond/compile.py
blond/sanity_check.py
blond/gpu/*
blond/utils/butils_wrap_numba.py
Loading