diff --git a/config.h b/config.h index 0f584e3..b4761c6 100644 --- a/config.h +++ b/config.h @@ -59,7 +59,7 @@ namespace catima{ unsigned char z_effective=z_eff_type::pierce_blann; //char z_effective=z_eff_type::atima14; unsigned char dedx = 0; - unsigned char dedx_straggling = omega::atima; + unsigned char dedx_straggling = omega::bohr; #ifdef REACTIONS unsigned char skip=skip_none; #else diff --git a/storage.h b/storage.h index 347392d..6baeba0 100644 --- a/storage.h +++ b/storage.h @@ -61,7 +61,7 @@ namespace catima{ int i = (int)std::floor(lxval/table.step); return i; } - + template double EnergyTable_interpolate(const EnergyTable &table, double xval, double *y){ double r; @@ -88,7 +88,7 @@ namespace catima{ std::size_t num; }; */ - + // return vector with lineary spaced elements from a to b, num is number of elements inline std::vector linspace_vector(double a, double b, unsigned int num){ std::vector res; @@ -102,7 +102,7 @@ inline std::vector linspace_vector(double a, double b, unsigned int num) } return res; } - + class DataPoint{ public: Projectile p; @@ -117,7 +117,7 @@ inline std::vector linspace_vector(double a, double b, unsigned int num) ~DataPoint(); friend bool operator==(const DataPoint &a, const DataPoint &b); }; - + class Data{ public: Data(); @@ -132,7 +132,7 @@ inline std::vector linspace_vector(double a, double b, unsigned int num) std::vector storage; std::vector::iterator index; }; - + /// Interpolation class, to store interpolated values class InterpolatorGSL{ public: @@ -151,7 +151,7 @@ inline std::vector linspace_vector(double a, double b, unsigned int num) gsl_interp_accel *acc; gsl_spline *spline; }; - + #ifdef BUILTIN_SPLINE class Interpolator2{ public: @@ -167,15 +167,15 @@ inline std::vector linspace_vector(double a, double b, unsigned int num) double max=0; spline ss; }; -#endif +#endif extern Data _storage; - + inline DataPoint& get_data(const Projectile &p, const Material &t, const Config &c=default_config){ return _storage.Get(p, t, c); } bool operator==(const DataPoint &a, const DataPoint &b); - + using InterpolatorLinear = InterpolatorGSL; using Interpolator = InterpolatorGSL; }