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

[Ole Streicher]

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 c4a0eb661810b6485bc1e3a476c66f795a3ebd00
Merge: 1cbd1d3 daad08b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jun 9 12:24:55 2014 +0200

    Merge branch 'upstream' into debian

 ChangeLog                                   |   18 +
 calib/gasgano/config/XSHOO.prefs            |    2 +-
 calib/gasgano/config/xshoo.oca              |  238 +-
 configure                                   |   20 +-
 configure.ac                                |    2 +-
 recipes/xsh_2dmap.c                         |    6 +-
 recipes/xsh_cfg_recover.c                   |    8 +-
 recipes/xsh_flexcomp.c                      |    2 +-
 recipes/xsh_geom_ifu.c                      |    4 +-
 recipes/xsh_lingain.c                       |   12 +-
 recipes/xsh_mbias.c                         |    2 +-
 recipes/xsh_mflat.c                         |    2 +-
 recipes/xsh_predict.c                       |    6 +-
 recipes/xsh_respon_slit_nod.c               |    4 +-
 recipes/xsh_respon_slit_offset.c            |    2 +-
 recipes/xsh_respon_slit_stare.c             |    2 +-
 recipes/xsh_scired_ifu_offset.c             |    2 +-
 recipes/xsh_scired_ifu_stare.c              |    4 +-
 recipes/xsh_scired_slit_nod.c               |    4 +-
 recipes/xsh_util_ifu_offset.c               |   11 +-
 recipes/xsh_util_ifu_stare.c                |    4 +-
 recipes/xsh_wavecal.c                       |    6 +-
 reflex/Makefile.am                          |    2 +-
 reflex/Makefile.in                          |    2 +-
 reflex/xsh_calib_interactive_common.py      |   38 +-
 reflex/xsh_log_invocation.py                |   13 +-
 reflex/xsh_object_interactive_common_ifu.py | 1049 ++++
 reflex/xsh_plot_widgets.py                  |  156 +
 reflex/xsh_scired_ifu_offset.py             |   58 +
 reflex/xsh_scired_ifu_stare.py              |   57 +
 reflex/xsh_wkf.oca                          | 1127 +++--
 reflex/xsh_wkf_stare.oca                    |  123 +-
 reflex/xshooter.xml.in                      | 7215 +++++++++++++++++++++++----
 regtests/tests/Makefile.am                  |   10 +-
 regtests/tests/Makefile.in                  |   10 +-
 xsh/tests/test-product_xsh_master_bias.c    |    2 +
 xsh/tests/test-xsh_compute_noise_map.c      |    6 +-
 xsh/tests/test-xsh_compute_response.c       |    4 +-
 xsh/tests/test-xsh_correl_gaussians.c       |    3 +
 xsh/tests/test-xsh_create_master_dark.c     |    2 +-
 xsh/tests/test-xsh_create_spectralformat.c  |    1 +
 xsh/tests/test-xsh_data_cube.c              |    4 +-
 xsh/tests/test-xsh_data_dispersol.c         |    3 +-
 xsh/tests/test-xsh_data_pre.c               |    3 +-
 xsh/tests/test-xsh_data_wavemap.c           |    2 -
 xsh/tests/test-xsh_detect_continuum.c       |    4 +-
 xsh/tests/test-xsh_detect_line_file.c       |    2 +-
 xsh/tests/test-xsh_detect_line_pos2.c       |    2 +-
 xsh/tests/test-xsh_extract_clean.c          |    4 +-
 xsh/tests/test-xsh_extract_clean_sym.c      |   13 +-
 xsh/tests/test-xsh_flat_merge.c             |    2 -
 xsh/tests/test-xsh_flux_conservation.c      |    4 +-
 xsh/tests/test-xsh_guess.c                  |    3 +-
 xsh/tests/test-xsh_ifu_trace_object.c       |    3 +
 xsh/tests/test-xsh_ifu_trace_slices.c       |    8 +-
 xsh/tests/test-xsh_lambda_err.c             |    3 +-
 xsh/tests/test-xsh_mark_tell.c              |    2 -
 xsh/tests/test-xsh_merge_ord.c              |    4 +-
 xsh/tests/test-xsh_model.c                  |    1 +
 xsh/tests/test-xsh_rectify.c                |    1 +
 xsh/tests/test-xsh_startup.c                |    2 +-
 xsh/tests/test-xsh_the_map.c                |    4 +-
 xsh/tests/test-xsh_tools_perf.c             |    2 +-
 xsh/tests/test-xsh_xcorrel_gaussians.c      |    2 +-
 xsh/xsh_compute_linearity.c                 |    4 +-
 xsh/xsh_create_master.c                     |    2 +-
 xsh/xsh_detmon.c                            |   24 +-
 xsh/xsh_subtract_sky_single.c               |    2 +-
 xsh/xsh_utils_ifu.c                         |   17 +-
 69 files changed, 8636 insertions(+), 1730 deletions(-)

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