From 732dddbab729a51375d60325773badc6e09f943f Mon Sep 17 00:00:00 2001 From: hrocho Date: Wed, 16 Dec 2020 23:00:02 +0100 Subject: [PATCH] improved angular scattering --- calculations.h | 3 ++- catima.cpp | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/calculations.h b/calculations.h index 080212e..5219210 100644 --- a/calculations.h +++ b/calculations.h @@ -100,7 +100,8 @@ namespace catima{ */ double sezi_dedx_e(const Projectile &p, const Material &mat, const Config &c=default_config); - constexpr double Es2_FR =2*PI/fine_structure* electron_mass * electron_mass; + //constexpr double Es2_FR =2*PI/fine_structure* electron_mass * electron_mass; + constexpr double Es2_FR = 198.81; double angular_scattering_power(const Projectile &p, const Target &t, double Es2=Es2_FR); double angular_scattering_power(const Projectile &p, const Material &material, double Es2=Es2_FR); diff --git a/catima.cpp b/catima.cpp index 19994f8..5961d43 100644 --- a/catima.cpp +++ b/catima.cpp @@ -57,11 +57,7 @@ double domega2dx(const Projectile &p, const Material &mat, const Config &c){ return sum; } -double da2dx(const Projectile &p, const Material &mat, const Config &c){ - //double Es2 = Es2_FR; - //if(c.scattering == scattering_types::atima_scattering){ - // Es2 = 198.81; - //} +double da2dx(const Projectile &p, const Material &mat, const Config &c){ const double Es2 = 198.81; return angular_scattering_power(p,mat, Es2); }