[python-xrayutilities] 01/02: Merge tag 'upstream/1.0.4'

[Eugen Wintersberger]

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

eugenwintersberger-guest pushed a commit to branch master
in repository python-xrayutilities.

commit c7bc78b9f6e05978e8293fe91c632f0f0c171ab6
Merge: a39b94f f25b12b
Author: Eugen Wintersberger <eugen.wintersberger at gmail.com>
Date:   Fri Dec 27 11:48:58 2013 +0100

    Merge tag 'upstream/1.0.4'
    
    Upstream version 1.0.4

 CHANGES.txt                                     |  11 +
 PKG-INFO                                        |   2 +-
 doc/source/conf.py                              |   2 +-
 doc/source/xrayutilities.io.rst                 |  24 ++
 setup.py                                        |   5 +-
 xrayutilities.pdf                               | Bin 599218 -> 616301 bytes
 xrayutilities/__init__.py                       |   1 -
 xrayutilities/analysis/sample_align.py          |  93 ++++---
 xrayutilities/experiment.py                     | 106 +------
 xrayutilities/io/__init__.py                    |   8 +
 xrayutilities/io/cbf.py                         | 220 +++++++++++++++
 xrayutilities/io/desy_tty08.py                  | 208 ++++++++++++++
 xrayutilities/io/helper.py                      |  59 ++++
 xrayutilities/io/spec.py                        |  18 +-
 xrayutilities/materials/lattice.py              |  68 +++++
 xrayutilities/materials/predefined_materials.py |   6 +
 xrayutilities/math/__init__.py                  |   2 +
 xrayutilities/math/fit.py                       |  73 +++--
 xrayutilities/math/functions.py                 |  24 +-
 xrayutilities/src/block_average.c               |  31 ++-
 xrayutilities/src/cxrayutilities.c              |  33 ++-
 xrayutilities/src/file_io.c                     | 128 +++++++++
 xrayutilities/src/gridder.h                     |   4 +-
 xrayutilities/src/gridder2d.c                   |  20 +-
 xrayutilities/src/gridder3d.c                   |  13 +-
 xrayutilities/src/gridder_utils.c               |  27 +-
 xrayutilities/src/gridder_utils.h               |  12 +-
 xrayutilities/src/qconversion.c                 | 354 +++++++++++++-----------
 xrayutilities/src/qconversion.h                 |  12 +-
 29 files changed, 1195 insertions(+), 369 deletions(-)

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