[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-guest pushed a commit to branch debian
in repository cpl-plugin-kmos.

commit c6146876960a17b984f4e2b9786340df20618057
Merge: 528a3a4 f63a2cc
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Jul 25 14:22:25 2014 +0200

    Merge branch 'upstream' into debian

 calib/cal_size                               |    2 +-
 calib/gasgano/config/KMOS.prefs              |    2 +-
 calib/gasgano/config/kmos.oca                |    8 +-
 configure                                    |   20 +-
 configure.ac                                 |    2 +-
 irplib/irplib_framelist.c                    |    3 +-
 irplib/irplib_mkmaster.c                     |    5 +-
 irplib/irplib_plugin.c                       |   66 +-
 irplib/irplib_utils.c                        |    3 +-
 irplib/irplib_wlxcorr.c                      |    2 +-
 irplib/tests/Makefile.am                     |    2 +-
 irplib/tests/Makefile.in                     |    2 +-
 irplib/tests/irplib_plugin-test.c            |    3 -
 kmclipm/src/kmclipm_functions.c              |    4 +-
 kmclipm/src/kmclipm_rtd_image.c              |   28 +-
 kmclipm/test/kmclipm_test_functions.c        |    6 +-
 kmclipm/test/kmclipm_test_math.c             |    2 +-
 kmclipm/test/kmclipm_test_priv_constants.c   |    2 +-
 kmclipm/test/kmclipm_test_priv_functions.c   |    2 +-
 kmclipm/test/kmclipm_test_priv_reconstruct.c |    2 +-
 kmclipm/test/kmclipm_test_priv_splines.c     |    2 +-
 kmclipm/test/kmclipm_test_rtd.c              |   47 +-
 kmclipm/test/kmclipm_test_vector.c           |    2 +-
 kmos/kmo_debug.c                             |    4 +-
 kmos/kmo_dfs.c                               |   22 +-
 kmos/kmo_dfs.h                               |    4 +
 kmos/kmo_functions.c                         |   48 +-
 kmos/kmo_priv_combine.c                      |  561 +++++----
 kmos/kmo_priv_fits_stack.c                   |   20 +-
 kmos/kmo_priv_flat.c                         |  443 ++++---
 kmos/kmo_priv_flat.h                         |    8 +
 kmos/kmo_priv_functions.c                    |  725 ++++++-----
 kmos/kmo_priv_functions.h                    |   60 +-
 kmos/kmo_priv_wave_cal.c                     | 1650 +++++++++++++-------------
 kmos/kmo_priv_wave_cal.h                     |    3 +-
 kmos/kmo_utils.c                             |    3 +-
 kmos/kmos_pfits.c                            |   17 +-
 kmos/kmos_pfits.h                            |    3 +-
 kmos/tests/kmo_debug-test.c                  |    3 +-
 kmos/tests/kmo_priv_fits_check-test.c        |   20 +-
 kmos/tests/kmo_priv_fits_stack-test.c        |    2 +-
 kmos/tests/kmo_priv_flat-test.c              |   41 +-
 kmos/tests/kmo_priv_functions-test.c         |   76 +-
 recipes/Makefile.am                          |   45 +-
 recipes/Makefile.in                          |  117 +-
 recipes/kmo_combine.c                        |    6 +-
 recipes/kmo_dark.c                           |  720 -----------
 recipes/kmo_extract_spec.c                   |    4 +-
 recipes/kmo_flat.c                           | 1424 ----------------------
 recipes/kmo_illumination.c                   | 1563 ------------------------
 recipes/kmo_illumination_flat.c              |    8 +-
 recipes/kmo_make_image.c                     |    4 +-
 recipes/kmo_multi_reconstruct.c              |    8 +-
 recipes/kmo_reconstruct.c                    |    4 +-
 recipes/kmo_sci_red.c                        |    8 +-
 recipes/kmo_sky_mask.c                       |    4 +-
 recipes/kmo_stats.c                          |    4 +-
 recipes/kmo_std_star.c                       |    8 +-
 recipes/kmo_wave_cal.c                       | 1118 -----------------
 recipes/kmos_dark.c                          |  683 +++++++++++
 recipes/kmos_flat.c                          |   36 +-
 recipes/kmos_gen_reflines.c                  |  316 +++++
 recipes/kmos_illumination.c                  | 1548 ++++++++++++++++++++++++
 recipes/kmos_wave_cal.c                      |  168 ++-
 reflex/Makefile.am                           |    2 +-
 reflex/Makefile.in                           |    2 +-
 reflex/kmos.xml.in                           |   34 +-
 reflex/{kmo_wave_cal.py => kmos_wave_cal.py} |    2 +-
 reflex/kmos_wkf.oca                          |    8 +-
 tools/easySPARK/Makefile                     |   34 +-
 tools/easySPARK/easySPARK_calibration.sh     |    6 +-
 tools/easySPARK/easySPARK_dark.sh            |    8 +-
 tools/easySPARK/easySPARK_flat.sh            |    8 +-
 tools/easySPARK/easySPARK_illumination.sh    |    8 +-
 tools/easySPARK/easySPARK_wave_cal.sh        |    8 +-
 75 files changed, 4811 insertions(+), 7035 deletions(-)

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