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

Merge pull request #84 from hrosiak/gl

global check
This commit is contained in:
Andrej Prochazka 2020-12-17 01:04:27 +01:00 committed by GitHub
commit 1a5e0cd1c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

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);
}
else{
assert("unknown effective charge config");
assert(false);
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){
if(E>2000)
return pz;
else if(E<30.0 || pz<29){
return z_eff_Pierce_Blann(pz, E);
}
else
#ifdef GLOBAL
return global_qmean(pz, tz, E);