[cpl-plugin-kmos] 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-kmos.

commit e87f12f58065089440dcc3a6af875c24f16460f3
Merge: 8c6ce49 2eb01b1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Nov 14 12:37:10 2014 +0100

    Merge branch 'upstream' into debian

 Makefile.am                                    |    2 +-
 Makefile.in                                    |    2 +-
 calib/gasgano/config/KMOS.prefs                |    2 +-
 configure                                      |   24 +-
 configure.ac                                   |    4 +-
 irplib/irplib_framelist.c                      |    2 +-
 irplib/irplib_ppm.c                            |   23 +-
 irplib/irplib_slitpos.c                        |   28 +-
 irplib/irplib_spectrum.c                       |   25 +-
 irplib/irplib_strehl.c                         |   12 +-
 irplib/irplib_utils.c                          |  103 +-
 irplib/irplib_wavecal.c                        |   23 +-
 irplib/irplib_wlxcorr.c                        |   29 +-
 irplib/tests/irplib_wlxcorr-test.c             |   20 +-
 kmos/kmo_dfs.c                                 |    2 +-
 kmos/kmo_dfs.h                                 |    2 +-
 kmos/kmo_priv_extract_spec.c                   |    2 +-
 kmos/kmo_priv_flat.c                           | 6790 ++++++++++++------------
 kmos/kmo_priv_flat.h                           |  127 +-
 kmos/kmo_priv_sky_tweak.c                      | 1843 ++++---
 kmos/kmo_priv_sky_tweak.h                      |   50 +-
 kmos/kmo_priv_wave_cal.c                       | 2463 ++++-----
 kmos/kmo_priv_wave_cal.h                       |   18 +-
 kmos/tests/kmo_priv_sky_tweak-test.c           |  193 +-
 m4macros/eso.m4                                |   11 +
 recipes/Makefile.am                            |   12 +-
 recipes/Makefile.in                            |   46 +-
 recipes/kmo_extract_spec.c                     |   33 +-
 recipes/kmo_sci_red.c                          |    2 +-
 recipes/kmo_sky_tweak.c                        |  369 --
 recipes/kmos_illumination.c                    |    2 +-
 recipes/kmos_sky_tweak.c                       |  343 ++
 recipes/kmos_wave_cal.c                        |   48 +-
 tools/{easySPARK => }/Makefile                 |   61 +-
 tools/{easySPARK => }/Makefile.am              |   12 +-
 tools/{easySPARK => }/Makefile.in              |   19 +-
 tools/SPARKplug/BufferedSelect.pm              |  187 -
 tools/SPARKplug/MListbox.pm                    | 1120 ----
 tools/SPARKplug/SPARKplug.pl                   |  181 -
 tools/SPARKplug/calibration_script.pl          |  199 -
 tools/SPARKplug/configuration.pl               |  317 --
 tools/SPARKplug/dfits_fitsort.pl               |  223 -
 tools/SPARKplug/main_window.pl                 |  929 ----
 tools/SPARKplug/parallelProcessing.pl          |  100 -
 tools/SPARKplug/read_fits.pl                   |  239 -
 tools/SPARKplug/run_calibrations.pl            |  446 --
 tools/easySPARK/easySPARK_calibration.sh       |  835 ---
 tools/easySPARK/easySPARK_calibration_kill.sh  |   40 -
 tools/easySPARK/easySPARK_dark.sh              |  175 -
 tools/easySPARK/easySPARK_flat.sh              |  352 --
 tools/easySPARK/easySPARK_illumination.sh      |  178 -
 tools/easySPARK/easySPARK_illumination_flat.sh |  161 -
 tools/easySPARK/easySPARK_multi_reconstruct.sh |  192 -
 tools/easySPARK/easySPARK_reconstruct.sh       |  193 -
 tools/easySPARK/easySPARK_sci_red.sh           |  192 -
 tools/easySPARK/easySPARK_std_star.sh          |  191 -
 tools/easySPARK/easySPARK_test.sh              |  457 --
 tools/easySPARK/easySPARK_wave_cal.sh          |  255 -
 tools/kmos_calib.py                            |  531 ++
 tools/kmos_verify.py                           |  200 +
 60 files changed, 6671 insertions(+), 13969 deletions(-)

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