Merge remote-tracking branch 'origin/proposal_7.2.x' into proposal_7.2.x
# Conflicts: # conanfile.txt
Showing
- conanfile.txt 1 addition, 1 deletionconanfile.txt
- corsika/detail/setup/SetupEnvironment.inl 0 additions, 14 deletionscorsika/detail/setup/SetupEnvironment.inl
- corsika/detail/setup/SetupStack.hpp 74 additions, 57 deletionscorsika/detail/setup/SetupStack.hpp
- corsika/detail/setup/SetupStack.inl 0 additions, 7 deletionscorsika/detail/setup/SetupStack.inl
- corsika/setup/SetupEnvironment.hpp 0 additions, 28 deletionscorsika/setup/SetupEnvironment.hpp
- corsika/setup/SetupStack.hpp 6 additions, 3 deletionscorsika/setup/SetupStack.hpp
- examples/boundary_example.cpp 5 additions, 5 deletionsexamples/boundary_example.cpp
- examples/cascade_example.cpp 9 additions, 10 deletionsexamples/cascade_example.cpp
- examples/cascade_proton_example.cpp 6 additions, 6 deletionsexamples/cascade_proton_example.cpp
- examples/corsika.cpp 7 additions, 5 deletionsexamples/corsika.cpp
- examples/em_shower.cpp 4 additions, 3 deletionsexamples/em_shower.cpp
- examples/hybrid_MC.cpp 5 additions, 4 deletionsexamples/hybrid_MC.cpp
- examples/mars.cpp 11 additions, 9 deletionsexamples/mars.cpp
- examples/particle_list_example.cpp 0 additions, 1 deletionexamples/particle_list_example.cpp
- examples/stopping_power.cpp 1 addition, 1 deletionexamples/stopping_power.cpp
- examples/vertical_EAS.cpp 7 additions, 5 deletionsexamples/vertical_EAS.cpp
- python/corsika/io/outputs/__init__.py 2 additions, 0 deletionspython/corsika/io/outputs/__init__.py
- python/corsika/io/outputs/energy_loss.py 87 additions, 0 deletionspython/corsika/io/outputs/energy_loss.py
- tests/common/SetupTestEnvironment.hpp 4 additions, 1 deletiontests/common/SetupTestEnvironment.hpp
- tests/common/TestStack.hpp 4 additions, 2 deletionstests/common/TestStack.hpp
Loading
Please register or sign in to comment