gwm17/catima
1
0
Fork 0
mirror of https://github.com/gwm17/catima.git synced 2024-11-22 18:28:51 -05:00
Code Issues Projects Releases Wiki Activity

removed unused calc.

Browse Source
This commit is contained in:
hrocho 2021-01-12 21:56:29 +01:00
parent 9b6f2569c4
commit ef0c4af3a5
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
catima.cpp
View File

@ -337,23 +337,12 @@ Result calculate(Projectile p, const Material &t, const Config &c){
} //end of else for non stopped case
// position straggling in material
double rrange = std::min(res.range/t.density(), t.thickness_cm());
auto fx2p = [&](double x)->double{
double e =energy_out(T,x*t.density(),range_spline);
return (rrange-x)*(rrange-x)*da2dx(p(e), t, c)*t.density();
};
res.sigma_x = integrator_adaptive.integrate(fx2p,0, rrange,1e-3,1e-6);
double rrange = std::min(res.range/t.density(), t.thickness_cm());
res.sigma_x = angular_variance(p(T),t,c,2);
res.sigma_x = sqrt(res.sigma_x);
rrange = std::min(res.range/t.density(), t.thickness_cm());
// position vs angle covariance, needed later for final position straggling
auto fx1p = [&](double x)->double{
double e =energy_out(T,x*t.density(),range_spline);
return (rrange-x)*da2dx(p(e), t, c)*t.density();
};
res.cov = integrator.integrate(fx1p,0, rrange);
// position vs angle covariance, needed later for final position straggling
res.cov = angular_variance(p(T),t,c,1);
#ifdef REACTIONS