[pyfai] 04/10: Merge tag 'upstream/0.11.0+dfsg'
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Jul 24 12:10:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository pyfai.
commit 62bbead02f623c1fb20d2660c121df92cba7a2b7
Merge: f0c1132 7636a93
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Fri Jul 24 10:17:46 2015 +0200
Merge tag 'upstream/0.11.0+dfsg'
Upstream version 0.11.0+dfsg
CHANGELOG.txt | 102 +-
MANIFEST.in | 59 +-
PKG-INFO | 24 +-
README.txt | 28 +-
TODO.txt | 13 +-
benchmark/benchmark.py | 41 +-
build-deb.sh | 20 +-
calibration/AgBh.D | 62 +-
calibration/Al.D | 8 +
calibration/Au.D | 37 +-
calibration/C14H30O.D | 40 +-
calibration/CeO2.D | 85 +-
calibration/Cr2O3.D | 45 +-
calibration/CrOx.D | 3 +
calibration/CuO.D | 9 +
calibration/LaB6.D | 156 +-
calibration/LaB6_SRM660a.D | 94 +
calibration/LaB6_SRM660b.D | 94 +
calibration/LaB6_SRM660c.D | 94 +
calibration/NaCl.D | 38 +-
calibration/Ni.D | 8 +
calibration/PBBA.D | 24 +-
calibration/Si.D | 34 +-
calibration/Si_SRM640.D | 18 +
calibration/Si_SRM640a.D | 18 +
calibration/Si_SRM640b.D | 18 +
calibration/Si_SRM640c.D | 18 +
calibration/Si_SRM640d.D | 18 +
calibration/Si_SRM640e.D | 18 +
calibration/TiO2.D | 28 +
calibration/ZnO.D | 20 +
calibration/alpha_Al2O3.D | 66 +-
calibration/cristobaltite.D | 31 +
calibration/quartz.D | 22 +
doc/MX-calibrate.1 | 24 +-
doc/MX-calibrate.pdf | Bin 7268 -> 7386 bytes
doc/check_calib.1 | 18 +-
doc/check_calib.pdf | Bin 4435 -> 4188 bytes
doc/detector2nexus.1 | 8 +-
doc/detector2nexus.pdf | Bin 4273 -> 4266 bytes
doc/diff_tomo.1 | 11 +-
doc/diff_tomo.pdf | Bin 4990 -> 5773 bytes
doc/drawMask_pymca.1 | 8 +-
doc/drawMask_pymca.pdf | Bin 3989 -> 4019 bytes
doc/eiger-mask.1 | 13 +
doc/eiger-mask.pdf | Bin 0 -> 3182 bytes
doc/pyFAI-average.1 | 13 +-
doc/pyFAI-average.pdf | Bin 4479 -> 4593 bytes
doc/pyFAI-calib.1 | 35 +-
doc/pyFAI-calib.pdf | Bin 8635 -> 9023 bytes
doc/pyFAI-integrate.1 | 10 +-
doc/pyFAI-integrate.pdf | Bin 4551 -> 4483 bytes
doc/pyFAI-recalib.1 | 48 +-
doc/pyFAI-recalib.pdf | Bin 9054 -> 9362 bytes
doc/pyFAI-saxs.1 | 6 +-
doc/pyFAI-saxs.pdf | Bin 4728 -> 4728 bytes
doc/pyFAI-waxs.1 | 8 +-
doc/pyFAI-waxs.pdf | Bin 5667 -> 5657 bytes
doc/pyFAI.pdf | Bin 1062868 -> 1478137 bytes
doc/refine_wavelength.1 | 10 -
doc/refine_wavelength.pdf | Bin 3586 -> 0 bytes
doc/source/calibration.rst | 119 +-
doc/source/changelog.rst | 178 +
doc/source/conf.py | 112 +-
doc/source/design/ai.rst | 154 +
doc/source/design/index.rst | 17 +
doc/source/detector.rst | 84 +
doc/source/ecosystem.rst | 146 +
doc/source/geometry.rst | 101 +
doc/source/img/PONI.png | Bin 0 -> 37820 bytes
doc/source/index.rst | 36 +-
doc/source/man/MX-calibrate.rst | 84 +-
doc/source/man/check_calib.rst | 34 +-
doc/source/man/detector2nexus.rst | 45 +
doc/source/man/diff_tomo.rst | 49 +-
doc/source/man/drawMask_pymca.rst | 3 +
doc/source/man/pyFAI-average.rst | 31 +-
doc/source/man/pyFAI-calib.rst | 123 +-
doc/source/man/pyFAI-integrate.rst | 9 +-
doc/source/man/pyFAI-recalib.rst | 122 +-
doc/source/man/pyFAI-saxs.rst | 8 +-
doc/source/man/pyFAI-waxs.rst | 17 +-
doc/source/man/scripts.rst | 3 +-
doc/source/operations/index.rst | 106 +
doc/source/operations/linux.rst | 39 +
doc/source/operations/macosx.rst | 61 +
doc/source/operations/windows.rst | 136 +
doc/source/project.rst | 104 +-
doc/source/pyFAI.rst | 28 +-
doc/source/usage/cookbook/calibrate.rst | 73 +
doc/source/usage/cookbook/index.rst | 16 +
.../usage/cookbook/integration_with_python.rst | 1 +
.../usage/cookbook/integration_with_scripts.rst | 1 +
.../usage/cookbook/integration_with_the_gui.rst | 76 +
doc/source/usage/tutorial/index.rst | 2 +
openCL/bitonic.cl | 529 +
openCL/bsort.cl | 261 +
openCL/for_eclipse.h | 22 +
openCL/ocl_azim_CSR.cl | 100 +-
openCL/ocl_azim_LUT.cl | 2 +
openCL/ocl_azim_kernel2d_2.cl | 3 +
openCL/ocl_azim_kernel_2.cl | 9 +-
openCL/ocl_bispev.cl | 3 +
openCL/ocl_hist_pixelsplit.cl | 4 +-
openCL/{ocl_hist_pixelsplit.cl => ocl_lut.cl} | 283 +-
openCL/ocl_lut_pixelsplit.cl | 34 +-
openCL/ocl_lut_pixelsplit2.cl | 3 +-
openCL/ocl_lut_pixelsplit3.cl | 4 +-
openCL/ocl_lut_pixelsplit_test.cl | 4 +-
openCL/preprocess.cl | 2 +
openCL/reduction_test.cl | 4 +
openCL/reduction_test4.cl | 2 +
pyFAI-src/OCLFullSplit.py | 364 +
pyFAI-src/OCLFullSplit1D_template.py | 146 +
pyFAI-src/__init__.py | 12 +-
pyFAI-src/_version.py | 74 +
pyFAI-src/argparse.py | 2353 --
pyFAI-src/azimuthalIntegrator.py | 520 +-
pyFAI-src/blob_detection.py | 47 +-
pyFAI-src/calibrant.py | 296 +-
pyFAI-src/calibration.py | 847 +-
pyFAI-src/detectors.py | 932 +-
pyFAI-src/directories.py | 39 +-
pyFAI-src/distortion.py | 144 +-
pyFAI-src/geometry.py | 227 +-
pyFAI-src/geometryRefinement.py | 167 +-
pyFAI-src/grid.py | 92 +
pyFAI-src/gui_utils.py | 3 +-
pyFAI-src/integrate_widget.py | 197 +-
pyFAI-src/io.py | 98 +-
pyFAI-src/massif.py | 34 +-
pyFAI-src/multi_geometry.py | 176 +
pyFAI-src/ocl_azim_csr.py | 72 +-
pyFAI-src/ocl_azim_csr_dis.py | 9 +-
pyFAI-src/ocl_azim_lut.py | 53 +-
pyFAI-src/ocl_hist_pixelsplit.py | 6 +-
pyFAI-src/opencl.py | 43 +-
pyFAI-src/peak_picker.py | 230 +-
pyFAI-src/refinment2D.py | 6 +-
pyFAI-src/spline.py | 120 +-
pyFAI-src/units.py | 33 +-
pyFAI-src/utils.py | 349 +-
pyFAI-src/worker.py | 125 +-
pyFAI.egg-info/PKG-INFO | 28 +
pyFAI.egg-info/SOURCES.txt | 323 +
pyFAI.egg-info/dependency_links.txt | 1 +
pyFAI.egg-info/top_level.txt | 23 +
scripts/check_calib | 14 +-
scripts/detector2nexus | 6 +-
scripts/diff_tomo | 241 +-
scripts/drawMask_pymca | 8 +-
scripts/eiger-mask | 75 +
scripts/pyFAI-average | 26 +-
scripts/pyFAI-calib | 2 +-
scripts/pyFAI-integrate | 25 +-
scripts/pyFAI-saxs | 35 +-
scripts/pyFAI-waxs | 42 +-
setup.cfg | 13 +-
setup.py | 320 +-
src/_bispev.c | 12533 +++----
src/_bispev.pyx | 129 +-
src/_blob.c | 12928 +++----
src/_convolution.c | 11499 ++++---
src/_distortion.c | 28142 ++++++++-------
src/_distortion.pyx | 96 +-
src/_distortionCSR.c | 18959 ++++++-----
src/_distortionCSR.pyx | 2 +-
src/_geometry.c | 15316 +++++----
src/_geometry.pyx | 294 +-
src/bilinear.c | 24405 ++++++-------
src/bilinear.pxi | 199 +
src/bilinear.pyx | 307 +-
src/fastcrc.c | 3525 +-
src/histogram.c | 1386 +-
src/histogram.pyx | 241 +-
src/histogram_nomp.c | 21067 ------------
src/{histogram_nomp.pyx => histogram_nomp.pxi} | 31 +-
src/histogram_omp.c | 21652 ------------
src/{histogram_omp.pyx => histogram_omp.pxi} | 32 +-
src/marchingsquares.c | 13114 +++----
src/morphology.c | 11023 +++---
src/numpy_common.pxi | 11 +
src/paraSplitBBox.pyx | 36 +-
src/reconstruct.c | 11071 +++---
src/regrid_common.pxi | 58 +
src/relabel.c | 11300 +++---
src/sparse_csr.c | 11213 +++---
src/splitBBox.c | 17041 ++++-----
src/splitBBox.pyx | 78 +-
src/splitBBoxCSR.c | 6310 ++--
src/splitBBoxCSR.pyx | 139 +-
src/splitBBoxLUT.c | 27490 ++++++++-------
src/splitBBoxLUT.pyx | 151 +-
src/splitBBoxLUT_vector.c | 23845 +++++++------
src/splitBBoxLUT_vector.pyx | 118 +-
src/splitPixel.c | 17807 +++++-----
src/splitPixel.pyx | 123 +-
src/splitPixelFull.c | 22465 +++++++-----
src/splitPixelFull.pyx | 565 +-
src/splitPixelFullCSR.c | 15578 +++++++--
src/splitPixelFullCSR.pyx | 1468 +-
src/splitPixelFullLUT.c | 26194 +++++++++-----
src/splitPixelFullLUT.pyx | 1017 +-
src/splitPixelFullLUT_b.c | 16715 ++++-----
src/splitPixelFullLUT_b.pyx | 105 +-
src/splitPixelFullLUT_double.c | 18739 +++++-----
src/splitPixelFullLUT_double.pyx | 274 +-
src/splitPixelFullLUT_float32_b.c | 16800 ++++-----
src/splitPixelFullLUT_float32_b.pyx | 130 +-
src/watershed.c | 34116 +++++++++++++++++++
src/watershed.pyx | 576 +
src/xutils.c | 4859 ++-
test/__init__.py | 58 +
test/all_testimages.json | 1 +
test/blob.py | 132 +
test/bug-1280.py | 21 +
test/bug_ocl_cpu.py | 5 +
test/check_calib.py | 188 +
test/chi_square.py | 60 +
test/chi_square_ds8.py | 72 +
test/debug_ocl_sort.py | 30 +
test/debug_split_pixel.py | 22 +
test/example.sp | 111 -
test/fai_cfg.json | 4 +
test/lima_cfg.json | 1 +
test/mactrace.py | 55 +
test/memleak.py | 66 +
test/profileDistortionCSR.py | 144 +
test/profile_OCLFullSplit.py | 39 +
test/profile_csr.py | 64 +
test/profile_csr_2d.py | 39 +
test/profile_csr_all_platforms.py | 68 +
test/profile_csr_fullsplit.py | 45 +
test/profile_csr_padded_csr.py | 127 +
test/profile_hdf5.py | 88 +
test/profile_lut_pixelsplitFull.py | 203 +
test/profile_ocl_hist_pixelsplit.py | 127 +
test/{test_ocl_lut.py => profile_ocl_lut.py} | 30 +-
test/profile_ocl_lut_pixelsplit.py | 209 +
test/profile_ocl_lut_pixelsplit2.py | 188 +
test/profile_ocl_lut_pixelsplit3.py | 169 +
test/profile_pixelsplitFull.py | 207 +
test/profile_pixelsplitFullLUT.py | 124 +
test/profile_pixelsplitFullLUT2.py | 126 +
test/profile_splitPixelFullLUT.py | 60 +
test/splitpixel_vs_splitpixelfull.py | 20 +
test/test_all.py | 76 +-
test/test_azimuthal_integrator.py | 136 +-
test/test_bilinear.py | 64 +-
test/test_bispev.py | 33 +-
test/test_blob_detection.py | 12 +-
test/test_bug_regression.py | 95 +
test/test_calibrant.py | 69 +-
test/test_convolution.py | 21 +-
test/test_csr.py | 19 +-
test/test_detector.py | 104 +-
test/test_distortion.py | 12 +-
test/{test_marchingsquares.py => test_dummy.py} | 42 +-
test/test_export.py | 8 +-
test/test_flat.py | 15 +-
test/test_geometry.py | 7 +-
test/test_geometry_refinement.py | 146 +-
test/test_histogram.py | 33 +-
test/test_integrate.py | 17 +-
test/test_io.py | 15 +-
test/test_marchingsquares.py | 7 +-
test/test_mask.py | 167 +-
test/test_multi_geometry.py | 125 +
test/test_openCL.py | 149 +-
test/test_peak_picking.py | 55 +-
test/test_polarization.py | 15 +-
test/test_saxs.py | 7 +-
test/test_sparse.py | 5 +-
test/test_split_pixel.py | 10 +-
test/test_utils.py | 77 +-
.../{test_marchingsquares.py => test_watershed.py} | 57 +-
test/testimages/Fairchild.edf | 200 -
test/testimages/Frelon2k.edf | Bin 8389632 -> 0 bytes
test/testimages/LaB6_0020.edf | Bin 4198400 -> 0 bytes
test/testimages/LaB6_260210.mar3450 | Bin 7473209 -> 0 bytes
test/testimages/Pilatus1M.edf | Bin 4093756 -> 0 bytes
test/testimages/Pilatus6M.cbf | Bin 6230840 -> 0 bytes
test/testimages/fit2d.dat | 1155 -
test/testimages/frelon.spline | 111 -
test/testimages/halfccd.edf | Bin 4198400 -> 0 bytes
test/testimages/halfccd.fit2d.edf | Bin 8389632 -> 0 bytes
test/testimages/halfccd.spline | 29 -
test/testimages/moke.tif | Bin 300356 -> 0 bytes
test/testimages/powder_200_2_0001.cbf | Bin 6240756 -> 0 bytes
test/testimages/powder_200_2_0001.chi | 1770 -
test/testimages/testMask.edf | Bin 4093244 -> 0 bytes
test/utilstest.py | 261 +-
292 files changed, 274035 insertions(+), 231252 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfai.git
More information about the debian-science-commits
mailing list