Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mott scattering #66

Merged
merged 24 commits into from
Oct 15, 2024
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bfae403
Add files via upload
juniorpena Aug 22, 2022
a1b0c2f
Add files via upload
juniorpena Aug 22, 2022
83ce264
Add files via upload
juniorpena Aug 22, 2022
96f00f5
Add files via upload
juniorpena Aug 22, 2022
70eadb5
Update CMakeLists.txt
juniorpena Aug 22, 2022
86820c7
Update CMakeLists.txt
juniorpena Aug 22, 2022
3c38e14
Update KSIntCalculatorMott.h
juniorpena Aug 22, 2022
9448d42
Update KSIntCalculatorMottBuilder.h
juniorpena May 6, 2024
b52ada7
Update KSIntCalculatorMottBuilder.cxx
juniorpena May 6, 2024
26034d4
Update KSIntCalculatorMott.h
juniorpena May 6, 2024
341c15c
Update KSIntCalculatorMott.cxx
juniorpena May 6, 2024
335814e
Update Interactions.xml
juniorpena May 7, 2024
0865903
Update Kassiopeia/Bindings/Interactions/Include/KSIntCalculatorMottBu…
juniorpena Jun 10, 2024
317fcae
Update KSIntCalculatorMott.cxx
juniorpena Jun 10, 2024
0b8ebc5
Merge branch 'KATRIN-Experiment:main' into mott_scattering
juniorpena Jul 9, 2024
8112166
Update KSIntCalculatorMott.cxx
juniorpena Jul 16, 2024
9d9f668
Update KSIntCalculatorMott.cxx
juniorpena Jul 18, 2024
c66c2f6
Update KSIntCalculatorMott.cxx
juniorpena Sep 12, 2024
58d7ac0
Update KSIntCalculatorMottBuilder.h
juniorpena Sep 12, 2024
c338bf9
Update Kassiopeia/XML/Complete/Interactions.xml
juniorpena Sep 12, 2024
0cf5966
Merge branch 'KATRIN-Experiment:main' into mott_scattering
juniorpena Sep 16, 2024
9e94618
Update KSIntCalculatorMott.cxx
juniorpena Sep 16, 2024
8b42389
Update KSIntCalculatorMott.cxx
juniorpena Sep 19, 2024
937c642
Update KSIntCalculatorMott.cxx
juniorpena Sep 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Kassiopeia/Interactions/Source/KSIntCalculatorMott.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ double KSIntCalculatorMott::GetEnergyLoss(const double& anEnergy, const double&

double amu = 0.0;

if (fNucleus == "He") {
if (fNucleus == "He-4") {
amu = 4.0026; // mass in amu from W.J. Huang et al 2021 Chinese Phys. C 45 030002
} else if (fNucleus == "Ne") {
} else if (fNucleus == "Ne-20") {
amu = 19.9924; // mass in amu from W.J. Huang et al 2021 Chinese Phys. C 45 030002
2xB marked this conversation as resolved.
Show resolved Hide resolved
}

Expand All @@ -143,14 +143,14 @@ std::vector<double> KSIntCalculatorMott::RMott_coeffs(double const E0) {
std::vector<double> a(6, 0.0); // Initialize a with 6 zeros, the last entry is not related to coefficient calculation it is Z for the nucleus of choice
std::vector<std::vector<double>> b(5, std::vector<double>(6));

if (fNucleus == "He") {
if (fNucleus == "He-4") { // independent of mass number, dependent on atomic number (ie. He-3 would have same data as He-4)
2xB marked this conversation as resolved.
Show resolved Hide resolved
a[5] = 2; // Charge Z
b = {{ 1.0 , 3.76476e-8, -3.05313e-7, -3.27422e-7, 2.44235e-6, 4.08754e-6},
{ 2.35767e-2, 3.24642e-2, -6.37269e-4, -7.69160e-4, 5.28004e-3, 9.45642e-3},
{-2.73743e-1, -7.40767e-1, -4.98195e-1, 1.74337e-3, -1.25798e-2, -2.24046e-2},
{-7.79128e-4, -4.14495e-4, -1.62657e-3, -1.37286e-3, 1.04319e-2, 1.83488e-2},
{ 2.02855e-4, 1.94598e-6, 4.30102e-4, 4.32180e-4, -3.31526e-3, -5.81788e-3}};
} else if (fNucleus == "Ne") {
} else if (fNucleus == "Ne-20") { // independent of mass number, dependent on atomic number (ie. Ne-21 would have same data as Ne-20)
a[5] = 10; // Charge Z
b = {{ 9.99997e-1, -1.87404e-7, 3.10276e-5, 5.20000e-5, 2.98132e-4, -5.19259e-4},
{ 1.20783e-1, 1.66407e-1, 1.06608e-2, 6.48772e-3, -1.53031e-3, -7.59354e-2},
Expand Down