[cpl-plugin-xsh] 01/02: Merge branch 'upstream' into debian

Ole Streicher olebole-guest at moszumanska.debian.org
Wed Jun 25 14:40:44 UTC 2014


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

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-xsh.

commit 050e377fde83342eed43f50bb113844e2a15218d
Merge: 255ea4e 2f76db9
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jun 25 16:18:30 2014 +0200

    Merge branch 'upstream' into debian

 ChangeLog                                        |   37 +-
 Makefile.am                                      |    2 +-
 Makefile.in                                      |    4 +-
 acinclude.m4                                     |    8 +-
 calib/cal_size                                   |    2 +-
 calib/gasgano/config/XSHOO.prefs                 |    2 +-
 calib/gasgano/config/xshoo.oca                   |   12 +
 configure                                        |   50 +-
 configure.ac                                     |    4 +-
 irplib/Makefile.am                               |   89 +
 {regtests => irplib}/Makefile.in                 |  252 +-
 irplib/irplib_calib.c                            |  661 +++++
 irplib/irplib_calib.h                            |   49 +
 irplib/irplib_cat.c                              |  467 ++++
 irplib/irplib_cat.h                              |   57 +
 irplib/irplib_distortion.c                       | 1384 +++++++++++
 irplib/irplib_distortion.h                       |   44 +
 irplib/irplib_flat.c                             |  402 +++
 irplib/irplib_flat.h                             |   40 +
 irplib/irplib_framelist.c                        | 1282 ++++++++++
 irplib/irplib_framelist.h                        |  107 +
 irplib/irplib_hist.c                             |  350 +++
 irplib/irplib_hist.h                             |   93 +
 irplib/irplib_ksigma_clip.c                      |  258 ++
 irplib/irplib_ksigma_clip.h                      |   52 +
 irplib/irplib_ksigma_clip_body.h                 |  107 +
 irplib/irplib_match_cats.c                       |  211 ++
 irplib/irplib_match_cats.h                       |   46 +
 irplib/irplib_mkmaster.c                         |  563 +++++
 irplib/irplib_mkmaster.h                         |   53 +
 irplib/irplib_oddeven.c                          |  338 +++
 irplib/irplib_oddeven.h                          |   40 +
 irplib/irplib_plugin.c                           | 1286 ++++++++++
 irplib/irplib_plugin.h                           |   93 +
 irplib/irplib_polynomial.c                       | 1319 ++++++++++
 irplib/irplib_polynomial.h                       |   44 +
 irplib/irplib_ppm.c                              |  495 ++++
 irplib/irplib_ppm.h                              |   40 +
 irplib/irplib_sdp_spectrum.c                     | 2889 ++++++++++++++++++++++
 irplib/irplib_sdp_spectrum.h                     |  729 ++++++
 irplib/irplib_slitpos.c                          |  568 +++++
 irplib/irplib_slitpos.h                          |   39 +
 irplib/irplib_spectrum.c                         |  608 +++++
 irplib/irplib_spectrum.h                         |   59 +
 irplib/irplib_stdstar.c                          |  835 +++++++
 irplib/irplib_stdstar.h                          |   80 +
 irplib/irplib_strehl.c                           | 1069 ++++++++
 irplib/irplib_strehl.h                           |  126 +
 xsh/xsh_irplib_utils.c => irplib/irplib_utils.c  |  629 ++++-
 xsh/xsh_irplib_utils.h => irplib/irplib_utils.h  |  152 +-
 irplib/irplib_wavecal.c                          | 1753 +++++++++++++
 irplib/irplib_wavecal.h                          |  178 ++
 irplib/irplib_wavecal_impl.h                     |   56 +
 irplib/irplib_wcs.c                              |  391 +++
 irplib/irplib_wcs.h                              |   66 +
 irplib/irplib_wlxcorr.c                          | 1284 ++++++++++
 irplib/irplib_wlxcorr.h                          |   73 +
 irplib/tests/Makefile.am                         |  105 +
 irplib/tests/Makefile.in                         |  878 +++++++
 irplib/tests/irplib_cat-test.c                   |   98 +
 irplib/tests/irplib_framelist-test.c             |  117 +
 irplib/tests/irplib_hist-test.c                  |  151 ++
 irplib/tests/irplib_plugin-test.c                |  205 ++
 irplib/tests/irplib_polynomial-test.c            |  589 +++++
 irplib/tests/irplib_sdp_spectrum-test.c          | 1631 ++++++++++++
 irplib/tests/irplib_strehl-test.c                |  841 +++++++
 irplib/tests/irplib_utils-test.c                 |  481 ++++
 irplib/tests/irplib_wcs-test.c                   |  307 +++
 irplib/tests/irplib_wlxcorr-test.c               |  482 ++++
 recipes/Makefile.in                              |    2 +
 recipes/xsh_mbias.c                              |    1 -
 recipes/xsh_respon_slit_nod.c                    |    8 +-
 recipes/xsh_respon_slit_offset.c                 |   48 +-
 recipes/xsh_respon_slit_stare.c                  |   24 +-
 recipes/xsh_scired_slit_nod.c                    |   52 +-
 recipes/xsh_scired_slit_offset.c                 |   79 +-
 recipes/xsh_scired_slit_stare.c                  |   75 +-
 reflex/Makefile.in                               |    2 +
 reflex/xsh_calib_interactive_common.py           |   58 +-
 reflex/xsh_object_interactive_common.py          |   61 +-
 reflex/xsh_object_interactive_common_ifu.py      |   14 +-
 reflex/xsh_wkf.oca                               |    9 +
 reflex/xsh_wkf_stare.oca                         |    6 +
 reflex/xshooter.xml.in                           |  356 ++-
 regtests/Makefile.in                             |    2 +
 regtests/tests/Makefile.in                       |    2 +
 xsh/Makefile.am                                  |    8 +-
 xsh/Makefile.in                                  |   44 +-
 xsh/irplib_error.c                               |   18 +-
 xsh/tests/Makefile.am                            |   11 +-
 xsh/tests/Makefile.in                            |   25 +-
 xsh/tests/test-cpl_image_fit_gaussian.c          |    2 +-
 xsh/tests/test-xsh_atrous.c                      |    4 +-
 xsh/tests/test-xsh_combine_nod.c                 |   16 +-
 xsh/tests/test-xsh_compute_noise_map.c           |    5 +
 xsh/tests/test-xsh_correl_gaussians.c            |   17 +-
 xsh/tests/test-xsh_cpl_vector_correl_gaussians.c |    6 +-
 xsh/tests/test-xsh_create_master_bias.c          |   10 +-
 xsh/tests/test-xsh_create_master_dark.c          |   10 +-
 xsh/tests/test-xsh_cube_ext_save.c               |    4 +-
 xsh/tests/test-xsh_data_cube.c                   |   14 +-
 xsh/tests/test-xsh_data_order.c                  |    2 +-
 xsh/tests/test-xsh_data_order_2D.c               |    2 +-
 xsh/tests/test-xsh_data_spectrum_merge_3d.c      |    2 +-
 xsh/tests/test-xsh_data_spectrum_order_1D.c      |    2 +-
 xsh/tests/test-xsh_data_wave_tab_2d_sample.c     |    2 +-
 xsh/tests/test-xsh_detect_arclines.c             |    2 +-
 xsh/tests/test-xsh_detect_continuum.c            |    2 +
 xsh/tests/test-xsh_detect_line_file.c            |    2 +-
 xsh/tests/test-xsh_detect_line_pos.c             |    6 +-
 xsh/tests/test-xsh_detect_line_pos2.c            |   12 +-
 xsh/tests/test-xsh_dfs_sdp.c                     |  742 ++++++
 xsh/tests/test-xsh_extract_clean_sym.c           |    6 +-
 xsh/tests/test-xsh_flux.c                        |    2 +
 xsh/tests/test-xsh_flux_conservation.c           |    2 +
 xsh/tests/test-xsh_gaussian_fit.c                |    4 +-
 xsh/tests/test-xsh_geom_ifu.c                    |   14 +-
 xsh/tests/test-xsh_lambda_err.c                  |    4 +-
 xsh/tests/test-xsh_model.c                       |    4 +-
 xsh/tests/test-xsh_model_maps_create.c           |    4 +-
 xsh/tests/test-xsh_opt_extract.c                 |    4 +-
 xsh/tests/test-xsh_paf_save.c                    |    5 +-
 xsh/tests/test-xsh_pix_convention.c              |    4 +-
 xsh/tests/test-xsh_rectify.c                     |   12 +-
 xsh/tests/test-xsh_remove_crh_multiple.c         |   15 +-
 xsh/tests/test-xsh_remove_crh_single.c           |    5 +-
 xsh/tests/test-xsh_slitmap.c                     |    2 +-
 xsh/tests/test-xsh_startup.c                     |    4 +-
 xsh/tests/test-xsh_subtract_bias.c               |    3 +
 xsh/tests/test-xsh_subtract_dark.c               |    3 +
 xsh/tests/test-xsh_subtract_sky_single.c         |    4 +-
 xsh/tests/test-xsh_telluric_cor.c                |    2 +-
 xsh/tests/test-xsh_the_map.c                     |    2 +-
 xsh/tests/test-xsh_wavecal_fwhm.c                |    2 +-
 xsh/tests/test-xsh_xcorrel_gaussians.c           |    5 +-
 xsh/tests/tests.c                                |    4 +-
 xsh/tests/tests.h                                |   17 +
 xsh/xsh_combine_nod.c                            |    6 +-
 xsh/xsh_compute_noise_map.c                      |    2 +
 xsh/xsh_compute_response.c                       |   18 +-
 xsh/xsh_create_master.c                          |    2 +-
 xsh/xsh_data_instrument.c                        |    2 +-
 xsh/xsh_data_localization.c                      |   18 +-
 xsh/xsh_data_order.c                             |   30 +-
 xsh/xsh_data_pre.c                               |    3 +-
 xsh/xsh_data_pre.h                               |    3 +
 xsh/xsh_data_rec.c                               |    4 +
 xsh/xsh_data_spectrum1D.c                        |   16 +-
 xsh/xsh_data_star_flux.c                         |    5 +-
 xsh/xsh_data_wavemap.c                           |    4 +-
 xsh/xsh_detect_arclines.c                        |   12 +-
 xsh/xsh_detmon.c                                 |    2 +-
 xsh/xsh_detmon_lg.c                              |    4 +-
 xsh/xsh_dfs.c                                    | 1302 +++++++++-
 xsh/xsh_dfs.h                                    |   19 +-
 xsh/xsh_drl_check.c                              |    4 +-
 xsh/xsh_efficiency_response.c                    |    1 +
 xsh/xsh_extract.c                                |   12 +-
 xsh/xsh_localize_obj.c                           |    4 +-
 xsh/xsh_merge_ord.c                              |    3 +-
 xsh/xsh_model_anneal.c                           |    2 +-
 xsh/xsh_model_io.c                               |    7 +-
 xsh/xsh_model_kernel.c                           |   14 +-
 xsh/xsh_paf_save.c                               |    2 +-
 xsh/xsh_parameters.c                             |   13 +-
 xsh/xsh_parameters.h                             |    4 +-
 xsh/xsh_pfits.c                                  |    2 +-
 xsh/xsh_pfits.h                                  |  104 +
 xsh/xsh_pfits_qc.h                               |    1 +
 xsh/xsh_rectify.c                                |   14 +-
 xsh/xsh_remove_crh_single.c                      |    2 +-
 xsh/xsh_subtract_sky_nod.c                       |    8 +-
 xsh/xsh_subtract_sky_offset.c                    |    6 +-
 xsh/xsh_utils.c                                  |   43 +-
 xsh/xsh_utils_efficiency.c                       |    5 +-
 xsh/xsh_utils_response.c                         |   74 +-
 xsh/xsh_utils_scired_slit.c                      |   53 +-
 xsh/xsh_utils_scired_slit.h                      |    9 +-
 178 files changed, 30865 insertions(+), 688 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-xsh.git



More information about the debian-science-commits mailing list