Commit 728b7f9a authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

updated ChangeLog, extra params to plot_q

parent f5001ef3

ChangeLog

+3 −0
Original line number Diff line number Diff line 
* version 1.1.2 (Aug 31, 2020)

- [PZ] added plot q command



* version 1.1.1 (Jun 25, 2020)

- [PZ] updated default parameters

python/drspine/drspine.py

+8 −4
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ def plot_sqt(filename, **kwargs): 
    summary = kwargs.pop('show_summary', False)

    save    = kwargs.pop('save', False)

    mpars   = kwargs.pop('model_pars', {} )   # model parameters

    fmt     = kwargs.pop('fmt','s')



    result = read_datreat(filename)
@@ -195,7 +196,7 @@ def plot_sqt(filename, **kwargs): 
        sqt  = sdat[:,1]

        dtau = abs(sdat[:,3]) if xerr else None

        dsqt = abs(sdat[:,2])

        p = plt.errorbar(tau, sqt, xerr=dtau, yerr=dsqt, fmt='s', label=label)

        p = plt.errorbar(tau, sqt, xerr=dtau, yerr=dsqt, fmt=fmt, label=label)

        color=p[0].get_color()

        if (model):

            try:
@@ -241,7 +242,7 @@ def plot_sqt(filename, **kwargs): 
            plt.xscale('log')

            plt.yscale('log')



        plt.errorbar(q, par0, yerr=dpar0, xerr=dq, fmt='s--')

        plt.errorbar(q, par0, yerr=dpar0, xerr=dq, fmt=fmt+'--')



        plt.xlabel(r'$Q \; [\AA^{-1}]$')

        #plt.legend(loc='best')
@@ -327,10 +328,13 @@ def plot_chi2(filename, chimax=100.0, nbins=101, ndf=19, full_bw=True): 
    plt.legend(loc='best')





def plot_q(filename, bins=41,  full_bw=False):

def plot_q(filename, full_bw=False, **kwargs):

    d = _load_sqt_bin(filename, full_bw)



    plt.hist(d[:,4], weights=d[:,11], bins=bins, histtype='step')

    bins     = kwargs.pop('bins', 41)

    histtype = kwargs.pop('histtype', 'step')



    plt.hist(d[:,4], weights=d[:,11], bins=bins, histtype=histtype, **kwargs)

    plt.grid(True, which='both')

    plt.xlabel(r'Q [$\AA$]')

    plt.ylabel('Intensity (arb)')