[cpl-plugin-sinfo] 04/05: Merge branch 'upstream' into debian

Ole Streicher olebole-guest at moszumanska.debian.org
Fri Apr 11 14:33:51 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-sinfo.

commit e56a8a85a8a035f26d5353d9898817b0e318ad25
Merge: c2e73cc 1147b44
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 11 14:15:07 2014 +0200

    Merge branch 'upstream' into debian

 ChangeLog                                        |   11 +
 Makefile.purify.in                               |    2 +-
 calib/dic/ESO-DFS-DIC.SINFONI_QC                 |    2 +-
 calib/dic/ESO-VLT-DIC.MACS_ICS                   | 2158 --------
 calib/dic/ESO-VLT-DIC.SPIF_ICS                   | 3777 --------------
 calib/gasgano/config/SINFO.prefs                 |    2 +-
 configure                                        |   24 +-
 configure.ac                                     |    4 +-
 irplib/irplib_calib.c                            |    6 +-
 irplib/irplib_calib.h                            |    6 +-
 irplib/irplib_cat.c                              |    6 +-
 irplib/irplib_cat.h                              |    6 +-
 irplib/irplib_distortion.c                       |   20 +-
 irplib/irplib_distortion.h                       |    6 +-
 irplib/irplib_flat.c                             |    6 +-
 irplib/irplib_flat.h                             |    6 +-
 irplib/irplib_framelist.c                        |   16 +-
 irplib/irplib_framelist.h                        |    6 +-
 irplib/irplib_hist.c                             |    6 +-
 irplib/irplib_hist.h                             |    6 +-
 irplib/irplib_ksigma_clip.c                      |    6 +-
 irplib/irplib_ksigma_clip.h                      |    6 +-
 irplib/irplib_ksigma_clip_body.h                 |    6 +-
 irplib/irplib_match_cats.c                       |    6 +-
 irplib/irplib_match_cats.h                       |    6 +-
 irplib/irplib_mkmaster.c                         |    6 +-
 irplib/irplib_mkmaster.h                         |    6 +-
 irplib/irplib_oddeven.c                          |    6 +-
 irplib/irplib_oddeven.h                          |    6 +-
 irplib/irplib_plugin.c                           |   12 +-
 irplib/irplib_plugin.h                           |    6 +-
 irplib/irplib_polynomial.c                       |  179 +-
 irplib/irplib_polynomial.h                       |   32 +-
 irplib/irplib_ppm.c                              |    6 +-
 irplib/irplib_ppm.h                              |    6 +-
 irplib/irplib_slitpos.c                          |    6 +-
 irplib/irplib_slitpos.h                          |    6 +-
 irplib/irplib_spectrum.c                         |    6 +-
 irplib/irplib_spectrum.h                         |    6 +-
 irplib/irplib_stdstar.c                          |    6 +-
 irplib/irplib_stdstar.h                          |    6 +-
 irplib/irplib_strehl.c                           |  952 ++--
 irplib/irplib_strehl.h                           |   69 +-
 irplib/irplib_utils.c                            |    6 +-
 irplib/irplib_utils.h                            |   11 +-
 irplib/irplib_wavecal.c                          |    6 +-
 irplib/irplib_wavecal.h                          |    6 +-
 irplib/irplib_wavecal_impl.h                     |    6 +-
 irplib/irplib_wcs.c                              |    6 +-
 irplib/irplib_wcs.h                              |    6 +-
 irplib/irplib_wlxcorr.c                          |    6 +-
 irplib/irplib_wlxcorr.h                          |    6 +-
 irplib/tests/Makefile.am                         |    5 +
 irplib/tests/Makefile.in                         |   21 +-
 irplib/tests/irplib_cat-test.c                   |    6 +-
 irplib/tests/irplib_framelist-test.c             |   19 +
 irplib/tests/irplib_polynomial-test.c            |   19 +-
 irplib/tests/irplib_strehl-test.c                |  841 +++
 irplib/tests/irplib_wcs-test.c                   |    6 +-
 irplib/tests/irplib_wlxcorr-test.c               |    6 +-
 recipes/Makefile.am                              |  171 +-
 recipes/Makefile.in                              |  311 +-
 recipes/sinfo_rec_detlin.c                       |  167 +-
 recipes/sinfo_rec_distortion.c                   | 1065 ++--
 recipes/sinfo_rec_jitter.c                       |  309 +-
 recipes/sinfo_rec_mdark.c                        |  391 +-
 recipes/sinfo_rec_mflat.c                        |  226 +-
 recipes/sinfo_rec_pupil.c                        |  212 +-
 recipes/sinfo_rec_wavecal.c                      |  451 +-
 recipes/sinfo_utl_bp_mask_add.c                  |  199 +-
 recipes/sinfo_utl_cube2ima.c                     |   49 +-
 recipes/sinfo_utl_cube2spectrum.c                |   99 +-
 recipes/sinfo_utl_cube_arith.c                   |   58 +-
 recipes/sinfo_utl_cube_combine.c                 |   71 +-
 recipes/sinfo_utl_cube_create.c                  |  731 ++-
 recipes/sinfo_utl_ima_arith.c                    |  232 +-
 recipes/sinfo_utl_ima_line_corr.c                |  141 +-
 recipes/sinfo_utl_line_oh_select.c               |   56 +-
 recipes/sinfo_utl_skycor.c                       |  214 +-
 recipes/sinfo_utl_skymap.c                       |  142 +-
 recipes/sinfo_utl_spectrum_divide_by_blackbody.c |   43 +-
 recipes/sinfo_utl_spectrum_wavelength_shift.c    |   57 +-
 recipes/tests/Makefile.am                        |    2 +-
 recipes/tests/Makefile.in                        |    2 +-
 recipes/tests/recipe_main.c                      |    6 +-
 reflex/sinfo.xml.in                              |  587 ++-
 reflex/sinfo_wkf.oca                             |   12 +-
 regtests/tests/Makefile.am                       |   18 +-
 regtests/tests/Makefile.in                       |   18 +-
 setup                                            |    4 +-
 sinfoni/sinfo_absolute.c                         |  834 +--
 sinfoni/sinfo_absolute.h                         |    2 +-
 sinfoni/sinfo_atmo_disp.c                        |  430 +-
 sinfoni/sinfo_atmo_disp.h                        |    2 +-
 sinfoni/sinfo_bad_cfg.c                          |    6 +-
 sinfoni/sinfo_baddist_ini_by_cpl.c               |    4 +-
 sinfoni/sinfo_badnorm_ini_by_cpl.c               |    4 +-
 sinfoni/sinfo_badsky_cfg.c                       |   47 +-
 sinfoni/sinfo_badsky_ini_by_cpl.c                |    4 +-
 sinfoni/sinfo_balance.c                          |  160 +-
 sinfoni/sinfo_baryvel.c                          |   16 +-
 sinfoni/sinfo_baryvel.h                          |    9 +-
 sinfoni/sinfo_boltzmann.c                        |  883 ++--
 sinfoni/sinfo_bp_config.c                        |   68 +-
 sinfoni/sinfo_bp_config.h                        |    6 +-
 sinfoni/sinfo_bp_dist_config.c                   |  394 +-
 sinfoni/sinfo_bp_dist_config.h                   |    6 +-
 sinfoni/sinfo_bp_lin.c                           |  446 +-
 sinfoni/sinfo_bp_lin.h                           |    2 +-
 sinfoni/sinfo_bp_lin_config.c                    |  160 +-
 sinfoni/sinfo_bp_lin_config.h                    |    6 +-
 sinfoni/sinfo_bp_noise.c                         |   50 +-
 sinfoni/sinfo_bp_noise.h                         |    2 +-
 sinfoni/sinfo_bp_noise_config.c                  |  130 +-
 sinfoni/sinfo_bp_noise_config.h                  |    6 +-
 sinfoni/sinfo_bp_norm.c                          |  656 +--
 sinfoni/sinfo_bp_norm.h                          |    2 +-
 sinfoni/sinfo_bp_norm_config.c                   |  398 +-
 sinfoni/sinfo_bp_norm_config.h                   |    6 +-
 sinfoni/sinfo_bp_sky_config.c                    |  412 +-
 sinfoni/sinfo_bp_sky_config.h                    |    6 +-
 sinfoni/sinfo_coltilt.c                          |   14 +-
 sinfoni/sinfo_coltilt.h                          |    2 +-
 sinfoni/sinfo_companion.c                        |   36 +-
 sinfoni/sinfo_cube_construct.c                   |   18 +-
 sinfoni/sinfo_cube_construct.h                   |    2 +-
 sinfoni/sinfo_dark_cfg.c                         |    4 +-
 sinfoni/sinfo_dark_config.c                      |  326 +-
 sinfoni/sinfo_dark_config.h                      |    6 +-
 sinfoni/sinfo_dark_ini_by_cpl.c                  |  290 +-
 sinfoni/sinfo_detlin.c                           |  300 +-
 sinfoni/sinfo_detlin.h                           |    2 +-
 sinfoni/sinfo_detlin_cfg.c                       |    6 +-
 sinfoni/sinfo_detlin_ini_by_cpl.c                |  242 +-
 sinfoni/sinfo_detnoise_cfg.c                     |    4 +-
 sinfoni/sinfo_detnoise_ini_by_cpl.c              |  278 +-
 sinfoni/sinfo_dfs.c                              | 6014 +++++++++++-----------
 sinfoni/sinfo_dfs.h                              |    7 +-
 sinfoni/sinfo_distortion.c                       |   25 +-
 sinfoni/sinfo_distortion.h                       |    6 +-
 sinfoni/sinfo_distortion_config.c                |  842 +--
 sinfoni/sinfo_distortion_config.h                |    6 +-
 sinfoni/sinfo_dump.c                             |  418 +-
 sinfoni/sinfo_dump.h                             |    9 +-
 sinfoni/sinfo_error.h                            |    9 +-
 sinfoni/sinfo_fft_base.c                         |  206 +-
 sinfoni/sinfo_fft_base.h                         |    4 +-
 sinfoni/sinfo_file_handling.c                    |   22 +-
 sinfoni/sinfo_finddist_cfg.c                     |    6 +-
 sinfoni/sinfo_finddist_ini_by_cpl.c              |    4 +-
 sinfoni/sinfo_fit.c                              |  664 ++-
 sinfoni/sinfo_fit_curve.c                        |  143 +-
 sinfoni/sinfo_fit_curve.h                        |    4 +-
 sinfoni/sinfo_flat_cfg.c                         |   46 +-
 sinfoni/sinfo_flat_ini_by_cpl.c                  |  582 +--
 sinfoni/sinfo_focus.c                            |    5 +-
 sinfoni/sinfo_focus.h                            |    2 +-
 sinfoni/sinfo_focus_cfg.c                        |   44 +-
 sinfoni/sinfo_focus_determination_config.c       |  420 +-
 sinfoni/sinfo_focus_determination_config.h       |    6 +-
 sinfoni/sinfo_focus_ini_by_cpl.c                 |    4 +-
 sinfoni/sinfo_function_1d.c                      |  206 +-
 sinfoni/sinfo_function_1d.h                      |    4 +-
 sinfoni/sinfo_functions.h                        |    8 +-
 sinfoni/sinfo_general_config.c                   |  106 +-
 sinfoni/sinfo_general_config.h                   |    6 +-
 sinfoni/sinfo_globals.c                          |  198 +-
 sinfoni/sinfo_globals.h                          |    6 +-
 sinfoni/sinfo_hidden.h                           |    6 +-
 sinfoni/sinfo_image_ops.c                        | 1768 +++----
 sinfoni/sinfo_image_ops.h                        |    2 +-
 sinfoni/sinfo_ipow.c                             |   16 +-
 sinfoni/sinfo_ipow.h                             |    4 +-
 sinfoni/sinfo_key_names.h                        |    6 +-
 sinfoni/sinfo_lamp_cfg.c                         |   43 +-
 sinfoni/sinfo_lamp_flats_config.c                |  562 +-
 sinfoni/sinfo_lamp_flats_config.h                |    6 +-
 sinfoni/sinfo_lamp_ini_by_cpl.c                  |  176 +-
 sinfoni/sinfo_lamp_spec_config.c                 |  124 +-
 sinfoni/sinfo_lamp_spec_config.h                 |    6 +-
 sinfoni/sinfo_local_types.h                      |    4 +-
 sinfoni/sinfo_matrix.c                           |  456 +-
 sinfoni/sinfo_matrix.h                           |    4 +-
 sinfoni/sinfo_median.c                           |   36 +-
 sinfoni/sinfo_median.h                           |    4 +-
 sinfoni/sinfo_merge.c                            |   20 +-
 sinfoni/sinfo_merge.h                            |    2 +-
 sinfoni/sinfo_msg.c                              |  243 +-
 sinfoni/sinfo_msg.h                              |    4 +-
 sinfoni/sinfo_new_add_bp_map.c                   |  370 +-
 sinfoni/sinfo_new_add_bp_map.h                   |    2 +-
 sinfoni/sinfo_new_bezier.c                       | 2242 ++++----
 sinfoni/sinfo_new_bezier.h                       |    2 +-
 sinfoni/sinfo_new_cube_ops.c                     | 4105 +++++++--------
 sinfoni/sinfo_new_cubes_build.c                  | 1622 +++---
 sinfoni/sinfo_new_cubes_build.h                  |    2 +-
 sinfoni/sinfo_new_cubes_coadd.c                  | 1004 ++--
 sinfoni/sinfo_new_cubes_coadd.h                  |    2 +-
 sinfoni/sinfo_new_dark.c                         |  807 +--
 sinfoni/sinfo_new_dark.h                         |    2 +-
 sinfoni/sinfo_new_find_distortions.c             | 1172 ++---
 sinfoni/sinfo_new_find_distortions.h             |    2 +-
 sinfoni/sinfo_new_lamp_flats.c                   | 1434 +++---
 sinfoni/sinfo_new_lamp_flats.h                   |    2 +-
 sinfoni/sinfo_new_nst.c                          |  494 +-
 sinfoni/sinfo_new_nst.h                          |    2 +-
 sinfoni/sinfo_new_objnod.c                       |   30 +-
 sinfoni/sinfo_new_objnod.h                       |    2 +-
 sinfoni/sinfo_new_prepare_stacked_frames.c       |    8 +-
 sinfoni/sinfo_new_prepare_stacked_frames.h       |    2 +-
 sinfoni/sinfo_new_psf.c                          | 2884 ++++++-----
 sinfoni/sinfo_new_psf.h                          |    2 +-
 sinfoni/sinfo_new_resampling.c                   |   80 +-
 sinfoni/sinfo_new_resampling.h                   |    4 +-
 sinfoni/sinfo_new_slit_pos.c                     |   10 +-
 sinfoni/sinfo_new_slit_pos.h                     |    2 +-
 sinfoni/sinfo_new_stdstar.c                      |   11 +-
 sinfoni/sinfo_new_stdstar.h                      |    2 +-
 sinfoni/sinfo_new_wave_cal_slit2.c               | 1316 ++---
 sinfoni/sinfo_new_wave_cal_slit2.h               |    2 +-
 sinfoni/sinfo_north_south_test_config.c          |  217 +-
 sinfoni/sinfo_north_south_test_config.h          |    6 +-
 sinfoni/sinfo_ns_cfg.c                           |   46 +-
 sinfoni/sinfo_ns_ini_by_cpl.c                    |  408 +-
 sinfoni/sinfo_object_cfg.c                       |    2 +-
 sinfoni/sinfo_objnod_config.c                    |  612 +--
 sinfoni/sinfo_objnod_config.h                    |    6 +-
 sinfoni/sinfo_objnod_ini_by_cpl.c                |    4 +-
 sinfoni/sinfo_objspider_config.c                 |  444 +-
 sinfoni/sinfo_objspider_config.h                 |    6 +-
 sinfoni/sinfo_objspider_ini_by_cpl.c             |    8 +-
 sinfoni/sinfo_pfits.c                            |  180 +-
 sinfoni/sinfo_pfits.h                            |    6 +-
 sinfoni/sinfo_pixel_handling.c                   |  135 +-
 sinfoni/sinfo_pixel_handling.h                   |    4 +-
 sinfoni/sinfo_poly2d.c                           |   14 +-
 sinfoni/sinfo_poly2d.h                           |    4 +-
 sinfoni/sinfo_prepare_stacked_frames_config.c    |  364 +-
 sinfoni/sinfo_prepare_stacked_frames_config.h    |    6 +-
 sinfoni/sinfo_pro_save.c                         |  974 ++--
 sinfoni/sinfo_pro_types.h                        |    6 +-
 sinfoni/sinfo_product_config.c                   |   66 +-
 sinfoni/sinfo_product_config.h                   |    6 +-
 sinfoni/sinfo_psf_cfg.c                          |    2 +-
 sinfoni/sinfo_psf_config.c                       |   50 +-
 sinfoni/sinfo_psf_config.h                       |    6 +-
 sinfoni/sinfo_psf_ini_by_cpl.c                   |    4 +-
 sinfoni/sinfo_qr.c                               |  302 +-
 sinfoni/sinfo_raw_types.h                        |    6 +-
 sinfoni/sinfo_rec_utils.c                        | 1939 ++++---
 sinfoni/sinfo_rec_utils.h                        |    6 +-
 sinfoni/sinfo_recipes.c                          |    4 +-
 sinfoni/sinfo_recipes.h                          |    2 +-
 sinfoni/sinfo_ref_types.h                        |    6 +-
 sinfoni/sinfo_remove_crh_single.c                |  660 ++-
 sinfoni/sinfo_resampling.c                       |   28 +-
 sinfoni/sinfo_resampling.h                       |    4 +-
 sinfoni/sinfo_shift_images.c                     |    8 +-
 sinfoni/sinfo_shift_images.h                     |    2 +-
 sinfoni/sinfo_skycor.c                           |  127 +-
 sinfoni/sinfo_skycor.h                           |    6 +-
 sinfoni/sinfo_skycor_config.c                    |  208 +-
 sinfoni/sinfo_skycor_config.h                    |    6 +-
 sinfoni/sinfo_solve_poly_root.c                  |   92 +-
 sinfoni/sinfo_spectrum_ops.c                     |   14 +-
 sinfoni/sinfo_spectrum_ops.h                     |    2 +-
 sinfoni/sinfo_spiffi_types.h                     |    2 +-
 sinfoni/sinfo_stack_cfg.c                        |   48 +-
 sinfoni/sinfo_stack_ini_by_cpl.c                 |    4 +-
 sinfoni/sinfo_stacked_hidden_config.c            |   46 +-
 sinfoni/sinfo_stacked_hidden_config.h            |    6 +-
 sinfoni/sinfo_standard_star_config.c             |  198 +-
 sinfoni/sinfo_standard_star_config.h             |    6 +-
 sinfoni/sinfo_standstar_cfg.c                    |   48 +-
 sinfoni/sinfo_standstar_ini_by_cpl.c             |  289 +-
 sinfoni/sinfo_star_index.c                       |  436 +-
 sinfoni/sinfo_star_index.h                       |    7 +-
 sinfoni/sinfo_svd.c                              |  596 +--
 sinfoni/sinfo_svd.h                              |    2 +-
 sinfoni/sinfo_tilt_cfg.c                         |    6 +-
 sinfoni/sinfo_time.c                             |   44 +-
 sinfoni/sinfo_time.h                             |    6 +-
 sinfoni/sinfo_tpl_dfs.c                          |  249 +-
 sinfoni/sinfo_tpl_dfs.h                          |    6 +-
 sinfoni/sinfo_tpl_utils.c                        |   80 +-
 sinfoni/sinfo_tpl_utils.h                        |    6 +-
 sinfoni/sinfo_utilities.c                        | 1249 ++---
 sinfoni/sinfo_utilities.h                        |    6 +-
 sinfoni/sinfo_utilities_scired.c                 |   12 +-
 sinfoni/sinfo_utils.c                            |   87 +-
 sinfoni/sinfo_utils.h                            |    4 +-
 sinfoni/sinfo_utils_wrappers.c                   |  170 +-
 sinfoni/sinfo_utl_cube2ima.c                     |  127 +-
 sinfoni/sinfo_utl_cube2ima.h                     |    6 +-
 sinfoni/sinfo_utl_cube2spectrum.c                |  454 +-
 sinfoni/sinfo_utl_cube2spectrum.h                |    6 +-
 sinfoni/sinfo_utl_cube_arith.c                   |  480 +-
 sinfoni/sinfo_utl_cube_arith.h                   |    6 +-
 sinfoni/sinfo_utl_cube_combine.c                 |   21 +-
 sinfoni/sinfo_utl_cube_combine.h                 |    6 +-
 sinfoni/sinfo_utl_efficiency.c                   |   10 +-
 sinfoni/sinfo_utl_efficiency.h                   |    2 +-
 sinfoni/sinfo_utl_spectrum_divide_by_blackbody.c |  166 +-
 sinfoni/sinfo_utl_spectrum_divide_by_blackbody.h |    6 +-
 sinfoni/sinfo_utl_spectrum_wavelength_shift.c    |  180 +-
 sinfoni/sinfo_utl_spectrum_wavelength_shift.h    |    6 +-
 sinfoni/sinfo_vltPort.h                          |    2 +-
 sinfoni/sinfo_wave_calibration.c                 | 1062 ++--
 sinfoni/sinfo_wave_calibration.h                 |    2 +-
 sinfoni/sinfo_wavecal.c                          | 1694 +++---
 sinfoni/sinfo_wavecal.h                          |    2 +-
 sinfoni/sinfo_wavecal_cfg.c                      |   46 +-
 sinfoni/sinfo_wavecal_config.c                   |  652 +--
 sinfoni/sinfo_wavecal_config.h                   |    6 +-
 sinfoni/sinfo_wavecal_ini_by_cpl.c               |  652 +--
 sinfoni/sinfo_wcal_functions.c                   |  542 +-
 sinfoni/sinfo_wcal_functions.h                   |    8 +-
 sinfoni/tests/sinfo_cube_coadd_test.c            |   19 +-
 sinfoni/tests/sinfo_cube_ops_test.c              |   39 +-
 sinfoni/tests/sinfo_efficiency_test.c            |   11 +-
 sinfoni/tests/sinfo_gauss_fit_test.c             |    7 +-
 sinfoni/tests/sinfo_image_ops_test.c             |   44 +-
 sinfoni/tests/sinfo_kappa_sigma_test.c           |    4 +-
 sinfoni/tests/sinfo_line_corr_test.c             |    4 +-
 sinfoni/tests/sinfo_skycor_test.c                |    9 +-
 sinfoni/tests/sinfo_star_catalog.c               |    2 +-
 sinfoni/tests/sinfo_star_index_test.c            |    2 +-
 sinfoni/tests/sinfo_strehl_test.c                |   30 +-
 sinfoni/tests/sinfo_table_ops_test.c             |    9 +-
 sinfoni/tests/test_atmo_disp.c                   |    2 +-
 330 files changed, 31992 insertions(+), 37241 deletions(-)

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



More information about the debian-science-commits mailing list