Merge branch 'master' into '149-hadronic-interactions-with-pythia8'
# Conflicts: # Documentation/Examples/cascade_example.cc # Processes/Pythia/testPythia.cc
No related branches found
No related tags found
Checking pipeline status
Showing
- CMakeLists.txt 2 additions, 1 deletionCMakeLists.txt
- Documentation/Examples/CMakeLists.txt 2 additions, 0 deletionsDocumentation/Examples/CMakeLists.txt
- Documentation/Examples/cascade_example.cc 22 additions, 17 deletionsDocumentation/Examples/cascade_example.cc
- Environment/CMakeLists.txt 1 addition, 0 deletionsEnvironment/CMakeLists.txt
- Environment/DensityFunction.h 2 additions, 1 deletionEnvironment/DensityFunction.h
- Environment/FlatExponential.h 92 additions, 0 deletionsEnvironment/FlatExponential.h
- Environment/InhomogeneousMedium.h 2 additions, 1 deletionEnvironment/InhomogeneousMedium.h
- Environment/LinearApproximationIntegrator.h 2 additions, 1 deletionEnvironment/LinearApproximationIntegrator.h
- Environment/testEnvironment.cc 68 additions, 10 deletionsEnvironment/testEnvironment.cc
- Framework/Cascade/Cascade.h 10 additions, 5 deletionsFramework/Cascade/Cascade.h
- Framework/Geometry/CMakeLists.txt 6 additions, 0 deletionsFramework/Geometry/CMakeLists.txt
- Framework/Geometry/Trajectory.h 3 additions, 2 deletionsFramework/Geometry/Trajectory.h
- Framework/Geometry/Vector.h 9 additions, 22 deletionsFramework/Geometry/Vector.h
- Framework/Particles/ParticleProperties.h 23 additions, 7 deletionsFramework/Particles/ParticleProperties.h
- Framework/Particles/pdxml_reader.py 2 additions, 2 deletionsFramework/Particles/pdxml_reader.py
- Framework/Particles/testParticles.cc 1 addition, 1 deletionFramework/Particles/testParticles.cc
- Framework/Units/PhysicalUnits.h 3 additions, 1 deletionFramework/Units/PhysicalUnits.h
- Processes/CMakeLists.txt 2 additions, 0 deletionsProcesses/CMakeLists.txt
- Processes/EnergyLoss/CMakeLists.txt 65 additions, 0 deletionsProcesses/EnergyLoss/CMakeLists.txt
- Processes/EnergyLoss/EnergyLoss.cc 222 additions, 0 deletionsProcesses/EnergyLoss/EnergyLoss.cc
Loading
Please register or sign in to comment