Merge branch 'separateAutophasing'
Conflicts: classic/5.0/src/Algorithms/PartBunch.cpp src/Algorithms/ParallelTTracker.cpp src/Distribution/Distribution.cpp src/Distribution/Distribution.h
Showing
- classic/5.0/src/AbsBeamline/Component.h 3 additions, 1 deletionclassic/5.0/src/AbsBeamline/Component.h
- classic/5.0/src/AbsBeamline/RFCavity.cpp 8 additions, 4 deletionsclassic/5.0/src/AbsBeamline/RFCavity.cpp
- classic/5.0/src/AbsBeamline/TravelingWave.cpp 9 additions, 5 deletionsclassic/5.0/src/AbsBeamline/TravelingWave.cpp
- classic/5.0/src/Algorithms/PartBunch.cpp 1 addition, 1 deletionclassic/5.0/src/Algorithms/PartBunch.cpp
- classic/5.0/src/Algorithms/PartBunch.h 1 addition, 1 deletionclassic/5.0/src/Algorithms/PartBunch.h
- classic/5.0/src/Physics/Physics.cpp 3 additions, 2 deletionsclassic/5.0/src/Physics/Physics.cpp
- classic/5.0/src/Physics/Physics.h 7 additions, 2 deletionsclassic/5.0/src/Physics/Physics.h
- src/Algorithms/AutophaseTracker.cpp 467 additions, 0 deletionssrc/Algorithms/AutophaseTracker.cpp
- src/Algorithms/AutophaseTracker.h 157 additions, 0 deletionssrc/Algorithms/AutophaseTracker.h
- src/Algorithms/CMakeLists.txt 2 additions, 1 deletionsrc/Algorithms/CMakeLists.txt
- src/Algorithms/ParallelSliceTracker.cpp 50 additions, 66 deletionssrc/Algorithms/ParallelSliceTracker.cpp
- src/Algorithms/ParallelSliceTracker.h 4 additions, 7 deletionssrc/Algorithms/ParallelSliceTracker.h
- src/Algorithms/ParallelTTracker.cpp 122 additions, 722 deletionssrc/Algorithms/ParallelTTracker.cpp
- src/Algorithms/ParallelTTracker.h 4 additions, 41 deletionssrc/Algorithms/ParallelTTracker.h
- src/Distribution/Distribution.cpp 5 additions, 1 deletionsrc/Distribution/Distribution.cpp
- src/Distribution/Distribution.h 1 addition, 1 deletionsrc/Distribution/Distribution.h
- src/Elements/OpalBeamline.cpp 5 additions, 2 deletionssrc/Elements/OpalBeamline.cpp
- src/Elements/OpalBeamline.h 16 additions, 16 deletionssrc/Elements/OpalBeamline.h
- src/Track/TrackRun.cpp 63 additions, 3 deletionssrc/Track/TrackRun.cpp
- src/Track/TrackRun.h 2 additions, 1 deletionsrc/Track/TrackRun.h
Loading
Please register or sign in to comment