diff --git a/Processes/Sibyll/Interaction.cc b/Processes/Sibyll/Interaction.cc index 26ce8e8248bf1b027043afa34c9f0349e6fffd74..cbbc5e634962a85b6d42ded966dd9a9f28504551 100644 --- a/Processes/Sibyll/Interaction.cc +++ b/Processes/Sibyll/Interaction.cc @@ -95,14 +95,11 @@ namespace corsika::process::sibyll { // read from cross section code table const bool kInteraction = process::sibyll::CanInteract(corsikaBeamId); - const HEPMassType nucleon_mass = - 0.5 * (particles::Proton::GetMass() + particles::Neutron::GetMass()); - // FOR NOW: assume target is at rest MomentumVector pTarget(rootCS, {0_GeV, 0_GeV, 0_GeV}); // total momentum and energy - HEPEnergyType Elab = p.GetEnergy() + nucleon_mass; + HEPEnergyType Elab = p.GetEnergy() + constants::nucleonMass; MomentumVector pTotLab(rootCS, {0_GeV, 0_GeV, 0_GeV}); pTotLab += p.GetMomentum(); pTotLab += pTarget; @@ -201,10 +198,8 @@ namespace corsika::process::sibyll { // define target // for Sibyll is always a single nucleon - auto constexpr nucleon_mass = - 0.5 * (particles::Proton::GetMass() + particles::Neutron::GetMass()); // FOR NOW: target is always at rest - const auto eTargetLab = 0_GeV + nucleon_mass; + const auto eTargetLab = 0_GeV + constants::nucleonMass; const auto pTargetLab = MomentumVector(rootCS, 0_GeV, 0_GeV, 0_GeV); const FourVector PtargLab(eTargetLab, pTargetLab); @@ -223,7 +218,7 @@ namespace corsika::process::sibyll { // define target kinematics in lab frame // define boost to and from CoM frame // CoM frame definition in Sibyll projectile: +z - COMBoost const boost(PprojLab, nucleon_mass); + COMBoost const boost(PprojLab, constants::nucleonMass); // just for show: // boost projecticle diff --git a/Processes/Sibyll/NuclearInteraction.cc b/Processes/Sibyll/NuclearInteraction.cc index af6c1c55e0f7b2af7ebdd1356874d13e27525906..61903da0094654382f05551ba9cf477bfa3ee50a 100644 --- a/Processes/Sibyll/NuclearInteraction.cc +++ b/Processes/Sibyll/NuclearInteraction.cc @@ -213,14 +213,12 @@ namespace corsika::process::sibyll { "projectiles should use NuclearStackExtension!"); // read from cross section code table - const HEPMassType nucleon_mass = - 0.5 * (particles::Proton::GetMass() + particles::Neutron::GetMass()); // FOR NOW: assume target is at rest corsika::stack::MomentumVector pTarget(rootCS, {0.0_GeV, 0.0_GeV, 0.0_GeV}); // total momentum and energy - HEPEnergyType Elab = p.GetEnergy() + nucleon_mass; + HEPEnergyType Elab = p.GetEnergy() + constants::nucleonMass; int const nuclA = p.GetNuclearA(); auto const ElabNuc = p.GetEnergy() / nuclA; @@ -231,7 +229,7 @@ namespace corsika::process::sibyll { // calculate cm. energy const HEPEnergyType ECoM = sqrt( (Elab + pTotLabNorm) * (Elab - pTotLabNorm)); // binomial for numerical accuracy - auto const ECoMNN = sqrt(2. * ElabNuc * nucleon_mass); + auto const ECoMNN = sqrt(2. * ElabNuc * constants::nucleonMass); cout << "NuclearInteraction: LambdaInt: \n" << " input energy: " << Elab / 1_GeV << endl << " input energy CoM: " << ECoM / 1_GeV << endl @@ -363,10 +361,8 @@ namespace corsika::process::sibyll { // define target // always a nucleon - auto constexpr nucleon_mass = - 0.5 * (particles::Proton::GetMass() + particles::Neutron::GetMass()); // target is always at rest - const auto eTargetNucLab = 0_GeV + nucleon_mass; + const auto eTargetNucLab = 0_GeV + constants::nucleonMass; const auto pTargetNucLab = corsika::stack::MomentumVector(rootCS, 0_GeV, 0_GeV, 0_GeV); const FourVector PtargNucLab(eTargetNucLab, pTargetNucLab); @@ -388,7 +384,7 @@ namespace corsika::process::sibyll { } // define boost to NUCLEON-NUCLEON frame - COMBoost const boost(PprojNucLab, nucleon_mass); + COMBoost const boost(PprojNucLab, constants::nucleonMass); // boost projecticle auto const PprojNucCoM = boost.toCoM(PprojNucLab);