From e8c79d7b043186537bc9ccebd5907adfedf3e9ef Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Thu, 24 Jan 2019 00:36:26 +0100
Subject: [PATCH] formatting and one more nucleus
---
COAST/ParticleConversion.h | 2 ++
Framework/Particles/NuclearData.xml | 3 +++
Framework/Units/PhysicalUnits.h | 4 ++--
Framework/Units/testUnits.cc | 3 ++-
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/COAST/ParticleConversion.h b/COAST/ParticleConversion.h
index 8c35c0ea7..ae05551c1 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 69e76393b..194672833 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 5a2a7b240..90b98e170 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 b715cc498..43d8e94e1 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));
}
}
--
GitLab