[pyfai] branch experimental updated (4f7ee09 -> dbd1be2)

Frédéric-Emmanuel Picca picca at moszumanska.debian.org
Fri Oct 17 12:40:49 UTC 2014


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

picca pushed a change to branch experimental
in repository pyfai.

      from  4f7ee09   update the copyright file
       new  1b6f03f   Imported Upstream version 0.10.0
       new  4989b03   Merge tag 'upstream/0.10.0' into experimental
       new  4e30d01   remove all patches applyed upstream
       new  f151a4b   update the copyright file for 0.10.0
       new  18440fe   update the packaging to build 0.10.0
       new  dbd1be2   fix compilation

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGELOG.txt                                      |    52 +-
 MANIFEST.in                                        |    27 +-
 PKG-INFO                                           |    31 +-
 README.txt                                         |   113 +-
 TODO.txt                                           |    15 +-
 benchmark/benchmark.py                             |   706 +-
 benchmark/benchmark_distortion.py                  |    52 +
 benchmark/benchmark_ocl_csr3.py                    |   428 +
 benchmark/{benchmark.py => benchmark_split.py}     |   411 +-
 build-deb.sh                                       |    12 +-
 calibration/Au.D                                   |    21 +-
 calibration/CeO2.D                                 |    81 +-
 calibration/LaB6.D                                 |    39 +-
 calibration/NaCl.D                                 |    18 +
 calibration/PBBA.D                                 |    81 +
 calibration/Si.D                                   |    27 +-
 calibration/alpha_Al2O3.D                          |    62 +-
 debian/changelog                                   |    10 +-
 debian/control                                     |    42 +-
 debian/{control => control.new}                    |     4 +-
 debian/copyright                                   |    38 +-
 ...warded-setup-teardown-to-remove-temporary.patch |   143 -
 ...tream-histogram-build-when-.c-file-is-mis.patch |    34 +
 ...wareded-do-not-alter-the-original-poni-fi.patch |    37 -
 ...warded-upstream-fix-the-averageImage-test.patch |    33 -
 debian/patches/series                              |     4 +-
 debian/{pyfai.install => pyfai.install.new}        |     0
 ...thon-pyfai.install => python-pyfai.install.new} |     0
 debian/rules                                       |    10 +-
 doc/MX-calibrate.1                                 |    74 +-
 doc/MX-calibrate.pdf                               |   Bin 7377 -> 7268 bytes
 doc/check_calib.1                                  |    39 +-
 doc/check_calib.pdf                                |   Bin 4148 -> 4435 bytes
 doc/diff_tomo.1                                    |    61 +-
 doc/diff_tomo.pdf                                  |   Bin 5127 -> 4990 bytes
 doc/drawMask_pymca.1                               |    33 +-
 doc/drawMask_pymca.pdf                             |   Bin 4166 -> 3989 bytes
 doc/pyFAI-API.pdf                                  |   Bin 492113 -> 0 bytes
 doc/pyFAI-average.1                                |    44 +-
 doc/pyFAI-average.pdf                              |   Bin 4484 -> 4479 bytes
 doc/pyFAI-calib.1                                  |   128 +-
 doc/pyFAI-calib.pdf                                |   Bin 8621 -> 8635 bytes
 doc/pyFAI-integrate.1                              |    35 +-
 doc/pyFAI-integrate.pdf                            |   Bin 4658 -> 4551 bytes
 doc/pyFAI-recalib.1                                |   136 +-
 doc/pyFAI-recalib.pdf                              |   Bin 8655 -> 9054 bytes
 doc/pyFAI-saxs.1                                   |    50 +-
 doc/pyFAI-saxs.pdf                                 |   Bin 5014 -> 4728 bytes
 doc/pyFAI-waxs.1                                   |    61 +-
 doc/pyFAI-waxs.pdf                                 |   Bin 4840 -> 5667 bytes
 doc/pyFAI.pdf                                      |   Bin 1226788 -> 1062868 bytes
 doc/source/api/pyFAI.rst                           |   117 +-
 doc/source/biblio.rst                              |    72 +
 doc/source/calibration.rst                         |   132 +
 doc/source/conf.py                                 |     6 +-
 doc/source/img/benchmark.png                       |   Bin 108107 -> 94791 bytes
 doc/source/index.rst                               |    17 +-
 doc/source/man/MX-calibrate.rst                    |    16 +-
 doc/source/man/check_calib.rst                     |    30 +-
 doc/source/man/diff_tomo.rst                       |     2 +-
 doc/source/man/drawMask_pymca.rst                  |     2 +
 doc/source/man/pyFAI-average.rst                   |     2 +-
 doc/source/man/pyFAI-calib.rst                     |    43 +-
 doc/source/man/pyFAI-recalib.rst                   |    10 +-
 doc/source/man/pyFAI-waxs.rst                      |     8 +
 doc/source/man/scripts.rst                         |    36 +-
 doc/source/project.rst                             |   162 +-
 doc/source/pyFAI.rst                               |   191 +-
 openCL/ocl_azim_CSR.cl                             |   425 +
 openCL/ocl_azim_LUT.cl                             |   272 +-
 openCL/ocl_azim_kernel2d_2.cl                      |    15 +-
 openCL/ocl_azim_kernel_2.cl                        |    13 +-
 openCL/ocl_bispev.cl                               |   191 +
 openCL/ocl_hist_pixelsplit.cl                      |   371 +
 openCL/ocl_lut_pixelsplit.cl                       |   603 +
 openCL/ocl_lut_pixelsplit2.cl                      |   603 +
 openCL/ocl_lut_pixelsplit3.cl                      |   620 +
 openCL/ocl_lut_pixelsplit_test.cl                  |   603 +
 openCL/{ocl_azim_LUT.cl => preprocess.cl}          |   189 +-
 openCL/reduction_test.cl                           |    92 +
 openCL/reduction_test4.cl                          |   104 +
 pyFAI-src/__init__.py                              |     4 +-
 pyFAI-src/azimuthalIntegrator.py                   |  1090 +-
 pyFAI-src/blob_detection.py                        |   894 +
 pyFAI-src/calibrant.py                             |   298 +
 pyFAI-src/calibration.py                           |  1484 +-
 pyFAI-src/detectors.py                             |  1546 +-
 pyFAI-src/distortion.py                            |   338 +-
 pyFAI-src/geometry.py                              |   361 +-
 pyFAI-src/geometryRefinement.py                    |    67 +-
 pyFAI-src/gui_utils.py                             |   136 +
 pyFAI-src/integrate_widget.py                      |   208 +-
 pyFAI-src/io.py                                    |   418 +-
 pyFAI-src/massif.py                                |   291 +
 pyFAI-src/ocl_azim.py                              |     8 +-
 pyFAI-src/{ocl_azim_lut.py => ocl_azim_csr.py}     |   223 +-
 pyFAI-src/{ocl_azim_lut.py => ocl_azim_csr_dis.py} |   193 +-
 pyFAI-src/ocl_azim_lut.py                          |   171 +-
 .../{ocl_azim_lut.py => ocl_hist_pixelsplit.py}    |   204 +-
 pyFAI-src/opencl.py                                |    79 +-
 pyFAI-src/peakPicker.py                            |   889 -
 pyFAI-src/peak_picker.py                           |   970 +
 pyFAI-src/refinment2D.py                           |     6 +-
 pyFAI-src/spline.py                                |    30 +-
 pyFAI-src/units.py                                 |     6 +-
 pyFAI-src/utils.py                                 |   195 +-
 pyFAI-src/worker.py                                |   170 +-
 scripts/MX-calibrate                               |   430 +-
 scripts/check_calib                                |    28 +-
 scripts/detector2nexus                             |   152 +
 scripts/diff_tomo                                  |   103 +-
 scripts/drawMask_pymca                             |    67 +-
 scripts/pyFAI-average                              |    68 +-
 scripts/pyFAI-calib                                |    12 +-
 scripts/pyFAI-integrate                            |    36 +-
 scripts/pyFAI-recalib                              |    14 +-
 scripts/pyFAI-saxs                                 |    88 +-
 scripts/pyFAI-waxs                                 |   145 +-
 scripts/refine_wavelength                          |     2 +-
 setup.py                                           |   579 +-
 src/{relabel.c => _bispev.c}                       | 29159 ++++++++--------
 src/_bispev.pyx                                    |   209 +
 src/{reconstruct.c => _blob.c}                     | 13825 ++++----
 src/_blob.pyx                                      |    87 +
 src/{relabel.c => _convolution.c}                  | 24796 +++++++-------
 src/_convolution.pyx                               |   131 +
 src/_distortion.c                                  | 25031 +++++++++-----
 src/_distortion.pyx                                |   478 +-
 src/{_distortion.c => _distortionCSR.c}            | 28803 +++++++---------
 src/{_distortion.pyx => _distortionCSR.pyx}        |   495 +-
 src/_geometry.c                                    |    99 +-
 src/bilinear.c                                     | 33666 ++++++++++++-------
 src/bilinear.pyx                                   |    87 +-
 src/{reconstruct.c => binary_morphology.c}         |  9973 +++---
 src/fastcrc.c                                      |    89 +-
 src/fastcrc.pyx                                    |     1 +
 src/fastrebin.pyx                                  |   285 -
 src/histogram.c                                    | 14287 ++++----
 src/histogram.pyx                                  |   337 +-
 src/{_geometry.c => histogram_nomp.c}              | 13224 ++++----
 src/histogram_nomp.pyx                             |   200 +
 src/{histogram.c => histogram_omp.c}               | 14287 ++++----
 src/histogram_omp.pyx                              |   234 +
 src/{_geometry.c => marchingsquares.c}             |  6823 ++--
 src/marchingsquares.pyx                            |   183 +
 src/marchingsquares_.pyx                           |   113 -
 src/{relabel.c => morphology.c}                    |  2659 +-
 src/morphology.pyx                                 |    85 +
 src/reconstruct.c                                  |   284 +-
 src/relabel.c                                      |    91 +-
 src/sparse_csr.c                                   |  2777 +-
 src/splitBBox.c                                    |    91 +-
 src/{splitBBoxLUT.c => splitBBoxCSR.c}             | 32973 ++++++++++--------
 src/splitBBoxCSR.pyx                               |  1286 +
 src/splitBBoxLUT.c                                 | 16161 ++++++---
 src/splitBBoxLUT.pyx                               |   798 +-
 src/{splitBBoxLUT.c => splitBBoxLUT_vector.c}      | 11793 ++++---
 src/{splitBBoxLUT.pyx => splitBBoxLUT_vector.pyx}  |   447 +-
 src/splitPixel.c                                   | 16791 ++++-----
 src/splitPixel.pyx                                 |   405 +-
 src/{histogram.c => splitPixelFull.c}              | 16494 ++++-----
 src/splitPixelFull.pyx                             |   751 +
 src/{splitPixel.c => splitPixelFullCSR.c}          | 15794 ++++-----
 src/splitPixelFullCSR.pyx                          |  1012 +
 src/{splitBBox.c => splitPixelFullLUT.c}           | 22277 ++++++------
 src/splitPixelFullLUT.pyx                          |  1145 +
 src/{splitPixel.c => splitPixelFullLUT_b.c}        | 14935 ++++----
 src/splitPixelFullLUT_b.pyx                        |   979 +
 src/{splitPixel.c => splitPixelFullLUT_double.c}   | 15208 +++++----
 src/splitPixelFullLUT_double.pyx                   |  1091 +
 ...{splitPixel.c => splitPixelFullLUT_float32_b.c} | 15927 ++++-----
 src/splitPixelFullLUT_float32_b.pyx                |  1021 +
 src/{marchingsquares_.c => xutils.c}               |  4253 ++-
 stdeb.cfg                                          |     7 +-
 test/testBilinear.py                               |    93 -
 test/testDetector.py                               |    81 -
 test/testHistogram.py                              |   225 -
 test/test_all.py                                   |    53 +-
 ...lIntegrator.py => test_azimuthal_integrator.py} |    39 +-
 test/test_bilinear.py                              |   132 +-
 test/test_bispev.py                                |   112 +
 test/test_blob_detection.py                        |    74 +
 test/test_calibrant.py                             |    69 +
 test/test_convolution.py                           |    68 +
 test/test_csr.py                                   |   129 +
 test/test_detector.py                              |   211 +
 test/{testDistortion.py => test_distortion.py}     |     0
 test/{testExport.py => test_export.py}             |    47 +-
 test/{testFlat.py => test_flat.py}                 |    61 +-
 test/{testGeometry.py => test_geometry.py}         |     0
 ...ryRefinement.py => test_geometry_refinement.py} |    17 +-
 test/test_histogram.py                             |   314 +
 test/{testIntegrate.py => test_integrate.py}       |     4 +-
 test/test_io.py                                    |   152 +
 test/test_marchingsquares.py                       |    70 +
 test/{testMask.py => test_mask.py}                 |     0
 test/{testOpenCL.py => test_openCL.py}             |    66 +-
 test/{testPeakPicking.py => test_peak_picking.py}  |    12 +-
 test/{testPolarization.py => test_polarization.py} |     6 +-
 test/{testSaxs.py => test_saxs.py}                 |     0
 test/test_sparse.py                                |    61 +
 test/test_split_pixel.py                           |    98 +
 test/{testUtils.py => test_utils.py}               |     0
 test/testimages/Fairchild.edf                      |   200 +
 test/testimages/LaB6_260210.mar3450                |   Bin 0 -> 7473209 bytes
 test/utilstest.py                                  |   241 +-
 206 files changed, 245528 insertions(+), 191686 deletions(-)
 create mode 100755 benchmark/benchmark_distortion.py
 create mode 100644 benchmark/benchmark_ocl_csr3.py
 copy benchmark/{benchmark.py => benchmark_split.py} (60%)
 mode change 100755 => 100644
 create mode 100644 calibration/NaCl.D
 create mode 100644 calibration/PBBA.D
 copy debian/{control => control.new} (97%)
 delete mode 100644 debian/patches/0001-feature-forwarded-setup-teardown-to-remove-temporary.patch
 create mode 100644 debian/patches/0001-fix-for-upstream-histogram-build-when-.c-file-is-mis.patch
 delete mode 100644 debian/patches/0002-feature-forwareded-do-not-alter-the-original-poni-fi.patch
 delete mode 100644 debian/patches/0003-forwarded-upstream-fix-the-averageImage-test.patch
 rename debian/{pyfai.install => pyfai.install.new} (100%)
 rename debian/{python-pyfai.install => python-pyfai.install.new} (100%)
 delete mode 100644 doc/pyFAI-API.pdf
 create mode 100644 doc/source/biblio.rst
 create mode 100644 doc/source/calibration.rst
 create mode 100644 openCL/ocl_azim_CSR.cl
 create mode 100644 openCL/ocl_bispev.cl
 create mode 100644 openCL/ocl_hist_pixelsplit.cl
 create mode 100644 openCL/ocl_lut_pixelsplit.cl
 create mode 100644 openCL/ocl_lut_pixelsplit2.cl
 create mode 100644 openCL/ocl_lut_pixelsplit3.cl
 create mode 100644 openCL/ocl_lut_pixelsplit_test.cl
 copy openCL/{ocl_azim_LUT.cl => preprocess.cl} (53%)
 create mode 100644 openCL/reduction_test.cl
 create mode 100644 openCL/reduction_test4.cl
 create mode 100644 pyFAI-src/blob_detection.py
 create mode 100644 pyFAI-src/calibrant.py
 create mode 100644 pyFAI-src/gui_utils.py
 create mode 100644 pyFAI-src/massif.py
 copy pyFAI-src/{ocl_azim_lut.py => ocl_azim_csr.py} (50%)
 copy pyFAI-src/{ocl_azim_lut.py => ocl_azim_csr_dis.py} (54%)
 copy pyFAI-src/{ocl_azim_lut.py => ocl_hist_pixelsplit.py} (55%)
 delete mode 100644 pyFAI-src/peakPicker.py
 create mode 100644 pyFAI-src/peak_picker.py
 mode change 100644 => 100755 scripts/MX-calibrate
 create mode 100755 scripts/detector2nexus
 mode change 100644 => 100755 scripts/pyFAI-integrate
 copy src/{relabel.c => _bispev.c} (67%)
 create mode 100644 src/_bispev.pyx
 copy src/{reconstruct.c => _blob.c} (65%)
 create mode 100644 src/_blob.pyx
 copy src/{relabel.c => _convolution.c} (88%)
 create mode 100644 src/_convolution.pyx
 copy src/{_distortion.c => _distortionCSR.c} (58%)
 copy src/{_distortion.pyx => _distortionCSR.pyx} (55%)
 copy src/{reconstruct.c => binary_morphology.c} (74%)
 delete mode 100644 src/fastrebin.pyx
 copy src/{_geometry.c => histogram_nomp.c} (65%)
 create mode 100644 src/histogram_nomp.pyx
 copy src/{histogram.c => histogram_omp.c} (65%)
 create mode 100644 src/histogram_omp.pyx
 copy src/{_geometry.c => marchingsquares.c} (80%)
 create mode 100644 src/marchingsquares.pyx
 delete mode 100644 src/marchingsquares_.pyx
 copy src/{relabel.c => morphology.c} (92%)
 create mode 100644 src/morphology.pyx
 copy src/{splitBBoxLUT.c => splitBBoxCSR.c} (54%)
 create mode 100644 src/splitBBoxCSR.pyx
 copy src/{splitBBoxLUT.c => splitBBoxLUT_vector.c} (77%)
 copy src/{splitBBoxLUT.pyx => splitBBoxLUT_vector.pyx} (72%)
 copy src/{histogram.c => splitPixelFull.c} (62%)
 create mode 100644 src/splitPixelFull.pyx
 copy src/{splitPixel.c => splitPixelFullCSR.c} (70%)
 create mode 100644 src/splitPixelFullCSR.pyx
 copy src/{splitBBox.c => splitPixelFullLUT.c} (55%)
 create mode 100644 src/splitPixelFullLUT.pyx
 copy src/{splitPixel.c => splitPixelFullLUT_b.c} (70%)
 create mode 100644 src/splitPixelFullLUT_b.pyx
 copy src/{splitPixel.c => splitPixelFullLUT_double.c} (64%)
 create mode 100644 src/splitPixelFullLUT_double.pyx
 copy src/{splitPixel.c => splitPixelFullLUT_float32_b.c} (70%)
 create mode 100644 src/splitPixelFullLUT_float32_b.pyx
 rename src/{marchingsquares_.c => xutils.c} (63%)
 delete mode 100755 test/testBilinear.py
 delete mode 100755 test/testDetector.py
 delete mode 100755 test/testHistogram.py
 rename test/{testAzimuthalIntegrator.py => test_azimuthal_integrator.py} (90%)
 create mode 100755 test/test_bispev.py
 create mode 100644 test/test_blob_detection.py
 create mode 100644 test/test_calibrant.py
 create mode 100644 test/test_convolution.py
 create mode 100644 test/test_csr.py
 create mode 100755 test/test_detector.py
 rename test/{testDistortion.py => test_distortion.py} (100%)
 rename test/{testExport.py => test_export.py} (76%)
 rename test/{testFlat.py => test_flat.py} (77%)
 rename test/{testGeometry.py => test_geometry.py} (100%)
 rename test/{testGeometryRefinement.py => test_geometry_refinement.py} (95%)
 create mode 100755 test/test_histogram.py
 rename test/{testIntegrate.py => test_integrate.py} (98%)
 create mode 100644 test/test_io.py
 create mode 100644 test/test_marchingsquares.py
 rename test/{testMask.py => test_mask.py} (100%)
 rename test/{testOpenCL.py => test_openCL.py} (65%)
 rename test/{testPeakPicking.py => test_peak_picking.py} (94%)
 rename test/{testPolarization.py => test_polarization.py} (97%)
 rename test/{testSaxs.py => test_saxs.py} (100%)
 create mode 100644 test/test_sparse.py
 create mode 100644 test/test_split_pixel.py
 rename test/{testUtils.py => test_utils.py} (100%)
 create mode 100644 test/testimages/Fairchild.edf
 create mode 100644 test/testimages/LaB6_260210.mar3450

-- 
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