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

[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 96c6396ae19b93cc3e6f438719bb8cd3dc6339c2
Merge: 141289c 5ce1c0b
Author: Eugen Wintersberger <eugen.wintersberger at gmail.com>
Date:   Thu Jan 22 13:01:00 2015 +0100

    Merge tag 'upstream/1.1.1'
    
    Upstream version 1.1.1

 CHANGES.txt                                        |    17 +
 PKG-INFO                                           |    16 +-
 README.txt                                         |    14 +-
 doc/source/conf.py                                 |     4 +-
 examples/xrayutilities_math_fitting.py             |    30 +
 examples/xrayutilities_read_spec.py                |     1 -
 setup.py                                           |     2 +-
 xrayutilities.pdf                                  | 10720 ++++++++++---------
 xrayutilities/__init__.py                          |     1 +
 xrayutilities/analysis/line_cuts.py                |    10 +-
 xrayutilities/analysis/sample_align.py             |    50 +-
 xrayutilities/experiment.py                        |   195 +-
 xrayutilities/gridder.py                           |    56 +-
 xrayutilities/gridder2d.py                         |     2 +-
 xrayutilities/gridder3d.py                         |     2 +-
 xrayutilities/io/__init__.py                       |     2 +
 xrayutilities/io/edf.py                            |   465 +-
 xrayutilities/io/helper.py                         |    46 +
 xrayutilities/io/panalytical_xml.py                |    67 +-
 xrayutilities/io/rotanode_alignment.py             |     5 +-
 xrayutilities/io/spec.py                           |  1070 +-
 xrayutilities/materials/__init__.py                |     2 +
 xrayutilities/materials/cif.py                     |    19 +-
 xrayutilities/materials/data/Al2O3.cif             |   151 +-
 xrayutilities/materials/data/README.txt            |    13 +-
 xrayutilities/materials/data/README.txt~           |    13 +
 xrayutilities/materials/lattice.py                 |     3 +
 xrayutilities/materials/material.py                |    94 +-
 xrayutilities/materials/predefined_materials.py    |    63 +-
 xrayutilities/math/__init__.py                     |     1 +
 xrayutilities/math/fit.py                          |   104 +-
 xrayutilities/math/functions.py                    |    82 +-
 xrayutilities/math/vector.py                       |     1 +
 xrayutilities/q2ang_fit.py                         |     5 +-
 xrayutilities/src/block_average.c                  |     6 +-
 xrayutilities/src/cxrayutilities.c                 |   244 +-
 xrayutilities/src/gridder.h                        |    30 +
 xrayutilities/src/gridder1d.c                      |   166 +-
 xrayutilities/src/gridder2d.c                      |     4 +-
 xrayutilities/src/gridder3d.c                      |     2 +-
 xrayutilities/src/qconversion.c                    |  1867 +++-
 xrayutilities/src/qconversion.h                    |    23 +-
 .../src/{qconversion.h => qconversion.h~}          |    23 +-
 xrayutilities/src/xrayutilities.h                  |    11 +-
 xrayutilities/tests/test_blockaverage.py           |     7 +-
 xrayutilities/tests/test_functions.py              |    12 +-
 xrayutilities/tests/test_qconversion.py            |    11 +
 xrayutilities/tests/test_qconversion_area.py       |    19 +-
 xrayutilities/tests/test_qconversion_linear.py     |    14 +-
 xrayutilities/tests/test_qconversion_trans.py      |   115 +
 xrayutilities/xrayutilities_default.conf           |     2 +-
 51 files changed, 9229 insertions(+), 6653 deletions(-)

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