[cpl-plugin-xsh] 04/05: Merge branch 'upstream' into debian
Ole Streicher
olebole-guest at moszumanska.debian.org
Fri Apr 11 15:19:58 UTC 2014
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 bd2ebf06819158670b9b2a499494cd0ec2e09560
Merge: e584a32 655cf55
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Apr 11 16:56:02 2014 +0200
Merge branch 'upstream' into debian
COPYING | 4 +-
COPYING.LIB | 4 +-
ChangeLog | 40 +
INSTALL | 7 +-
Makefile.purify.in | 2 +-
README | 78 -
calib/cal_size | 2 +-
calib/dic/ESO-DFS-DIC.XSHOO_QC | 2 +-
calib/dic/ESO-VLT-DIC.XSHOO_CFG | 4 +-
calib/dic/ESO-VLT-DIC.XSHOO_DCS | 2 +-
calib/dic/ESO-VLT-DIC.XSHOO_ICS | 4 +-
calib/dic/ESO-VLT-DIC.XSHOO_OS | 4 +-
calib/gasgano/config/SHOOT.rul | Bin 54740 -> 0 bytes
calib/gasgano/config/XSH.prefs | 53 -
calib/gasgano/config/XSHOO.prefs | 4 +-
calib/gasgano/config/{XSH.rul => XSHOO.rul} | Bin
calib/gasgano/config/{xsh.oca => xshoo.oca} | 739 ++--
configure | 30 +-
configure.ac | 6 +-
recipes/Makefile.am | 218 +-
recipes/Makefile.in | 422 +-
recipes/xsh_2dmap.c | 4 +-
recipes/xsh_cfg_recover.c | 4 +-
recipes/xsh_flexcomp.c | 4 +-
recipes/xsh_geom_ifu.c | 2 +-
recipes/xsh_lingain.c | 6 +-
recipes/xsh_mbias.c | 4 +-
recipes/xsh_mdark.c | 2 +-
recipes/xsh_mflat.c | 4 +-
recipes/xsh_orderpos.c | 2 +-
recipes/xsh_predict.c | 4 +-
recipes/xsh_respon_slit_nod.c | 25 +-
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 | 2 +-
recipes/xsh_scired_slit_nod.c | 27 +-
recipes/xsh_scired_slit_offset.c | 40 +-
recipes/xsh_scired_slit_stare.c | 73 +-
recipes/xsh_util_ifu_offset.c | 9 +-
recipes/xsh_util_ifu_stare.c | 8 +-
recipes/xsh_util_physmod.c | 6 +-
recipes/xsh_wavecal.c | 2 +-
reflex/xsh_calib_interactive_common.py | 23 +-
reflex/xsh_object_interactive_common.py | 34 +-
reflex/xsh_wkf.oca | 213 +-
reflex/xsh_wkf_stare.oca | 105 +-
reflex/xshooter.xml.in | 971 +++--
regtests/tests/Makefile.am | 18 +-
regtests/tests/Makefile.in | 18 +-
setup | 18 +-
xsh/irplib_error.c | 6 +-
xsh/irplib_error.h | 6 +-
xsh/tests/Makefile.am | 26 +-
xsh/tests/Makefile.in | 41 +-
xsh/tests/test-cpl_image_fit_gaussian.c | 4 +-
xsh/tests/test-product_xsh_master_bias.c | 4 +-
xsh/tests/test-xsh_atrous.c | 2 +-
xsh/tests/test-xsh_bspline.c | 7 +-
xsh/tests/test-xsh_bspline_interpol.c | 4 +-
xsh/tests/test-xsh_build_cube.c | 2 +-
xsh/tests/test-xsh_combine_nod.c | 2 +-
xsh/tests/test-xsh_compute_absorp.c | 2 +-
xsh/tests/test-xsh_compute_noise_map.c | 2 +-
xsh/tests/test-xsh_compute_response.c | 4 +-
xsh/tests/test-xsh_compute_shift_ifu.c | 2 +-
xsh/tests/test-xsh_correct_vacuum_to_air.c | 10 +-
xsh/tests/test-xsh_correl_gaussians.c | 32 +-
xsh/tests/test-xsh_cpl_vector_correl_gaussians.c | 8 +-
xsh/tests/test-xsh_create_map.c | 4 +-
xsh/tests/test-xsh_create_master_bias.c | 4 +-
xsh/tests/test-xsh_create_master_dark.c | 4 +-
xsh/tests/test-xsh_create_spectralformat.c | 2 +-
xsh/tests/test-xsh_cube_ext_save.c | 2 +-
xsh/tests/test-xsh_data_atmos_ext.c | 2 +-
xsh/tests/test-xsh_data_cube.c | 2 +-
xsh/tests/test-xsh_data_dispersol.c | 4 +-
xsh/tests/test-xsh_data_order.c | 4 +-
xsh/tests/test-xsh_data_order_2D.c | 2 +-
xsh/tests/test-xsh_data_pre.c | 4 +-
xsh/tests/test-xsh_data_spectralformat.c | 4 +-
xsh/tests/test-xsh_data_spectrum_merge_3d.c | 2 +-
xsh/tests/test-xsh_data_spectrum_order_1D.c | 2 +-
xsh/tests/test-xsh_data_star_flux.c | 2 +-
xsh/tests/test-xsh_data_wave_tab_2d.c | 4 +-
xsh/tests/test-xsh_data_wave_tab_2d_sample.c | 4 +-
xsh/tests/test-xsh_data_wavemap.c | 2 +-
xsh/tests/test-xsh_detect_arclines.c | 4 +-
xsh/tests/test-xsh_detect_continuum.c | 2 +-
xsh/tests/test-xsh_detect_line_file.c | 23 +-
xsh/tests/test-xsh_detect_line_pos.c | 6 +-
xsh/tests/test-xsh_detect_line_pos2.c | 6 +-
xsh/tests/test-xsh_detect_order.c | 2 +-
xsh/tests/test-xsh_divide_flat.c | 2 +-
xsh/tests/test-xsh_extract.c | 2 +-
xsh/tests/test-xsh_extract_clean.c | 2 +-
xsh/tests/test-xsh_extract_clean_sym.c | 50 +-
xsh/tests/test-xsh_flat_merge.c | 2 +-
xsh/tests/test-xsh_flux.c | 2 +-
xsh/tests/test-xsh_flux_conservation.c | 2 +-
xsh/tests/test-xsh_format.c | 2 +-
xsh/tests/test-xsh_gaussian_fit.c | 2 +-
xsh/tests/test-xsh_geom_ifu.c | 2 +-
xsh/tests/test-xsh_gsl_correl_gaussians.c | 191 -
xsh/tests/test-xsh_guess.c | 2 +-
xsh/tests/test-xsh_ifu_trace_object.c | 4 +-
xsh/tests/test-xsh_ifu_trace_slices.c | 4 +-
xsh/tests/test-xsh_lambda_err.c | 2 +-
xsh/tests/test-xsh_localize_ifu.c | 2 +-
xsh/tests/test-xsh_localize_obj.c | 2 +-
xsh/tests/test-xsh_mark_tell.c | 2 +-
xsh/tests/test-xsh_merge_ord.c | 2 +-
xsh/tests/test-xsh_model.c | 2 +-
xsh/tests/test-xsh_model_maps_create.c | 2 +-
xsh/tests/test-xsh_opt_extract.c | 2 +-
xsh/tests/test-xsh_pix_convention.c | 2 +-
xsh/tests/test-xsh_prepare.c | 4 +-
xsh/tests/test-xsh_rectify.c | 2 +-
xsh/tests/test-xsh_remove_crh_multiple.c | 2 +-
xsh/tests/test-xsh_remove_crh_single.c | 2 +-
xsh/tests/test-xsh_resid_tab.c | 2 +-
xsh/tests/test-xsh_slitmap.c | 2 +-
xsh/tests/test-xsh_startup.c | 4 +-
xsh/tests/test-xsh_subtract_background.c | 4 +-
xsh/tests/test-xsh_subtract_bias.c | 4 +-
xsh/tests/test-xsh_subtract_dark.c | 4 +-
xsh/tests/test-xsh_subtract_sky_nod.c | 2 +-
xsh/tests/test-xsh_subtract_sky_single.c | 2 +-
xsh/tests/test-xsh_telluric_cor.c | 10 +-
xsh/tests/test-xsh_the_map.c | 2 +-
xsh/tests/test-xsh_tools_perf.c | 4 +-
xsh/tests/test-xsh_wavecal_fwhm.c | 4 +-
xsh/tests/test-xsh_xcorrel_gaussians.c | 4 +-
xsh/tests/tests.c | 4 +-
xsh/tests/tests.h | 9 +-
xsh/xsh_badpixelmap.c | 6 +-
xsh/xsh_badpixelmap.h | 6 +-
xsh/xsh_baryvel.c | 4 +-
xsh/xsh_baryvel.h | 4 +-
xsh/xsh_blaze.c | 4 +-
xsh/xsh_blaze.h | 6 +-
xsh/xsh_calibrate_flux.c | 38 +-
xsh/xsh_compute_absorp.c | 2 +-
xsh/xsh_compute_linearity.c | 4 +-
xsh/xsh_compute_linearity.h | 2 +-
xsh/xsh_compute_noise_map.c | 6 +-
xsh/xsh_compute_response.c | 4861 +++++++++++-----------
xsh/xsh_compute_slice_dist.c | 2 +-
xsh/xsh_create_master.c | 31 +-
xsh/xsh_create_order_table.c | 2 +-
xsh/xsh_create_wavemap.c | 2 +-
xsh/xsh_data_arclist.c | 4 +-
xsh/xsh_data_arclist.h | 4 +-
xsh/xsh_data_atmos_ext.c | 2 +-
xsh/xsh_data_atmos_ext.h | 2 +-
xsh/xsh_data_check.c | 2 +-
xsh/xsh_data_dispersol.c | 4 +-
xsh/xsh_data_dispersol.h | 4 +-
xsh/xsh_data_grid.c | 4 +-
xsh/xsh_data_grid.h | 4 +-
xsh/xsh_data_image_3d.c | 2 +-
xsh/xsh_data_image_3d.h | 2 +-
xsh/xsh_data_instrument.c | 4 +-
xsh/xsh_data_instrument.h | 4 +-
xsh/xsh_data_linetilt.c | 4 +-
xsh/xsh_data_linetilt.h | 2 +-
xsh/xsh_data_localization.c | 2 +-
xsh/xsh_data_localization.h | 2 +-
xsh/xsh_data_order.c | 4 +-
xsh/xsh_data_order.h | 4 +-
xsh/xsh_data_order_resid_tab.c | 2 +-
xsh/xsh_data_order_resid_tab.h | 2 +-
xsh/xsh_data_pre.c | 28 +-
xsh/xsh_data_pre.h | 4 +-
xsh/xsh_data_pre_3d.c | 2 +-
xsh/xsh_data_pre_3d.h | 2 +-
xsh/xsh_data_rec.c | 2 +-
xsh/xsh_data_rec.h | 2 +-
xsh/xsh_data_resid_tab.c | 17 +-
xsh/xsh_data_resid_tab.h | 4 +-
xsh/xsh_data_shift_tab.c | 4 +-
xsh/xsh_data_shift_tab.h | 4 +-
xsh/xsh_data_slice_offset.c | 2 +-
xsh/xsh_data_slice_offset.h | 2 +-
xsh/xsh_data_spectralformat.c | 2 +-
xsh/xsh_data_spectralformat.h | 2 +-
xsh/xsh_data_spectrum.c | 117 +-
xsh/xsh_data_spectrum.h | 9 +-
xsh/xsh_data_spectrum1D.c | 118 +-
xsh/xsh_data_spectrum1D.h | 4 +-
xsh/xsh_data_star_flux.c | 2 +-
xsh/xsh_data_star_flux.h | 2 +-
xsh/xsh_data_the_map.c | 4 +-
xsh/xsh_data_the_map.h | 4 +-
xsh/xsh_data_wavemap.c | 2 +-
xsh/xsh_data_wavemap.h | 2 +-
xsh/xsh_data_wavesol.c | 4 +-
xsh/xsh_data_wavesol.h | 4 +-
xsh/xsh_detect_continuum.c | 2 +-
xsh/xsh_detect_order.c | 4 +-
xsh/xsh_detmon.c | 209 +-
xsh/xsh_detmon.h | 6 +-
xsh/xsh_detmon_body.h | 6 +-
xsh/xsh_detmon_lg.c | 15 +-
xsh/xsh_detmon_lg.h | 6 +-
xsh/xsh_detmon_lg_impl.h | 11 +-
xsh/xsh_dfs.c | 84 +-
xsh/xsh_dfs.h | 4 +-
xsh/xsh_divide.c | 4 +-
xsh/xsh_drl.h | 6 +-
xsh/xsh_drl_check.c | 4 +-
xsh/xsh_drl_check.h | 6 +-
xsh/xsh_dump.c | 13 +-
xsh/xsh_dump.h | 4 +-
xsh/xsh_efficiency_response.c | 2 +-
xsh/xsh_efficiency_response.h | 2 +-
xsh/xsh_error.h | 4 +-
xsh/xsh_extract.c | 2 +-
xsh/xsh_fit.c | 6 +-
xsh/xsh_fit.h | 6 +-
xsh/xsh_fit_body.h | 2 +-
xsh/xsh_flat_merge.c | 2 +-
xsh/xsh_flexcor.c | 4 +-
xsh/xsh_follow_arclines.c | 2 +-
xsh/xsh_format.c | 2 +-
xsh/xsh_globals.h | 6 +-
xsh/xsh_hist.c | 6 +-
xsh/xsh_hist.h | 6 +-
xsh/xsh_ifu.c | 4 +-
xsh/xsh_ifu_defs.h | 2 +-
xsh/xsh_irplib_mkmaster.c | 6 +-
xsh/xsh_irplib_mkmaster.h | 6 +-
xsh/xsh_irplib_utils.c | 6 +-
xsh/xsh_irplib_utils.h | 6 +-
xsh/xsh_localize_obj.c | 2 +-
xsh/xsh_merge_ord.c | 33 +-
xsh/xsh_model_anneal.c | 12 +-
xsh/xsh_model_anneal.h | 6 +-
xsh/xsh_model_arm_constants.h | 2 +-
xsh/xsh_model_cputime.c | 6 +-
xsh/xsh_model_cputime.h | 2 +-
xsh/xsh_model_io.c | 8 +-
xsh/xsh_model_io.h | 6 +-
xsh/xsh_model_kernel.c | 9 +-
xsh/xsh_model_kernel.h | 6 +-
xsh/xsh_model_metric.c | 8 +-
xsh/xsh_model_metric.h | 6 +-
xsh/xsh_model_r250.c | 12 +-
xsh/xsh_model_r250.h | 2 +-
xsh/xsh_model_randlcg.c | 6 +-
xsh/xsh_model_randlcg.h | 2 +-
xsh/xsh_model_ref_ind.h | 2 +-
xsh/xsh_model_sa.c | 6 +-
xsh/xsh_model_sa.h | 2 +-
xsh/xsh_model_utils.c | 6 +-
xsh/xsh_model_utils.h | 6 +-
xsh/xsh_msg.c | 4 +-
xsh/xsh_msg.h | 4 +-
xsh/xsh_multiply.c | 4 +-
xsh/xsh_opt_extract.c | 2 +-
xsh/xsh_paf_save.c | 7 +-
xsh/xsh_paf_save.h | 6 +-
xsh/xsh_parameters.c | 15 +-
xsh/xsh_parameters.h | 8 +-
xsh/xsh_pfits.c | 19 +-
xsh/xsh_pfits.h | 8 +-
xsh/xsh_pfits_qc.c | 23 +-
xsh/xsh_pfits_qc.h | 6 +-
xsh/xsh_prepare.c | 4 +-
xsh/xsh_qc_definition.h | 9 +-
xsh/xsh_qc_handling.c | 4 +-
xsh/xsh_qc_handling.h | 2 +-
xsh/xsh_rectify.c | 2 +-
xsh/xsh_rectify.h | 6 +-
xsh/xsh_remove_crh_multi.c | 7 +-
xsh/xsh_remove_crh_single.c | 2 +-
xsh/xsh_spectrum.c | 6 +-
xsh/xsh_spectrum.h | 6 +-
xsh/xsh_star_index.c | 6 +-
xsh/xsh_star_index.h | 2 +-
xsh/xsh_subtract.c | 4 +-
xsh/xsh_subtract_sky_offset.c | 2 +-
xsh/xsh_subtract_sky_single.c | 39 +-
xsh/xsh_time.c | 6 +-
xsh/xsh_time.h | 6 +-
xsh/xsh_utils.c | 31 +-
xsh/xsh_utils.h | 4 +-
xsh/xsh_utils_efficiency.c | 12 +-
xsh/xsh_utils_efficiency.h | 2 +-
xsh/xsh_utils_ifu.c | 2725 ++++++------
xsh/xsh_utils_ifu.h | 5 +-
xsh/xsh_utils_image.c | 109 +-
xsh/xsh_utils_image.h | 5 +-
xsh/xsh_utils_imagelist.c | 60 +-
xsh/xsh_utils_imagelist.h | 10 +-
xsh/xsh_utils_polynomial.c | 4 +-
xsh/xsh_utils_polynomial.h | 4 +-
xsh/xsh_utils_response.c | 33 +-
xsh/xsh_utils_response.h | 2 +-
xsh/xsh_utils_scired_slit.c | 166 +-
xsh/xsh_utils_scired_slit.h | 33 +-
xsh/xsh_utils_table.c | 4 +-
xsh/xsh_utils_table.h | 4 +-
xsh/xsh_utils_vector.c | 10 +-
xsh/xsh_utils_vector.h | 4 +-
305 files changed, 6858 insertions(+), 6475 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-xsh.git
More information about the debian-science-commits
mailing list