diff --git a/Documentation/Examples/cascade_example.cc b/Documentation/Examples/cascade_example.cc index 9191f825c046f41abe582c7cd234664257c5fbed..30f5745457c9349a543f1f7c466b250b3628d51b 100644 --- a/Documentation/Examples/cascade_example.cc +++ b/Documentation/Examples/cascade_example.cc @@ -23,8 +23,6 @@ #include <corsika/cascade/SibStack.h> #include <corsika/process/sibyll/ParticleConversion.h> -#include <corsika/units/PhysicalUnits.h> - #include <corsika/units/PhysicalUnits.h> using namespace corsika; using namespace corsika::process; diff --git a/Framework/Cascade/CMakeLists.txt b/Framework/Cascade/CMakeLists.txt index 723f47b80f07a5d4ed3533fb142ce2b181f74855..8681fae994b1ff91cb8bb1d69f98f5a23da1e50c 100644 --- a/Framework/Cascade/CMakeLists.txt +++ b/Framework/Cascade/CMakeLists.txt @@ -27,7 +27,6 @@ set ( CORSIKAsibyll_SOURCES sibyll2.3c.f gasdev.f -# rndm_dbl.f ) add_library (CORSIKAsibyll STATIC ${CORSIKAsibyll_SOURCES}) diff --git a/Framework/Units/PhysicalConstants.h b/Framework/Units/PhysicalConstants.h index 7add499dd5b000172de38da22074e5427ce36b76..65a98e482f7727af4176ded2c2b84339e6fcdf6e 100644 --- a/Framework/Units/PhysicalConstants.h +++ b/Framework/Units/PhysicalConstants.h @@ -54,6 +54,10 @@ namespace corsika::units::si::constants { // unified atomic mass unit 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. } // namespace corsika::units::si::constants diff --git a/Framework/Units/PhysicalUnits.h b/Framework/Units/PhysicalUnits.h index c157363865e993fafbfd968eda3c79422d181cd0..16b77a5dfda59062bd4c5f77629ffb8055d3710a 100644 --- a/Framework/Units/PhysicalUnits.h +++ b/Framework/Units/PhysicalUnits.h @@ -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 { using namespace phys::units; using namespace phys::units::literals; diff --git a/Processes/Sibyll/code_generator.py b/Processes/Sibyll/code_generator.py index e91c336b070f6f3c3dfae132bdc4d6ca487feff3..77c1f5dd8216ad48ebf5c4aa476ef57695bb7fea 100755 --- a/Processes/Sibyll/code_generator.py +++ b/Processes/Sibyll/code_generator.py @@ -29,7 +29,6 @@ def read_sibyll_codes(filename, pythia_db): if line[0] == '#': continue identifier, sib_code, canInteractFlag, xsType = line.split() -added pid to sibstack try: pythia_db[identifier]["sibyll_code"] = int(sib_code) pythia_db[identifier]["sibyll_canInteract"] = int(canInteractFlag)