[Debian-astro-commits] [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 pushed a commit to branch debian
in repository cpl-plugin-xsh.

commit 2a3f3c6256b1d2b4ca37ddc35ebebb4ea2c2e388
Merge: 1467f7c 36c081b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Sep 2 16:20:17 2015 +0200

    Merge branch 'upstream' into debian

 ChangeLog                                   |   28 +
 calib/gasgano/config/XSHOO.prefs            |    2 +-
 configure                                   |   20 +-
 configure.ac                                |    2 +-
 hdrl/configure                              |   20 +-
 hdrl/configure.ac                           |    2 +-
 hdrl/hdrl.h                                 |    2 +-
 hdrl/hdrl_bpm_fit.c                         |    2 +-
 hdrl/hdrl_bpm_fit.h                         |    1 +
 hdrl/hdrl_buffer.c                          |    2 +-
 hdrl/hdrl_collapse.c                        |    4 +-
 hdrl/hdrl_elemop.c                          |    3 +-
 hdrl/hdrl_fit.c                             |   26 +-
 hdrl/hdrl_flat.c                            |  948 +++++----
 hdrl/hdrl_flat.h                            |   50 +-
 hdrl/hdrl_imagelist_io.h                    |    1 -
 hdrl/hdrl_iter.c                            |    2 +-
 hdrl/hdrl_lacosmics.c                       |   22 +-
 hdrl/hdrl_parameter.h                       |    3 +-
 hdrl/hdrl_prototyping.c                     |    3 +-
 hdrl/hdrl_utils.c                           |   10 +-
 hdrl/hdrl_utils.h                           |    2 +-
 hdrl/tests/Makefile.am                      |    4 +-
 hdrl/tests/Makefile.in                      |   28 +-
 hdrl/tests/hdrl_bpm_2d-test.c               |    3 +-
 hdrl/tests/hdrl_bpm_3d-test.c               |  305 ++-
 hdrl/tests/hdrl_elemop-test.c               |   20 +-
 hdrl/tests/hdrl_fit-test.c                  |   15 +
 hdrl/tests/hdrl_flat-test.c                 | 1124 ++++++++++
 hdrl/tests/hdrl_utils-test.c                |   15 +-
 irplib/irplib_utils.c                       |    4 +-
 recipes/xsh_scired_slit_stare.c             |   32 +-
 recipes/xsh_util_ifu_offset.c               |  171 +-
 recipes/xsh_util_ifu_stare.c                |  157 +-
 reflex/Makefile.am                          |    2 +-
 reflex/Makefile.in                          |    2 +-
 reflex/xsh_2dmap.py                         |    2 +-
 reflex/xsh_calib_interactive_common.py      |  143 +-
 reflex/xsh_mflat.py                         |    2 +-
 reflex/xsh_object_interactive_common.py     |  230 +-
 reflex/xsh_object_interactive_common_ifu.py |  233 +-
 reflex/xsh_orderpos.py                      |    2 +-
 reflex/xsh_parameters_common.py             |  313 +++
 reflex/xsh_predict.py                       |    2 +-
 reflex/xsh_respon_slit_nod.py               |    2 +-
 reflex/xsh_respon_slit_offset.py            |    2 +-
 reflex/xsh_respon_slit_stare.py             |    2 +-
 reflex/xsh_scired_ifu_offset.py             |    2 +-
 reflex/xsh_scired_ifu_stare.py              |    2 +-
 reflex/xsh_scired_slit_nod.py               |    2 +-
 reflex/xsh_scired_slit_offset.py            |    2 +-
 reflex/xsh_scired_slit_stare.py             |    2 +-
 reflex/xsh_wkf.oca                          |   80 +-
 reflex/xsh_wkf_stare.oca                    |   23 +
 reflex/xshooter.xml.in                      | 3056 ++++++++++++++++-----------
 xsh/tests/test-xsh_dfs_sdp.c                |    2 +-
 xsh/tests/test-xsh_subtract_sky_single.c    |    2 +-
 xsh/xsh_badpixelmap.c                       |    5 +-
 xsh/xsh_combine_nod.c                       |    5 +
 xsh/xsh_create_master.c                     |   14 +-
 xsh/xsh_data_rec.c                          |   25 +-
 xsh/xsh_data_spectrum.c                     |   35 +-
 xsh/xsh_data_spectrum1D.c                   |    4 +-
 xsh/xsh_data_wavemap.c                      |    4 +-
 xsh/xsh_dfs.c                               |   10 +-
 xsh/xsh_drl.h                               |    1 -
 xsh/xsh_drl_check.c                         |    4 +-
 xsh/xsh_follow_arclines.c                   |    4 +-
 xsh/xsh_format.c                            |   84 +-
 xsh/xsh_parameters.c                        |    2 +-
 xsh/xsh_pfits.c                             |   95 +-
 xsh/xsh_pfits.h                             |   28 +
 xsh/xsh_pfits_qc.c                          |   40 +-
 xsh/xsh_pfits_qc.h                          |    2 +
 xsh/xsh_qc_definition.h                     |    3 +
 xsh/xsh_remove_crh_multi.c                  |   28 +-
 xsh/xsh_subtract_sky_single.c               | 1247 +++++------
 xsh/xsh_utils_scired_slit.c                 |  112 +-
 xsh/xsh_utils_scired_slit.h                 |   21 +
 79 files changed, 5493 insertions(+), 3423 deletions(-)

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