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

python module

Browse Source
This commit is contained in:
hrocho 2018-01-21 03:23:33 +01:00
parent 1e61ef9d8f
commit 1846fd625f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calculations.cpp
View File

@ -107,7 +107,6 @@ double bethek_dedx_e(Projectile &p, const Target &t, const Config &c){
//double LS = bethek_lindhard(p); //double LS = bethek_lindhard(p);
LS = precalculated_lindhard(p); LS = precalculated_lindhard(p);
} }
double result = (f2)*barkas + LS - delta/2.; double result = (f2)*barkas + LS - delta/2.;
result *=f1; result *=f1;

4
catima.pyx
View File

@ -485,11 +485,11 @@ def storage_info():
for j in range(data.m.ncomponents()): for j in range(data.m.ncomponents()):
e = data.m.get_element(j) e = data.m.get_element(j)
matter.append([e.A,e.Z,e.stn]) matter.append([e.A,e.Z,e.stn])
res.append({"projectile":[data.p.A,data.p.Z],"matter":matter}) res.append({"projectile":[data.p.A,data.p.Z],"matter":matter, "config":data.config})
return res return res
def catima_info(): def catima_info():
print("CATIMA version = 1.0") print("CATIMA version = 1.1")
print("number of energy points = %g"%max_datapoints) print("number of energy points = %g"%max_datapoints)
print("min energy point = 10^%g MeV/u"%logEmin) print("min energy point = 10^%g MeV/u"%logEmin)
print("max energy point = 10^%g MeV/u"%logEmax) print("max energy point = 10^%g MeV/u"%logEmax)