[med-svn] [pycorrfit] 03/09: Merge tag 'upstream/0.9.1+dfsg'

[Alex Mestiashvili]

This is an automated email from the git hooks/post-receive script.

malex-guest pushed a commit to branch master
in repository pycorrfit.

commit ca9ccc5576a958b9072afbe6480c56596d817f42
Merge: 65c323e 2367df3
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Thu Oct 22 16:31:11 2015 +0200

    Merge tag 'upstream/0.9.1+dfsg'
    
    Upstream version 0.9.1+dfsg

 ChangeLog.txt                                      |   36 +-
 doc/PyCorrFit_doc_content.tex                      |   28 +-
 .../CSFCS_DiO-in-DOPC.pcfs.REMOVED.git-id          |    1 +
 pycorrfit/__init__.py                              |    1 +
 pycorrfit/doc.py                                   |    2 -
 pycorrfit/edclasses.py                             |   34 +-
 pycorrfit/fcs_data_set.py                          | 1218 ++++++++++++++++++++
 pycorrfit/fitting.py                               |  440 -------
 pycorrfit/frontend.py                              |  305 +++--
 pycorrfit/models/MODEL_TIRF_1C.py                  |    2 +-
 pycorrfit/models/MODEL_TIRF_3D2Dkin_Ries.py        |    8 +-
 pycorrfit/models/MODEL_TIRF_gaussian_1C.py         |    4 +-
 pycorrfit/models/MODEL_TIRF_gaussian_3D2D.py       |    4 +-
 pycorrfit/models/MODEL_TIRF_gaussian_3D3D.py       |    2 +-
 pycorrfit/models/MODEL_classic_gaussian_2D.py      |    4 +-
 pycorrfit/models/MODEL_classic_gaussian_3D.py      |    6 +-
 pycorrfit/models/MODEL_classic_gaussian_3D2D.py    |    8 +-
 pycorrfit/models/__init__.py                       |   69 +-
 pycorrfit/openfile.py                              |  118 +-
 pycorrfit/page.py                                  |  921 +++++++--------
 pycorrfit/plotting.py                              |  207 ++--
 pycorrfit/readfiles/read_ASC_ALV.py                |  221 +++-
 pycorrfit/readfiles/read_CSV_PyCorrFit.py          |   65 +-
 pycorrfit/tools/average.py                         |   71 +-
 pycorrfit/tools/background.py                      |  118 +-
 pycorrfit/tools/batchcontrol.py                    |   12 +-
 pycorrfit/tools/comment.py                         |   32 +-
 pycorrfit/tools/datarange.py                       |   57 +-
 pycorrfit/tools/globalfit.py                       |  215 +---
 pycorrfit/tools/info.py                            |  213 ++--
 pycorrfit/tools/overlaycurves.py                   |   58 +-
 pycorrfit/tools/parmrange.py                       |   20 +-
 pycorrfit/tools/statistics.py                      |  261 +++--
 pycorrfit/tools/trace.py                           |   37 +-
 pycorrfit/usermodel.py                             |    6 +-
 setup.py                                           |   22 +-
 tests/README.md                                    |   21 +
 tests/test_fit_models.py                           |  127 ++
 tests/test_global_fit.py                           |   63 +
 tests/test_simple.py                               |   64 +
 40 files changed, 3153 insertions(+), 1948 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/pycorrfit.git