[med-svn] [pycorrfit] 02/03: Merge tag 'upstream/0.8.3'

[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 c9d6fd31e571da0a9bed6492dc5ea4f8fb9dd990
Merge: d2899e9 cc4ac82
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Tue Apr 15 10:36:34 2014 +0200

    Merge tag 'upstream/0.8.3'
    
    Upstream version 0.8.3

 ChangeLog.txt                                      |  18 +
 PyCorrFit_doc.pdf                                  | Bin 568711 -> 581216 bytes
 README.md                                          |   4 +-
 Readme.txt                                         |  31 +-
 doc-src/Bibliography.bib                           |  97 +++++-
 doc-src/Images/PyCorrFit_Screenshot_CSFCS.png      | Bin 123086 -> 121034 bytes
 doc-src/Images/PyCorrFit_Screenshot_Main.png       | Bin 89638 -> 90374 bytes
 doc-src/PyCorrFit_doc_content.tex                  |  69 ++--
 doc-src/PyCorrFit_doc_models.tex                   |  10 +-
 doc-src/README.md                                  |  23 ++
 ...C.fcsfit-session.zip => CSFCS_DiO-in-DOPC.pcfs} | Bin 387189 -> 386691 bytes
 ...session.zip => ConfocalFCS_Alexa488_xcorr.pcfs} | Bin 71711 -> 69822 bytes
 src/PyCorrFit.py                                   |  43 ++-
 src/__init__.py                                    |   2 +-
 src/doc.py                                         |  47 ++-
 src/edclasses.py                                   |  24 +-
 src/{leastsquaresfit.py => fitting.py}             | 167 +++++++---
 src/frontend.py                                    | 166 +++++++---
 src/models/MODEL_TIRF_gaussian_1C.py               | 167 +++++++++-
 src/models/MODEL_TIRF_gaussian_3D2D.py             |   9 +-
 src/models/MODEL_TIRF_gaussian_3D3D.py             |  11 +-
 src/models/MODEL_classic_gaussian_2D.py            |  14 +-
 src/models/MODEL_classic_gaussian_3D.py            |  22 +-
 src/models/MODEL_classic_gaussian_3D2D.py          |  19 +-
 src/models/__init__.py                             |  32 +-
 src/openfile.py                                    |  23 +-
 src/page.py                                        | 133 +++++---
 src/plotting.py                                    | 100 ++++--
 src/readfiles/__init__.py                          |  28 +-
 src/readfiles/read_ASC_ALV.py                      | 368 +++++++++++++++++++++
 src/readfiles/read_ASC_ALV_6000.py                 | 177 ----------
 src/readfiles/read_FCS_Confocor3.py                |  41 ++-
 src/tools/__init__.py                              |  17 +
 src/tools/average.py                               |  36 +-
 src/tools/background.py                            |  11 +-
 src/tools/batchcontrol.py                          |  27 +-
 src/tools/datarange.py                             |   4 +-
 src/tools/example.py                               |   9 +-
 src/tools/globalfit.py                             |  11 +-
 src/tools/info.py                                  |  22 +-
 src/tools/overlaycurves.py                         |  35 +-
 src/tools/parmrange.py                             |  11 +-
 src/tools/plotexport.py                            |   9 +-
 src/tools/simulation.py                            |  12 +-
 src/tools/statistics.py                            | 107 +++---
 src/tools/trace.py                                 |  24 +-
 src/usermodel.py                                   |   3 +-
 47 files changed, 1577 insertions(+), 606 deletions(-)

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