IAP GITLAB

Skip to content
Snippets Groups Projects
Commit cac9230a authored by ralfulrich's avatar ralfulrich
Browse files

after rebase to master

parents 8af901df 9811a637
No related branches found
No related tags found
No related merge requests found
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#include <corsika/cascade/SibStack.h> #include <corsika/cascade/SibStack.h>
#include <corsika/process/sibyll/ParticleConversion.h> #include <corsika/process/sibyll/ParticleConversion.h>
#include <corsika/units/PhysicalUnits.h>
#include <corsika/units/PhysicalUnits.h> #include <corsika/units/PhysicalUnits.h>
using namespace corsika; using namespace corsika;
using namespace corsika::process; using namespace corsika::process;
......
...@@ -27,7 +27,6 @@ set ( ...@@ -27,7 +27,6 @@ set (
CORSIKAsibyll_SOURCES CORSIKAsibyll_SOURCES
sibyll2.3c.f sibyll2.3c.f
gasdev.f gasdev.f
# rndm_dbl.f
) )
add_library (CORSIKAsibyll STATIC ${CORSIKAsibyll_SOURCES}) add_library (CORSIKAsibyll STATIC ${CORSIKAsibyll_SOURCES})
......
...@@ -54,6 +54,10 @@ namespace corsika::units::si::constants { ...@@ -54,6 +54,10 @@ namespace corsika::units::si::constants {
// unified atomic mass unit // unified atomic mass unit
constexpr quantity<mass_d> u{Rep(1.6605402e-27L) * kilogram}; constexpr quantity<mass_d> u{Rep(1.6605402e-27L) * kilogram};
// barn moved to PhysicalUnits
// constexpr quantity<area_d> barn{Rep(1.e-28L) * meter * meter};
// etc. // etc.
} // namespace corsika::units::si::constants } // namespace corsika::units::si::constants
......
...@@ -26,6 +26,21 @@ namespace phys { ...@@ -26,6 +26,21 @@ namespace phys {
namespace phys {
namespace units {
namespace literals {
QUANTITY_DEFINE_SCALING_LITERALS(meter, length_d,
magnitude(corsika::units::si::constants::meter))
// phys::units::quantity<energy_d/mass_d> Joule2Kg = c2; // 1_Joule / 1_kg;
} // namespace literals
} // namespace units
}
namespace corsika::units::si { namespace corsika::units::si {
using namespace phys::units; using namespace phys::units;
using namespace phys::units::literals; using namespace phys::units::literals;
......
...@@ -29,7 +29,6 @@ def read_sibyll_codes(filename, pythia_db): ...@@ -29,7 +29,6 @@ def read_sibyll_codes(filename, pythia_db):
if line[0] == '#': if line[0] == '#':
continue continue
identifier, sib_code, canInteractFlag, xsType = line.split() identifier, sib_code, canInteractFlag, xsType = line.split()
added pid to sibstack
try: try:
pythia_db[identifier]["sibyll_code"] = int(sib_code) pythia_db[identifier]["sibyll_code"] = int(sib_code)
pythia_db[identifier]["sibyll_canInteract"] = int(canInteractFlag) pythia_db[identifier]["sibyll_canInteract"] = int(canInteractFlag)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment