Merge branch 'master' into Statistics
Conflicts: src/Algorithms/DistributionMoments.cpp src/PartBunch/PartBunch.hpp src/PartBunch/ParticleContainer.hpp src/Track/TrackRun.cpp
Showing
- .gitignore 6 additions, 0 deletions.gitignore
- input-files/test-0002.in 51 additions, 0 deletionsinput-files/test-0002.in
- input-files/test-0003.in 51 additions, 0 deletionsinput-files/test-0003.in
- src/Algorithms/DistributionMoments.cpp 38 additions, 39 deletionssrc/Algorithms/DistributionMoments.cpp
- src/Algorithms/DistributionMoments.h 7 additions, 1 deletionsrc/Algorithms/DistributionMoments.h
- src/PartBunch/PartBunch.cpp 29 additions, 11 deletionssrc/PartBunch/PartBunch.cpp
- src/PartBunch/PartBunch.hpp 27 additions, 31 deletionssrc/PartBunch/PartBunch.hpp
- src/PartBunch/ParticleContainer.hpp 3 additions, 0 deletionssrc/PartBunch/ParticleContainer.hpp
- src/Track/TrackRun.cpp 6 additions, 6 deletionssrc/Track/TrackRun.cpp
- src/Track/TrackRun.h 2 additions, 4 deletionssrc/Track/TrackRun.h
Loading
Please register or sign in to comment