[med-svn] [pycorrfit] 03/18: Merge tag 'upstream/0.9.8+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 92994381e904e3b7d2b2b9d4193043ed67bd8b9e
Merge: 0ceaeea 3be6b5d
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Fri Jun 24 13:18:38 2016 +0200

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

 ChangeLog.txt                                      |  29 +
 MANIFEST.in                                        |   3 +-
 PKG-INFO                                           |  33 -
 README.md                                          |  28 -
 README.rst                                         |  99 +++
 Readme.txt                                         |  28 -
 doc/PyCorrFit_doc_content.tex                      |   3 +-
 .../CSFCS_DiO-in-DOPC.pcfs.REMOVED.git-id          |   1 -
 pycorrfit/__init__.py                              |  12 +-
 pycorrfit/__main__.py                              |   8 +-
 pycorrfit/correlation.py                           | 550 +++++++++++++
 pycorrfit/{fcs_data_set.py => fit.py}              | 915 +++++----------------
 pycorrfit/gui/__init__.py                          |   0
 pycorrfit/{ => gui}/doc.py                         |  48 +-
 pycorrfit/{ => gui}/edclasses.py                   |   0
 pycorrfit/{ => gui}/frontend.py                    |  57 +-
 pycorrfit/{ => gui}/icon.py                        |   0
 pycorrfit/{ => gui}/main.py                        |   0
 pycorrfit/{ => gui}/misc.py                        |  19 -
 pycorrfit/{ => gui}/page.py                        |  27 +-
 pycorrfit/{ => gui}/plotting.py                    |  29 +-
 pycorrfit/{ => gui}/tools/__init__.py              |   0
 pycorrfit/{ => gui}/tools/average.py               |   4 +-
 pycorrfit/{ => gui}/tools/background.py            |   7 +-
 pycorrfit/{ => gui}/tools/batchcontrol.py          |  24 +-
 pycorrfit/{ => gui}/tools/chooseimport.py          |   2 +-
 pycorrfit/{ => gui}/tools/comment.py               |   0
 pycorrfit/{ => gui}/tools/datarange.py             |   0
 pycorrfit/{ => gui}/tools/example.py               |   0
 pycorrfit/{ => gui}/tools/globalfit.py             |   3 +-
 pycorrfit/{ => gui}/tools/info.py                  |  14 +-
 pycorrfit/{ => gui}/tools/overlaycurves.py         |   0
 pycorrfit/{ => gui}/tools/parmrange.py             |  19 +-
 pycorrfit/{ => gui}/tools/plotexport.py            |   0
 pycorrfit/{ => gui}/tools/simulation.py            |   3 +-
 pycorrfit/{ => gui}/tools/statistics.py            |   3 +-
 pycorrfit/{ => gui}/tools/trace.py                 |   0
 pycorrfit/{ => gui}/usermodel.py                   |   5 +-
 pycorrfit/{ => gui}/wxutils.py                     |   0
 pycorrfit/meta.py                                  |  74 ++
 pycorrfit/models/MODEL_classic_gaussian_2D.py      | 288 -------
 pycorrfit/models/MODEL_classic_gaussian_3D.py      | 302 -------
 pycorrfit/models/MODEL_classic_gaussian_3D2D.py    | 156 ----
 pycorrfit/models/MODEL_classic_gaussian_TT3D3D.py  | 178 ----
 pycorrfit/models/__init__.py                       | 228 +----
 pycorrfit/models/classes.py                        | 155 ++++
 pycorrfit/models/control.py                        | 224 +++++
 pycorrfit/models/cp_confocal.py                    |  15 +
 pycorrfit/models/cp_mix.py                         |  92 +++
 pycorrfit/models/cp_triplet.py                     |  15 +
 pycorrfit/models/model_confocal_2d.py              |  67 ++
 pycorrfit/models/model_confocal_2d_2d.py           | 116 +++
 pycorrfit/models/model_confocal_3d.py              |  77 ++
 pycorrfit/models/model_confocal_3d_2d.py           | 119 +++
 pycorrfit/models/model_confocal_3d_3d.py           | 116 +++
 pycorrfit/models/model_confocal_t_2d.py            |  95 +++
 pycorrfit/models/model_confocal_t_2d_2d.py         | 151 ++++
 pycorrfit/models/model_confocal_t_3d.py            |  97 +++
 pycorrfit/models/model_confocal_t_3d_2d.py         | 159 ++++
 pycorrfit/models/model_confocal_t_3d_3d.py         | 155 ++++
 pycorrfit/models/model_confocal_t_3d_3d_2d.py      | 189 +++++
 pycorrfit/models/model_confocal_t_3d_3d_3d.py      | 190 +++++
 pycorrfit/models/model_confocal_tt_2d_2d.py        | 167 ++++
 pycorrfit/models/model_confocal_tt_3d_2d.py        | 177 ++++
 pycorrfit/models/model_confocal_tt_3d_3d.py        | 176 ++++
 pycorrfit/openfile.py                              |  64 +-
 pycorrfit/readfiles/__init__.py                    |  35 +-
 pycorrfit/trace.py                                 | 109 +++
 setup.cfg                                          |   3 +
 setup.py                                           |  33 +-
 tests/README.md                                    |   8 +-
 tests/data_file_dl.py                              | 175 ++++
 tests/test_constraints.py                          |  98 +++
 tests/test_file_formats.py                         |  41 +
 tests/test_fit_model_gaussian.py                   | 276 ++++++-
 tests/test_fit_models.py                           |  29 +-
 tests/test_global_fit.py                           |   4 +-
 tests/test_simple.py                               |   3 +-
 78 files changed, 4429 insertions(+), 2200 deletions(-)

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