[pyfai] 02/03: Merge tag 'upstream/0.9.2' into experimental

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch experimental
in repository pyfai.

commit d3b205c47a87347954251cc2ebe81cc8e6b51f71
Merge: e81412c ee0d571
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Thu Jan 16 19:00:18 2014 +0100

    Merge tag 'upstream/0.9.2' into experimental
    
    Upstream version 0.9.2

 CHANGELOG.txt                         |     9 +-
 MANIFEST.in                           |     2 +
 PKG-INFO                              |     2 +-
 README.txt                            |    39 +-
 benchmark/benchmark.py                |    14 +-
 calibration/AgBh.D                    |    10 +
 calibration/Au.D                      |     7 +
 calibration/C14H30O.D                 |    13 +
 calibration/CeO2.D                    |    40 +
 calibration/Cr2O3.D                   |    21 +
 calibration/CrOx.D                    |     8 +
 calibration/LaB6.D                    |    61 +
 calibration/Si.D                      |    11 +
 calibration/alpha_Al2O3.D             |    30 +
 doc/pyFAI.pdf                         |   Bin 728856 -> 1226788 bytes
 doc/source/conf.py                    |     2 +-
 doc/source/man/diff_tomo.rst          |     2 +-
 doc/source/man/pyFAI-average.rst      |     2 +
 doc/source/man/scripts.rst            |     4 +-
 doc/source/project.rst                |    99 +-
 doc/source/pyFAI.rst                  |    12 +-
 gui/integration.ui                    |     4 +-
 pyFAI-src/__init__.py                 |     4 +-
 pyFAI-src/argparse.py                 |  2353 +++
 pyFAI-src/azimuthalIntegrator.py      |   873 +-
 pyFAI-src/calibration.py              |   130 +-
 pyFAI-src/detectors.py                |   309 +-
 pyFAI-src/geometry.py                 |   100 +-
 pyFAI-src/geometryRefinement.py       |     8 +-
 pyFAI-src/integrate_widget.py         |    86 +-
 pyFAI-src/io.py                       |   501 +
 pyFAI-src/ocl_azim.py                 |    17 +-
 pyFAI-src/ocl_azim_lut.py             |    12 +-
 pyFAI-src/opencl.py                   |    48 +-
 pyFAI-src/peakPicker.py               |    11 +-
 pyFAI-src/processor.py                |   254 +
 pyFAI-src/spline.py                   |    99 +-
 pyFAI-src/units.py                    |     4 +-
 pyFAI-src/utils.py                    |   198 +-
 pyFAI-src/worker.py                   |   427 +
 scripts/MX-calibrate                  |    11 +-
 scripts/diff_tomo                     |    24 +-
 scripts/pyFAI-integrate               |    23 +-
 scripts/pyFAI-saxs                    |     2 +-
 scripts/pyFAI-waxs                    |     2 +-
 setup.py                              |    80 +-
 src/_distortion.c                     | 10194 +++++-----
 src/_geometry.c                       |  4937 ++---
 src/bilinear.c                        |  5919 +++---
 src/bilinear.pyx                      |    43 +-
 src/fastcrc.c                         |   978 +-
 src/histogram.c                       |  3096 ++-
 src/{fastcrc.c => marchingsquares_.c} |  2658 ++-
 src/marchingsquares_.pyx              |   113 +
 src/reconstruct.c                     |  5476 +++---
 src/reconstruct.pyx                   |    19 +-
 src/relabel.c                         |  4696 ++---
 src/{reconstruct.c => sparse_csr.c}   |  5836 +++---
 src/sparse_csr.pyx                    |    51 +
 src/splitBBox.c                       |  9074 ++++-----
 src/splitBBox.pyx                     |    74 +-
 src/splitBBoxLUT.c                    | 32922 ++++++++++++++------------------
 src/splitBBoxLUT.pyx                  |   790 +-
 src/splitPixel.c                      |  5727 +++---
 test/testAzimuthalIntegrator.py       |    73 +-
 test/testBilinear.py                  |     4 +-
 test/testDetector.py                  |    81 +
 test/testDistortion.py                |     2 +
 test/testGeometry.py                  |    27 +-
 test/testGeometryRefinement.py        |    29 +-
 test/testHistogram.py                 |     3 +-
 test/testIntegrate.py                 |     9 +-
 test/testMask.py                      |    97 +-
 test/testOpenCL.py                    |    13 +-
 test/testPeakPicking.py               |    32 +-
 test/testUtils.py                     |    21 +-
 test/test_all.py                      |     2 +
 test/testimages/Frelon2k.poni         |     4 +-
 test/testimages/LaB6.poni             |     4 +-
 test/testimages/halfccd.poni          |     4 +-
 test/utilstest.py                     |    83 +-
 81 files changed, 51002 insertions(+), 48057 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfai.git