IAP GITLAB

Skip to content
Snippets Groups Projects
Commit 5f867d13 authored by ralfulrich's avatar ralfulrich Committed by Ralf Ulrich
Browse files

fix testStack

parent 652050c6
No related branches found
No related tags found
No related merge requests found
...@@ -187,7 +187,7 @@ TEST_CASE("NuclearStackExtension", "stack") { ...@@ -187,7 +187,7 @@ TEST_CASE("NuclearStackExtension", "stack") {
} }
// invalid copy // invalid copy
{ CHECK_THROWS(s.begin(), s.end() + 1000); } { CHECK_THROWS(s.copy(s.begin(), s.end() + 1000)); }
// swap // swap
{ {
...@@ -235,7 +235,7 @@ TEST_CASE("NuclearStackExtension", "stack") { ...@@ -235,7 +235,7 @@ TEST_CASE("NuclearStackExtension", "stack") {
nuclear_stack::ExtendedParticleInterfaceType> nuclear_stack::ExtendedParticleInterfaceType>
s; s;
// not valid, no A,Z: // not valid, no A,Z (implicit A=Z=0):
CHECK_THROWS(s.addParticle( CHECK_THROWS(s.addParticle(
std::make_tuple(Code::Nucleus, 100_GeV, DirectionVector(dummyCS, {1, 0, 0}), std::make_tuple(Code::Nucleus, 100_GeV, DirectionVector(dummyCS, {1, 0, 0}),
Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s))); Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s)));
...@@ -243,25 +243,25 @@ TEST_CASE("NuclearStackExtension", "stack") { ...@@ -243,25 +243,25 @@ TEST_CASE("NuclearStackExtension", "stack") {
std::make_tuple(Code::Nucleus, MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}), std::make_tuple(Code::Nucleus, MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s))); Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s)));
// not valid: // not valid, non-Code::Nuclei with A and Z
CHECK_THROWS(s.addParticle(std::make_tuple( CHECK_THROWS(s.addParticle(std::make_tuple(
Code::Oxygen, MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}), Code::Oxygen, MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s, 16, 8))); Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s, 20, 10)));
// valid // not valid, non-Code::Nuclei with A and Z
auto particle = s.addParticle( CHECK_THROWS(s.addParticle(std::make_tuple(
std::make_tuple(Code::Nucleus, MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}), Code::Oxygen, 100_GeV, DirectionVector(dummyCS, {0, 0, 1}),
Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s, 10, 9)); Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s, 20, 10)));
// valid, non-Nucleus with explicit A=Z=0 // valid, non-Nucleus with implicit A=Z=0
s.addParticle( s.addParticle(
std::make_tuple(Code::Proton, MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}), std::make_tuple(Code::Proton, MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s, 0, 0)); Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s));
// valid, non-Nucleus with explicit A=Z=0 and Energy // valid, for further use
s.addParticle( auto particle = s.addParticle(
std::make_tuple(Code::Proton, 100_GeV, DirectionVector(dummyCS, {0, 1, 0}), std::make_tuple(Code::Nucleus, MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s, 0, 0)); Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s, 10, 5));
// not valid, Oxygen, but A and Z // not valid, Oxygen, but A and Z
CHECK_THROWS(particle.addSecondary(std::make_tuple( CHECK_THROWS(particle.addSecondary(std::make_tuple(
......
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