Skip to content

Commit

Permalink
Fix kinetic energy definition
Browse files Browse the repository at this point in the history
  • Loading branch information
@austinschneider
austinschneider committed Jan 18, 2025
1 parent a1e56c2 commit 8089587
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions projects/dataclasses/private/InteractionRecord.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ void PrimaryDistributionRecord::UpdateMass() const {
if(energy_set and momentum_set) {
mass = std::sqrt(energy*energy - momentum.at(0)*momentum.at(0) - momentum.at(1)*momentum.at(1) - momentum.at(2)*momentum.at(2));
} else if(energy_set and kinetic_energy_set) {
mass = std::sqrt(energy*energy - kinetic_energy*kinetic_energy);
mass = energy - kinetic_energy;
} else {
throw std::runtime_error("Cannot calculate mass without energy and momentum or energy and kinetic energy!");
}
Expand All @@ -227,7 +227,7 @@ void PrimaryDistributionRecord::UpdateEnergy() const {
if(mass_set and momentum_set) {
energy = std::sqrt(mass*mass + momentum.at(0)*momentum.at(0) + momentum.at(1)*momentum.at(1) + momentum.at(2)*momentum.at(2));
} else if(mass_set and kinetic_energy_set) {
energy = std::sqrt(mass*mass + kinetic_energy*kinetic_energy);
energy = mass + kinetic_energy;
} else {
throw std::runtime_error("Cannot calculate energy without mass and momentum or mass and kinetic energy!");
}
Expand All @@ -237,11 +237,11 @@ void PrimaryDistributionRecord::UpdateKineticEnergy() const {
if(kinetic_energy_set)
return;
if(mass_set and energy_set) {
kinetic_energy = std::sqrt(energy*energy - mass*mass);
} else if(momentum_set) {
kinetic_energy = std::sqrt(momentum.at(0)*momentum.at(0) + momentum.at(1)*momentum.at(1) + momentum.at(2)*momentum.at(2));
kinetic_energy = energy - mass;
} else if(momentum_set and mass_set) {
kinetic_energy = std::sqrt(momentum.at(0)*momentum.at(0) + momentum.at(1)*momentum.at(1) + momentum.at(2)*momentum.at(2) + mass*mass) - mass;
} else {
throw std::runtime_error("Cannot calculate kinetic energy without mass and energy or momentum!");
throw std::runtime_error("Cannot calculate kinetic energy without mass and energy or mass and momentum!");
}
}

Expand All @@ -266,11 +266,11 @@ void PrimaryDistributionRecord::UpdateMomentum() const {
if(energy_set and mass_set and direction_set) {
double magnitude = std::sqrt(energy*energy - mass*mass);
momentum = {magnitude*direction.at(0), magnitude*direction.at(1), magnitude*direction.at(2)};
} else if(kinetic_energy_set and direction_set) {
double magnitude = kinetic_energy;
} else if(mass_set and kinetic_energy_set and direction_set) {
double magnitude = std::sqrt((kinetic_energy + mass) * (kinetic_energy + mass) - mass*mass);
momentum = {magnitude*direction.at(0), magnitude*direction.at(1), magnitude*direction.at(2)};
} else {
throw std::runtime_error("Cannot calculate momentum without energy and mass and direction or kinetic energy and direction!");
throw std::runtime_error("Cannot calculate momentum without energy and mass and direction or mass and kinetic energy and direction!");
}
}

Expand Down Expand Up @@ -499,7 +499,7 @@ void SecondaryParticleRecord::UpdateMass() const {
if(energy_set and momentum_set) {
mass = std::sqrt(energy*energy - momentum.at(0)*momentum.at(0) - momentum.at(1)*momentum.at(1) - momentum.at(2)*momentum.at(2));
} else if(energy_set and kinetic_energy_set) {
mass = std::sqrt(energy*energy - kinetic_energy*kinetic_energy);
mass = energy - kinetic_energy;
} else {
throw std::runtime_error("Cannot calculate mass without energy and momentum or energy and kinetic energy!");
}
Expand All @@ -511,7 +511,7 @@ void SecondaryParticleRecord::UpdateEnergy() const {
if(mass_set and momentum_set) {
energy = std::sqrt(mass*mass + momentum.at(0)*momentum.at(0) + momentum.at(1)*momentum.at(1) + momentum.at(2)*momentum.at(2));
} else if(mass_set and kinetic_energy_set) {
energy = std::sqrt(mass*mass + kinetic_energy*kinetic_energy);
energy = kinetic_energy + mass;
} else {
throw std::runtime_error("Cannot calculate energy without mass and momentum or mass and kinetic energy!");
}
Expand All @@ -522,10 +522,10 @@ void SecondaryParticleRecord::UpdateKineticEnergy() const {
return;
if(mass_set and energy_set) {
kinetic_energy = std::sqrt(energy*energy - mass*mass);
} else if(momentum_set) {
kinetic_energy = std::sqrt(momentum.at(0)*momentum.at(0) + momentum.at(1)*momentum.at(1) + momentum.at(2)*momentum.at(2));
} else if(mass_set and momentum_set) {
kinetic_energy = std::sqrt(momentum.at(0)*momentum.at(0) + momentum.at(1)*momentum.at(1) + momentum.at(2)*momentum.at(2) + mass*mass) - mass;
} else {
throw std::runtime_error("Cannot calculate kinetic energy without mass and energy or momentum!");
throw std::runtime_error("Cannot calculate kinetic energy without mass and energy or mass and momentum!");
}
}

Expand All @@ -546,11 +546,11 @@ void SecondaryParticleRecord::UpdateMomentum() const {
if(energy_set and mass_set and direction_set) {
double magnitude = std::sqrt(energy*energy - mass*mass);
momentum = {magnitude*direction.at(0), magnitude*direction.at(1), magnitude*direction.at(2)};
} else if(kinetic_energy_set and direction_set) {
double magnitude = kinetic_energy;
} else if(mass_set and kinetic_energy_set and direction_set) {
double magnitude = std::sqrt((kinetic_energy + mass) * (kinetic_energy + mass) - mass*mass);
momentum = {magnitude*direction.at(0), magnitude*direction.at(1), magnitude*direction.at(2)};
} else {
throw std::runtime_error("Cannot calculate momentum without energy and mass and direction or kinetic energy and direction!");
throw std::runtime_error("Cannot calculate momentum without energy and mass and direction or mass and kinetic energy and direction!");
}
}

Expand Down

0 comments on commit 8089587

Please sign in to comment.