diff --git a/calculations.cpp b/calculations.cpp index 1bedd14..5bff0d0 100644 --- a/calculations.cpp +++ b/calculations.cpp @@ -107,7 +107,6 @@ double bethek_dedx_e(Projectile &p, const Target &t, const Config &c){ //double LS = bethek_lindhard(p); LS = precalculated_lindhard(p); } - double result = (f2)*barkas + LS - delta/2.; result *=f1; diff --git a/catima.pyx b/catima.pyx index 73c6d4b..5cc9812 100644 --- a/catima.pyx +++ b/catima.pyx @@ -485,11 +485,11 @@ def storage_info(): for j in range(data.m.ncomponents()): e = data.m.get_element(j) 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 def catima_info(): - print("CATIMA version = 1.0") + print("CATIMA version = 1.1") print("number of energy points = %g"%max_datapoints) print("min energy point = 10^%g MeV/u"%logEmin) print("max energy point = 10^%g MeV/u"%logEmax)