IAP GITLAB

Skip to content
Snippets Groups Projects
Commit abf8a196 authored by Felix Riehn's avatar Felix Riehn Committed by ralfulrich
Browse files

avoid warnings

parent a932b6c6
No related branches found
No related tags found
No related merge requests found
...@@ -63,7 +63,7 @@ namespace corsika::epos { ...@@ -63,7 +63,7 @@ namespace corsika::epos {
} }
inline bool Interaction::isValidTarget(Code const TargetId) const { inline bool Interaction::isValidTarget(Code const TargetId) const {
if (is_nucleus(TargetId)) if (is_nucleus(TargetId)) {
if (TargetId == Code::Nucleus) { if (TargetId == Code::Nucleus) {
// nuclearExtension for projectiles only // nuclearExtension for projectiles only
CORSIKA_LOGGER_WARN(logger_, CORSIKA_LOGGER_WARN(logger_,
...@@ -75,7 +75,9 @@ namespace corsika::epos { ...@@ -75,7 +75,9 @@ namespace corsika::epos {
} else { } else {
return (get_nucleus_Z(TargetId) < maxTargetMassNumber_ ? true : false); return (get_nucleus_Z(TargetId) < maxTargetMassNumber_ ? true : false);
} }
return false; } else {
return false;
}
} }
inline void Interaction::initialize_eposlhc_c7() const { inline void Interaction::initialize_eposlhc_c7() const {
...@@ -532,7 +534,11 @@ namespace corsika::epos { ...@@ -532,7 +534,11 @@ namespace corsika::epos {
::epos::afinal_(); ::epos::afinal_();
if (epos_listing_) ::epos::alistf_("EPOSLHC&"); if (epos_listing_) {
//std::string nam = "EPOSLHC&";
char nam[9] = "EPOSLHC&";
::epos::alistf_(nam);
}
// NSTORE-part // NSTORE-part
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#pragma once #pragma once
#include <corsika/framework/core/ParticleProperties.hpp> #include <corsika/framework/core/ParticleProperties.hpp>
#include <epos.hpp> #include <epos.hpp>
namespace corsika::epos { namespace corsika::epos {
...@@ -26,4 +25,15 @@ namespace corsika::epos { ...@@ -26,4 +25,15 @@ namespace corsika::epos {
return sqrt(mass2) * 1_GeV; return sqrt(mass2) * 1_GeV;
} }
} }
inline PDGCode getEposPDGId(Code const p) {
if (!is_nucleus(p)) {
int eid = corsika::epos::convertToEposRaw(p);
char nxs[4] = "nxs";
char pdg[4] = "pdg";
return static_cast<PDGCode>(::epos::idtrafo_(nxs, pdg, eid));
} else {
throw std::runtime_error("Epos id conversion not implemented for nuclei!");
}
}
} // namespace corsika::epos } // namespace corsika::epos
...@@ -62,6 +62,8 @@ namespace corsika::epos { ...@@ -62,6 +62,8 @@ namespace corsika::epos {
HEPMassType getEposMass(corsika::Code const); HEPMassType getEposMass(corsika::Code const);
PDGCode getEposPDGId(corsika::Code const);
} // namespace corsika::epos } // namespace corsika::epos
#include <corsika/detail/modules/epos/ParticleConversion.inl> #include <corsika/detail/modules/epos/ParticleConversion.inl>
...@@ -82,11 +82,9 @@ TEST_CASE("Epos", "[processes]") { ...@@ -82,11 +82,9 @@ TEST_CASE("Epos", "[processes]") {
if (!is_nucleus(p)) { if (!is_nucleus(p)) {
int eid = corsika::epos::convertToEposRaw(p); int eid = corsika::epos::convertToEposRaw(p);
if (eid == 0 && p != Code::Unknown) if (eid == 0 && p != Code::Unknown)
CHECK_FALSE(p == convert_from_PDG(static_cast<PDGCode>( CHECK_FALSE(p == convert_from_PDG(getEposPDGId(p)));
::epos::idtrafo_("nxs", "pdg", eid))));
else else
CHECK(p == convert_from_PDG( CHECK(p == convert_from_PDG(getEposPDGId(p)));
static_cast<PDGCode>(::epos::idtrafo_("nxs", "pdg", eid))));
} }
} }
} }
......
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