Loading pysen/config.py +27 −17 Original line number Diff line number Diff line Loading @@ -199,6 +199,30 @@ def get_attenuation(att_pos, wavelength, att_table=None): return att08 + datt*fac def _write_ql_min_max(out, qmin, lmax, dlam): "write out min max lambda, q" ql = qmin*lmax out.write("lmax=%.1f qmin=%.3f\t" % (lmax, qmin)) lave = lmax - dlam/2.0 qave = ql/lave out.write("lave=%.1f qave=%.3f\t" % (lave, qave)) lmin = lmax - dlam qmax = ql/lmin out.write("lmin=%.1f qmax=%.3f\n" % (lmin, qmax)) out.write("\n") def _coverage_check_tau(tau, tlimits, lmax, limits_error=False): tau_min, tau_max = tlimits if tau_min<=tau or tau<=tau_max: return msg = ("tau set outside the bounds %s (%s,%s) for lambda=%s A" % (tau, tau_min, tau_max, lmax)) if limits_error: raise RuntimeError(msg) else: warnings.warn(msg, RuntimeWarning) def coverage(lmax, qmin, **kwargs): "calculate q-tau coverage" Loading Loading @@ -233,14 +257,7 @@ def coverage(lmax, qmin, **kwargs): lq = lmax*qmin out.write("phi=%4.1f tau_range=(%.3f,%.3f)\n" % (degrees(theta), tau_min, tau_max)) out.write("lmax=%.1f qmin=%.3f\t" % (lmax, qmin)) lave = lmax - dlam/2.0 qave = lq/lave out.write("lave=%.1f qave=%.3f\t" % (lave, qave)) lmin = lmax - dlam qmax = lq/lmin out.write("lmin=%.1f qmax=%.3f\n" % (lmin, qmax)) out.write("\n") _write_ql_min_max(out, qmin, lmax, dlam) mintheta, maxtheta = [ radians(_x) for _x in phi_limits(detpos) ] if isnan(theta) or theta < mintheta or maxtheta < theta: Loading @@ -258,14 +275,7 @@ def coverage(lmax, qmin, **kwargs): out.write("q=(%.3f +/-%.3f)\t" % (q, dq)) out.write("lave=%.3f [%d %d]\n" % (lave, it1, it2)) for tau in taus: if tau<tau_min or tau_max<tau: msg = ("tau set outside the bounds %s (%s,%s) for lambda=%s A" % (tau, tau_min, tau_max, lmax)) if limits: raise RuntimeError(msg) else: warnings.warn(msg, RuntimeWarning) _coverage_check_tau(tau, (tau_min, tau_max), lmax, limits_error=limits) out.write("\ttau set=%7.3f" % tau) xtau = tau*(lave/lmax)**3 dt1 = abs(tau*(l1/lmax)**3-xtau) Loading pysen/echo/utils.py +0 −2 Original line number Diff line number Diff line Loading @@ -61,5 +61,3 @@ def calc_sqt(echo, amplitude, idx_up, idx_dn): sqt = np.abs(2*amplitude[0]/updn) sqt_e = np.abs(2*amplitude[1]/updn) return (sqt, sqt_e) pysen/echodet.py +0 −4 Original line number Diff line number Diff line Loading @@ -46,7 +46,3 @@ show_mask ----------------------------------------------------------------- """ pysen/fit.py +1 −0 Original line number Diff line number Diff line Loading @@ -49,6 +49,7 @@ def fit_sqt(q, data, model='diffusion', max_tau=np.inf): def test_fitsqt(): "test fitting" # pylint: disable=locally-disabled, no-member import numpy.random as random import matplotlib.pyplot as plt Loading pysen/io/hdf.py +0 −1 Original line number Diff line number Diff line Loading @@ -128,4 +128,3 @@ class HdfConverter(object): elif key: value = encode(value) subgroup.attrs[subkey] = value Loading
pysen/config.py +27 −17 Original line number Diff line number Diff line Loading @@ -199,6 +199,30 @@ def get_attenuation(att_pos, wavelength, att_table=None): return att08 + datt*fac def _write_ql_min_max(out, qmin, lmax, dlam): "write out min max lambda, q" ql = qmin*lmax out.write("lmax=%.1f qmin=%.3f\t" % (lmax, qmin)) lave = lmax - dlam/2.0 qave = ql/lave out.write("lave=%.1f qave=%.3f\t" % (lave, qave)) lmin = lmax - dlam qmax = ql/lmin out.write("lmin=%.1f qmax=%.3f\n" % (lmin, qmax)) out.write("\n") def _coverage_check_tau(tau, tlimits, lmax, limits_error=False): tau_min, tau_max = tlimits if tau_min<=tau or tau<=tau_max: return msg = ("tau set outside the bounds %s (%s,%s) for lambda=%s A" % (tau, tau_min, tau_max, lmax)) if limits_error: raise RuntimeError(msg) else: warnings.warn(msg, RuntimeWarning) def coverage(lmax, qmin, **kwargs): "calculate q-tau coverage" Loading Loading @@ -233,14 +257,7 @@ def coverage(lmax, qmin, **kwargs): lq = lmax*qmin out.write("phi=%4.1f tau_range=(%.3f,%.3f)\n" % (degrees(theta), tau_min, tau_max)) out.write("lmax=%.1f qmin=%.3f\t" % (lmax, qmin)) lave = lmax - dlam/2.0 qave = lq/lave out.write("lave=%.1f qave=%.3f\t" % (lave, qave)) lmin = lmax - dlam qmax = lq/lmin out.write("lmin=%.1f qmax=%.3f\n" % (lmin, qmax)) out.write("\n") _write_ql_min_max(out, qmin, lmax, dlam) mintheta, maxtheta = [ radians(_x) for _x in phi_limits(detpos) ] if isnan(theta) or theta < mintheta or maxtheta < theta: Loading @@ -258,14 +275,7 @@ def coverage(lmax, qmin, **kwargs): out.write("q=(%.3f +/-%.3f)\t" % (q, dq)) out.write("lave=%.3f [%d %d]\n" % (lave, it1, it2)) for tau in taus: if tau<tau_min or tau_max<tau: msg = ("tau set outside the bounds %s (%s,%s) for lambda=%s A" % (tau, tau_min, tau_max, lmax)) if limits: raise RuntimeError(msg) else: warnings.warn(msg, RuntimeWarning) _coverage_check_tau(tau, (tau_min, tau_max), lmax, limits_error=limits) out.write("\ttau set=%7.3f" % tau) xtau = tau*(lave/lmax)**3 dt1 = abs(tau*(l1/lmax)**3-xtau) Loading
pysen/echo/utils.py +0 −2 Original line number Diff line number Diff line Loading @@ -61,5 +61,3 @@ def calc_sqt(echo, amplitude, idx_up, idx_dn): sqt = np.abs(2*amplitude[0]/updn) sqt_e = np.abs(2*amplitude[1]/updn) return (sqt, sqt_e)
pysen/echodet.py +0 −4 Original line number Diff line number Diff line Loading @@ -46,7 +46,3 @@ show_mask ----------------------------------------------------------------- """
pysen/fit.py +1 −0 Original line number Diff line number Diff line Loading @@ -49,6 +49,7 @@ def fit_sqt(q, data, model='diffusion', max_tau=np.inf): def test_fitsqt(): "test fitting" # pylint: disable=locally-disabled, no-member import numpy.random as random import matplotlib.pyplot as plt Loading
pysen/io/hdf.py +0 −1 Original line number Diff line number Diff line Loading @@ -128,4 +128,3 @@ class HdfConverter(object): elif key: value = encode(value) subgroup.attrs[subkey] = value