[cpl-plugin-kmos] 02/03: Merge branch 'upstream' into debian
Ole Streicher
olebole-guest at moszumanska.debian.org
Mon Mar 10 12:23:18 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to tag debian/1.3.0+dfsg-1
in repository cpl-plugin-kmos.
commit 92a7fea6f5f633917cc016774474f602b93893e0
Merge: f886b85 a809938
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Mar 10 11:16:11 2014 +0100
Merge branch 'upstream' into debian
Conflicts:
recipes/kmo_dev_setup.c
recipes/tests/Makefile.am
recipes/tests/Makefile.in
recipes/tests/create_data_recipes.c
recipes/tests/kmo_arithmetic-test.c
recipes/tests/kmo_combine-test.c
recipes/tests/kmo_copy-test.c
recipes/tests/kmo_dark-test.c
recipes/tests/kmo_dev_setup-test.c
recipes/tests/kmo_extract_spec-test.c
recipes/tests/kmo_final-test.c
recipes/tests/kmo_final_test.sh
recipes/tests/kmo_fit_profile-test.c
recipes/tests/kmo_fits_check-test.c
recipes/tests/kmo_fits_stack-test.c
recipes/tests/kmo_fits_strip-test.c
recipes/tests/kmo_flat-test.c
recipes/tests/kmo_illumination-test.c
recipes/tests/kmo_illumination_flat-test.c
recipes/tests/kmo_make_image-test.c
recipes/tests/kmo_multi_reconstruct-test.c
recipes/tests/kmo_noise_map-test.c
recipes/tests/kmo_reconstruct-test.c
recipes/tests/kmo_rotate-test.c
recipes/tests/kmo_sci_red-test.c
recipes/tests/kmo_shift-test.c
recipes/tests/kmo_sky_mask-test.c
recipes/tests/kmo_stats-test.c
recipes/tests/kmo_std_star-test.c
recipes/tests/kmo_wave_cal-test.c
Makefile.am | 2 +-
Makefile.in | 2 +-
calib/dic/ESO-DFS-DIC.KMOS_QC | 18 +
calib/dic/ESO-VLT-DIC.NGCCON | 238 --
calib/dic/ESO-VLT-DIC.NGCDCS | 5117 --------------------------
calib/gasgano/config/KMOS.prefs | 2 +-
calib/gasgano/config/kmos.oca | 3 +-
configure | 51 +-
configure.ac | 6 +-
irplib/tests/irplib_polynomial-test.c | 7 +
irplib/tests/irplib_strehl-test.c | 226 +-
kmclipm/include/kmclipm_functions.h | 2 -
kmclipm/src/kmclipm_functions.c | 125 +-
kmclipm/test/kmclipm_test_functions.c | 2 +-
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 | 3 +-
kmclipm/test/kmclipm_test_priv_splines.c | 2 +-
kmclipm/test/kmclipm_test_rtd.c | 2 +-
kmclipm/test/kmclipm_test_vector.c | 2 +-
kmos/kmo_dfs.c | 3962 +++++++++-----------
kmos/kmo_dfs.h | 15 +
kmos/kmo_error.h | 12 +-
kmos/kmo_priv_combine.c | 24 +-
kmos/kmo_priv_dark.c | 151 +-
kmos/kmo_priv_dark.h | 32 +-
kmos/kmo_priv_extract_spec.c | 3 +-
kmos/kmo_priv_flat.c | 1501 ++++----
kmos/kmo_priv_flat.h | 16 -
kmos/kmo_priv_functions.c | 1918 ++++------
kmos/kmo_priv_functions.h | 4 +
kmos/kmo_priv_make_image.c | 220 +-
kmos/kmo_priv_make_image.h | 33 +-
kmos/kmo_priv_sky_tweak.c | 48 +-
kmos/kmo_priv_wave_cal.c | 2753 ++++++--------
kmos/kmo_priv_wave_cal.h | 3 +-
kmos/kmo_utils.c | 605 ++-
kmos/kmo_utils.h | 146 +-
kmos/tests/create_data_kmos.c | 55 +-
kmos/tests/kmo_cpl_extensions-test.c | 12 +-
kmos/tests/kmo_debug-test.c | 14 +-
kmos/tests/kmo_dfs-test.c | 30 +-
kmos/tests/kmo_functions-test.c | 12 +-
kmos/tests/kmo_priv_arithmetic-test.c | 18 +-
kmos/tests/kmo_priv_combine-test.c | 12 +-
kmos/tests/kmo_priv_copy-test.c | 12 +-
kmos/tests/kmo_priv_dark-test.c | 12 +-
kmos/tests/kmo_priv_extract_spec-test.c | 12 +-
kmos/tests/kmo_priv_fit_profile-test.c | 12 +-
kmos/tests/kmo_priv_fits_check-test.c | 12 +-
kmos/tests/kmo_priv_fits_stack-test.c | 12 +-
kmos/tests/kmo_priv_flat-test.c | 12 +-
kmos/tests/kmo_priv_functions-test.c | 12 +-
kmos/tests/kmo_priv_lcorr-test.c | 12 +-
kmos/tests/kmo_priv_make_image-test.c | 38 +-
kmos/tests/kmo_priv_noise_map-test.c | 12 +-
kmos/tests/kmo_priv_reconstruct-test.c | 12 +-
kmos/tests/kmo_priv_rotate-test.c | 12 +-
kmos/tests/kmo_priv_shift-test.c | 12 +-
kmos/tests/kmo_priv_sky_mask-test.c | 12 +-
kmos/tests/kmo_priv_sky_tweak-test.c | 19 +-
kmos/tests/kmo_priv_stats-test.c | 12 +-
kmos/tests/kmo_priv_std_star-test.c | 12 +-
kmos/tests/kmo_priv_wave_cal-test.c | 12 +-
kmos/tests/kmo_utils-test.c | 16 +-
recipes/Makefile.am | 18 +-
recipes/Makefile.in | 249 +-
recipes/kmo_arithmetic.c | 14 +-
recipes/kmo_combine.c | 35 +-
recipes/kmo_copy.c | 12 +-
recipes/kmo_dark.c | 668 ++--
recipes/kmo_dev_setup.c | 1244 -------
recipes/kmo_extract_spec.c | 30 +-
recipes/kmo_fit_profile.c | 12 +-
recipes/kmo_fits_check.c | 12 +-
recipes/kmo_fits_stack.c | 12 +-
recipes/kmo_fits_strip.c | 12 +-
recipes/kmo_flat.c | 1476 +++-----
recipes/kmo_illumination.c | 21 +-
recipes/kmo_illumination_flat.c | 32 +-
recipes/kmo_make_image.c | 449 +--
recipes/kmo_multi_reconstruct.c | 20 +-
recipes/kmo_noise_map.c | 12 +-
recipes/kmo_reconstruct.c | 352 +-
recipes/kmo_rotate.c | 12 +-
recipes/kmo_sci_red.c | 2488 ++++++-------
recipes/kmo_shift.c | 12 +-
recipes/kmo_sky_mask.c | 26 +-
recipes/kmo_sky_tweak.c | 280 +-
recipes/kmo_stats.c | 12 +-
recipes/kmo_std_star.c | 21 +-
recipes/kmo_wave_cal.c | 829 ++---
recipes/tests/Makefile.am | 180 -
recipes/tests/Makefile.in | 1045 ------
recipes/tests/create_data_recipes.c | 2349 ------------
recipes/tests/kmo_arithmetic-test.c | 508 ---
recipes/tests/kmo_combine-test.c | 1082 ------
recipes/tests/kmo_copy-test.c | 455 ---
recipes/tests/kmo_dark-test.c | 503 ---
recipes/tests/kmo_dev_setup-test.c | 139 -
recipes/tests/kmo_extract_spec-test.c | 447 ---
recipes/tests/kmo_final-test.c | 69 -
recipes/tests/kmo_final_test.sh | 29 -
recipes/tests/kmo_fit_profile-test.c | 822 -----
recipes/tests/kmo_fits_check-test.c | 115 -
recipes/tests/kmo_fits_stack-test.c | 347 --
recipes/tests/kmo_fits_strip-test.c | 114 -
recipes/tests/kmo_flat-test.c | 775 ----
recipes/tests/kmo_illumination-test.c | 170 -
recipes/tests/kmo_illumination_flat-test.c | 168 -
recipes/tests/kmo_init-test.c | 39 -
recipes/tests/kmo_make_image-test.c | 362 --
recipes/tests/kmo_multi_reconstruct-test.c | 175 -
recipes/tests/kmo_noise_map-test.c | 211 --
recipes/tests/kmo_reconstruct-test.c | 165 -
recipes/tests/kmo_rotate-test.c | 469 ---
recipes/tests/kmo_sci_red-test.c | 201 -
recipes/tests/kmo_shift-test.c | 418 ---
recipes/tests/kmo_sky_mask-test.c | 257 --
recipes/tests/kmo_stats-test.c | 526 ---
recipes/tests/kmo_std_star-test.c | 270 --
recipes/tests/kmo_wave_cal-test.c | 216 --
reflex/Makefile.am | 4 +-
reflex/Makefile.in | 4 +-
reflex/kmo_sci_red.py | 336 ++
reflex/kmo_std_star.py | 245 ++
reflex/kmo_wave_cal.py | 218 +-
reflex/kmos.xml.in | 4390 +++++++++++++++++-----
reflex/kmos_wkf.oca | 3 +-
regtests/tests/Makefile.am | 16 +
regtests/tests/Makefile.in | 16 +
tools/easySPARK/Makefile | 38 +-
133 files changed, 12373 insertions(+), 31575 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-kmos.git
More information about the debian-science-commits
mailing list