diff --git a/COAST/ParticleConversion.h b/COAST/ParticleConversion.h index 8c35c0ea75396b84f7b447edffc57540c7fc10f6..ae05551c167894f84ff9d30827f9aa39c32afb52 100644 --- a/COAST/ParticleConversion.h +++ b/COAST/ParticleConversion.h @@ -105,6 +105,7 @@ namespace corsika::coast { Carbon13 = 1306, Nitrogen = 1407, Oxygen = 1608, + Neon21 = 2110, Neon = 2210, Argon = 1838, Iron = 5628, @@ -196,6 +197,7 @@ namespace corsika::coast { {CoastCode::Carbon13, corsika::particles::Code::Carbon13}, {CoastCode::Nitrogen, corsika::particles::Code::Nitrogen}, {CoastCode::Oxygen, corsika::particles::Code::Oxygen}, + {CoastCode::Neon21, corsika::particles::Code::Neon21}, {CoastCode::Neon, corsika::particles::Code::Neon}, {CoastCode::Argon, corsika::particles::Code::Argon}, {CoastCode::Xenon, corsika::particles::Code::Xenon}, diff --git a/Framework/Particles/NuclearData.xml b/Framework/Particles/NuclearData.xml index 69e76393bb9817988cf40d9dbae8beaabe8667a5..1946728336b6193376162279b35360e3d0c9feb5 100644 --- a/Framework/Particles/NuclearData.xml +++ b/Framework/Particles/NuclearData.xml @@ -36,6 +36,9 @@ <particle id="1000080160" name="oxygen" A="16" Z="8" > </particle> +<particle id="1000100220" name="neon21" A="21" Z="10" > +</particle> + <particle id="1000100220" name="neon" A="22" Z="10" > </particle> diff --git a/Framework/Units/PhysicalUnits.h b/Framework/Units/PhysicalUnits.h index 5a2a7b2402daa59c89409db78bba66914e890376..90b98e170f2a912018e1486cac26b7da1c85f3ff 100644 --- a/Framework/Units/PhysicalUnits.h +++ b/Framework/Units/PhysicalUnits.h @@ -114,7 +114,7 @@ namespace corsika::units::si { static_pow<p>(corsika::units::constants::hBar) * static_pow<q>(corsika::units::constants::c); } - + template <typename DimFrom> auto constexpr ConversionFactorSIToHEP() { static_assert(DimFrom::dim4 == 0 && DimFrom::dim5 == 0 && DimFrom::dim6 == 0 && @@ -124,7 +124,7 @@ namespace corsika::units::si { int constexpr l = DimFrom::dim1; // SI length dim. int constexpr m = DimFrom::dim2; // SI mass dim. int constexpr t = DimFrom::dim3; // SI time dim. - + int constexpr p = -m; int constexpr q = m + t; int constexpr e = m - t - l; diff --git a/Framework/Units/testUnits.cc b/Framework/Units/testUnits.cc index b715cc498e404cde1d3771aa2dde8edc0f5dc683..43d8e94e10c5fe6351d1cb5071372eeda24e3ec0 100644 --- a/Framework/Units/testUnits.cc +++ b/Framework/Units/testUnits.cc @@ -153,6 +153,7 @@ TEST_CASE("PhysicalUnits", "[Units]") { REQUIRE(ConvertSIToHEP(6.5823e-25_s) * 1_GeV == Approx(1).epsilon(1e-4)); - REQUIRE(ConvertSIToHEP(3.8938e-32 * meter * meter) * 1_GeV * 1_GeV == Approx(1).epsilon(1e-4)); + REQUIRE(ConvertSIToHEP(3.8938e-32 * meter * meter) * 1_GeV * 1_GeV == + Approx(1).epsilon(1e-4)); } }