gwm17/catima
1
0
Fork 0
mirror of https://github.com/gwm17/catima.git synced 2025-03-13 13:48:51 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84 from hrosiak/gl

Browse Source 
global check
This commit is contained in:
Andrej Prochazka 2020-12-17 01:04:27 +01:00 committed by GitHub
parent 487dbe4bd8 1a13ed69d3
commit 1a5e0cd1c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calculations.cpp
View File

@ -636,7 +636,7 @@ double z_effective(const Projectile &p,const Target &t, const Config &c){
return z_eff_Schiwietz(p.Z, beta, t.Z); return z_eff_Schiwietz(p.Z, beta, t.Z);
} }
else{ else{
assert("unknown effective charge config"); assert(false);
return 0.0; return 0.0;
} }
} }
@ -720,6 +720,9 @@ double z_eff_Winger(double pz, double beta, double tz){
double z_eff_global(double pz, double E, double tz){ double z_eff_global(double pz, double E, double tz){
if(E>2000) if(E>2000)
return pz; return pz;
else if(E<30.0 || pz<29){
return z_eff_Pierce_Blann(pz, E);
}
else else
#ifdef GLOBAL #ifdef GLOBAL
return global_qmean(pz, tz, E); return global_qmean(pz, tz, E);