fix GenesisElectronDist.twiss() miscalculation#250
Open
mulingLHY wants to merge 1279 commits intoocelot-collab:masterfrom
Open
fix GenesisElectronDist.twiss() miscalculation#250mulingLHY wants to merge 1279 commits intoocelot-collab:masterfrom
mulingLHY wants to merge 1279 commits intoocelot-collab:masterfrom
Conversation
# Conflicts: # ocelot/cpbd/beam.py # ocelot/cpbd/csr.py # ocelot/cpbd/match.py # ocelot/cpbd/track.py # ocelot/gui/accelerator.py
…s loaded from file. removed obsolete method tracking from section track
- ParameterScanner class with MPI and multiprocessing based output. - overwrite progress kwarg in track.track - removed Navigator processes to inactive_processes. - CopyBeam process + parray.copy method. parameter scanner with mpi incl. markers.
fix misprint in nonlinear map "nkick" improves functionality of show_e_beam_slice
…nsertion-methods functions for inserting markers into sequences.
Update Wake-T adaptor
Refactored so file output is in ParameterScanFile, which is also now used for loading the output of a ParameterScan.
Parameter scanner
. when adjusting the number of undulators in the beamline, the number of undulators in generated beamline was always odd (for instance, calling create_fel_lattice with und_N=4 resulted in a lattice with a total of 3 undulators) . fixed initial length check (length of correctors was not taken into account)
… test" This reverts commit 3e9689c.
wake expansion to 3rd order, a few dechirper wake model, unit test
Added label to the tutorial notebook
…otdev current cut-off in G4 plots
…itid function to obtain git commit id of OCELOT installation
…lineNadj EuXFEL lattice generation functions: improvements/bugfixes
…knownelements fix incorrect handling of lattice elements not known to the adaptor for "GENESIS 1.3", v4
…otdev G4 plots: bugfix for plot of evolution of the average electron energy
…nt. Adding physics process might not work correctly.
…e. Fixed. 2. warning about use of 'is not' instead of '!='
# Conflicts: # ocelot/cpbd/beam.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The emit_x is not 'normalized' emit, therefore when calculate alpha and beta, there is no need to multiply by gamma(mean_g)