[med-svn] [pycorrfit] 03/06: Merge tag 'upstream/0.8.6'

[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 624e27bd78fced93bcfe3977bbe29d9a54d33e89
Merge: 7516793 9d1050e
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Wed Mar 18 18:11:07 2015 +0100

    Merge tag 'upstream/0.8.6'
    
    Upstream version 0.8.6

 ChangeLog.txt                                      |  20 +
 MANIFEST.in                                        |  11 +-
 PyCorrFit_doc.pdf                                  | Bin 581216 -> 0 bytes
 README.md                                          |   2 +-
 Readme.txt                                         |   3 +-
 bin/pycorrfit                                      |  20 +-
 {doc-src => doc}/Bibliography.bib                  |   0
 .../Images/PyCorrFit_Screenshot_CSFCS.png          | Bin
 .../Images/PyCorrFit_Screenshot_Main.png           | Bin
 {doc-src => doc}/Images/PyCorrFit_icon.png         | Bin
 {doc-src => doc}/Images/PyCorrFit_icon.svg         |   0
 {doc-src => doc}/Images/PyCorrFit_icon_dark.svg    |   0
 {doc-src => doc}/Images/PyCorrFit_logo.svg         |   0
 {doc-src => doc}/Images/PyCorrFit_logo_dark.pdf    | Bin
 {doc-src => doc}/Images/PyCorrFit_logo_dark.png    | Bin
 {doc-src => doc}/Images/PyCorrFit_logo_dark.svg    |   0
 {doc-src => doc}/PyCorrFit_doc.tex                 |   0
 {doc-src => doc}/PyCorrFit_doc_content.tex         |  14 +-
 {doc-src => doc}/PyCorrFit_doc_models.tex          |   0
 {doc-src => doc}/README.md                         |   2 +-
 .../ExampleFunc_CS_2D+2D+S+T.txt                   |   0
 .../ExampleFunc_CS_3D+S+T.txt                      |   0
 .../ExampleFunc_Exp_correlated_noise.txt           |   0
 .../ExampleFunc_SFCS_1C_2D_Autocorrelation.txt     |   0
 .../ExampleFunc_SFCS_1C_2D_Cross-correlation.txt   |   0
 .../ExampleFunc_TIRF_zOnly.txt                     |   0
 .../Model_AC_3D+T_confocal.txt                     |   0
 .../Model_Flow_AC_3D_confocal.txt                  |   0
 .../Model_Flow_CC_Backward_3D_confocal.txt         |   0
 .../Model_Flow_CC_Forward_3D_confocal.txt          |   0
 .../sample_sessions}/CSFCS_DiO-in-DOPC.pcfs        | Bin
 .../ConfocalFCS_Alexa488_xcorr.pcfs                | Bin
 pycorrfit/PyCorrFit.py                             |  10 +
 {src => pycorrfit}/__init__.py                     |   9 +-
 pycorrfit/__main__.py                              |  34 +
 {src => pycorrfit}/doc.py                          | 103 ++-
 {src => pycorrfit}/edclasses.py                    |   2 +-
 pycorrfit/fcs_data_set.py                          | 739 ++++++++++++++++++
 {src => pycorrfit}/fitting.py                      |   9 +-
 {src => pycorrfit}/frontend.py                     | 713 +++++++++++-------
 {src => pycorrfit}/icon.py                         |   0
 src/PyCorrFit.py => pycorrfit/main.py              | 122 +--
 {src => pycorrfit}/misc.py                         |   4 +-
 {src => pycorrfit}/models/MODEL_TIRF_1C.py         |   0
 {src => pycorrfit}/models/MODEL_TIRF_2D2D.py       |   0
 {src => pycorrfit}/models/MODEL_TIRF_3D2D.py       |   0
 .../models/MODEL_TIRF_3D2Dkin_Ries.py              |   0
 {src => pycorrfit}/models/MODEL_TIRF_3D3D.py       |   0
 .../models/MODEL_TIRF_gaussian_1C.py               |   0
 .../models/MODEL_TIRF_gaussian_3D2D.py             |   0
 .../models/MODEL_TIRF_gaussian_3D3D.py             |   0
 .../models/MODEL_classic_gaussian_2D.py            |   0
 .../models/MODEL_classic_gaussian_3D.py            |   0
 .../models/MODEL_classic_gaussian_3D2D.py          |   0
 {src => pycorrfit}/models/__init__.py              |  33 +-
 pycorrfit/openfile.py                              | 766 +++++++++++++++++++
 {src => pycorrfit}/page.py                         |   8 +-
 {src => pycorrfit}/plotting.py                     |   4 +-
 {src => pycorrfit}/readfiles/__init__.py           |  56 +-
 {src => pycorrfit}/readfiles/read_ASC_ALV.py       |   0
 {src => pycorrfit}/readfiles/read_CSV_PyCorrFit.py |   0
 {src => pycorrfit}/readfiles/read_FCS_Confocor3.py | 191 +++--
 .../readfiles/read_SIN_correlator_com.py           |   0
 {src => pycorrfit}/readfiles/read_mat_ries.py      |   0
 pycorrfit/readfiles/read_pt3_PicoQuant.py          |  95 +++
 pycorrfit/readfiles/read_pt3_scripts/LICENSE       | 340 +++++++++
 pycorrfit/readfiles/read_pt3_scripts/__init__.py   |   0
 .../read_pt3_scripts/correlation_methods.py        | 134 ++++
 .../read_pt3_scripts/correlation_objects.py        | 527 +++++++++++++
 pycorrfit/readfiles/read_pt3_scripts/fib4.pyx      |  60 ++
 .../readfiles/read_pt3_scripts/import_methods.py   | 190 +++++
 {src => pycorrfit}/tools/__init__.py               |  28 +-
 {src => pycorrfit}/tools/average.py                |   4 +-
 {src => pycorrfit}/tools/background.py             |   8 +-
 {src => pycorrfit}/tools/batchcontrol.py           |  45 +-
 {src => pycorrfit}/tools/chooseimport.py           |   6 +-
 {src => pycorrfit}/tools/comment.py                |   0
 {src => pycorrfit}/tools/datarange.py              |   0
 {src => pycorrfit}/tools/example.py                |   0
 {src => pycorrfit}/tools/globalfit.py              |   4 +-
 {src => pycorrfit}/tools/info.py                   |   4 +-
 {src => pycorrfit}/tools/overlaycurves.py          |  28 +-
 {src => pycorrfit}/tools/parmrange.py              |   4 +-
 {src => pycorrfit}/tools/plotexport.py             |   0
 {src => pycorrfit}/tools/simulation.py             |   4 +-
 {src => pycorrfit}/tools/statistics.py             |   4 +-
 {src => pycorrfit}/tools/trace.py                  |   0
 {src => pycorrfit}/usermodel.py                    |   7 +-
 setup.py                                           |  51 +-
 src/openfile.py                                    | 838 ---------------------
 90 files changed, 3833 insertions(+), 1423 deletions(-)

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