Commit 0575460b authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

added Zimm functions to nscatt

parent 4c1e2f7a

pysen/physics/nscatt.py

+13 −0
Original line number Diff line number Diff line
@@ -282,4 +282,17 @@ class RouseModel: 
        u = sqrt(self.omegaR(q)*atleast_1d(t))

        return asarray(rouse_sqt_hiq(u))



def zimm(x):

    """

    Zimm function

    """

    return np.exp(-1.35*x**(2/3))



def zimm_rm(x):

    """

    Zimm/Richter/Monkenbusch

    """

    a = 1.354

    b = 0.85

    return np.exp(-(x/a)**b)

#

setup.py

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ setup( 
        #'scripts/get_proposal.py',

      ],

      install_requires = ['numpy', 'scipy', 'matplotlib', 'pandas', 'h5py' , 'qtconsole'],

      #also requires 'sphinx', 'pytest', 'pylint' 

      #for development and  testing 

      #requires 'sphinx', 'pytest', 'pylint' 'coverage' 

      license = 'BSD 3-Clause License',

      classifiers=[

        "Development Status :: 3 - Alpha",