[python-xrayutilities] 02/03: Merge tag 'upstream/1.2.0'

[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 4aa62138418c4f251bdde379c7a2724a376c6382
Merge: 96389d0 a6a7854
Author: Eugen Wintersberger <eugen.wintersberger at gmail.com>
Date:   Sun Aug 16 16:38:42 2015 +0200

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0

 CHANGES.txt                                        |    12 +
 PKG-INFO                                           |     9 +-
 README.txt                                         |     5 +-
 doc/source/conf.py                                 |     5 +-
 doc/source/examples.rst                            |    17 +-
 doc/source/{examples.rst => examples.rst~}         |    15 +-
 doc/source/index.rst                               |    13 +-
 doc/source/index.rst~                              |   248 -
 doc/source/xrayutilities.io.rst                    |     8 -
 doc/source/xrayutilities.materials.rst             |     8 +
 examples/xrayutilities_math_fitting.py             |     5 +-
 setup.py                                           |     4 +-
 xrayutilities.pdf                                  | 12932 +++++++++----------
 xrayutilities/analysis/sample_align.py             |   291 +-
 xrayutilities/gridder2d.py                         |     2 +-
 xrayutilities/io/__init__.py                       |     6 -
 xrayutilities/io/cbf.py                            |   171 +-
 xrayutilities/io/desy_tty08.py                     |    26 +-
 xrayutilities/io/edf.py                            |    79 +-
 xrayutilities/io/fastscan.py                       |    15 +-
 xrayutilities/io/helper.py                         |    16 +-
 xrayutilities/io/imagereader.py                    |    63 +-
 xrayutilities/io/panalytical_xml.py                |     5 +-
 xrayutilities/io/pdcif.py                          |    65 +-
 xrayutilities/io/radicon.py                        |   298 -
 xrayutilities/io/rotanode_alignment.py             |    16 +-
 xrayutilities/io/seifert.py                        |   129 +-
 xrayutilities/io/spec.py                           |   167 +-
 xrayutilities/io/spectra.py                        |   902 +-
 xrayutilities/materials/__init__.py                |     2 +-
 xrayutilities/materials/_create_database.py        |    45 +-
 xrayutilities/materials/atom.py                    |   102 +
 xrayutilities/materials/data/elements.db           |   Bin 5223396 -> 4514920 bytes
 xrayutilities/materials/database.py                |   481 +-
 xrayutilities/materials/elements.py                |   330 +-
 xrayutilities/materials/lattice.py                 |   108 +-
 xrayutilities/materials/material.py                |    10 +-
 xrayutilities/materials/predefined_materials.py    |     4 +-
 xrayutilities/math/__init__.py                     |     1 +
 xrayutilities/math/fit.py                          |    88 +-
 xrayutilities/normalize.py                         |     2 +-
 xrayutilities/tests/test_HXRD.py                   |    15 +-
 xrayutilities/tests/test_NonCOP.py                 |    15 +-
 xrayutilities/tests/test_blockaverage.py           |     3 +-
 xrayutilities/tests/test_database.py               |    52 +
 xrayutilities/tests/test_functions.py              |    17 +-
 xrayutilities/tests/test_getang.py                 |    51 +
 xrayutilities/tests/test_gridder1d.py              |    21 +-
 xrayutilities/tests/test_gridder2d.py              |    25 +-
 .../{test_gridder2d.py => test_gridder2dlist.py}   |    51 +-
 xrayutilities/tests/test_gridder3d.py              |    29 +-
 xrayutilities/tests/test_io_cbf.py                 |    79 +
 xrayutilities/tests/test_io_edf.py                 |    79 +
 xrayutilities/tests/test_io_esg.py                 |    59 +
 xrayutilities/tests/test_io_fio.py                 |    91 +
 xrayutilities/tests/test_io_nja.py                 |    64 +
 xrayutilities/tests/test_io_nja_map.py             |    58 +
 xrayutilities/tests/test_io_nja_tsk.py             |    60 +
 xrayutilities/tests/test_io_pdcif.py               |    61 +
 xrayutilities/tests/test_io_perkinelmer.py         |    54 +
 xrayutilities/tests/test_io_roperccd.py            |    54 +
 xrayutilities/tests/test_io_spec.py                |    84 +
 xrayutilities/tests/test_io_specalignmentlog.py    |    48 +
 .../tests/{test_NonCOP.py => test_io_speclog.py}   |    41 +-
 xrayutilities/tests/test_io_tty.py                 |    65 +
 xrayutilities/tests/test_io_xrdml.py               |    63 +
 xrayutilities/tests/test_maplog.py                 |    66 +
 xrayutilities/tests/test_npygridder1d.py           |    21 +-
 .../tests/{test_NonCOP.py => test_q2angfit.py}     |    35 +-
 xrayutilities/tests/test_qconversion.py            |    15 +-
 xrayutilities/tests/test_qconversion_area.py       |    25 +-
 xrayutilities/tests/test_qconversion_linear.py     |    21 +-
 xrayutilities/tests/test_qconversion_trans.py      |    36 +-
 xrayutilities/tests/test_structure_factor.py       |    53 +
 xrayutilities/tests/test_transforms.py             |    81 +
 xrayutilities/utilities.py                         |     1 -
 xrayutilities/utilities_noconf.py                  |     8 +-
 77 files changed, 9033 insertions(+), 9273 deletions(-)

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