[cpl-plugin-fors] 02/03: 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-fors.

commit e4234049e69b34ee421de27e817f14e8100fa4b9
Merge: 028dd82 a07efb5
Author: Ole Streicher <olebole at debian.org>
Date:   Sat Apr 18 17:43:59 2015 +0200

    Merge branch 'upstream' into debian

 admin/config.guess                               |   313 +-
 admin/config.sub                                 |    56 +-
 calib/cal_size                                   |     2 +-
 calib/dic/ESO-DFS-DIC.FORS2_QC                   |     5 +-
 calib/gasgano/config/FORS1.prefs                 |     2 +-
 calib/gasgano/config/FORS2.prefs                 |     2 +-
 calib/gasgano/config/fors2.oca                   |     4 +-
 config.h.in                                      |     6 +
 configure                                        |   138 +-
 configure.ac                                     |     8 +-
 fors/fors_bias_impl.cc                           |    39 +-
 fors/fors_dark_impl.cc                           |     2 +-
 fors/fors_detmodel.cc                            |    17 +
 fors/fors_dfs.c                                  |    30 +-
 fors/fors_dfs.h                                  |     1 +
 fors/fors_extract.c                              |     4 +-
 fors/fors_image.c                                |    19 +-
 fors/fors_image.h                                |     2 +-
 fors/fors_img_science_impl.cc                    |     2 +-
 fors/fors_img_screen_flat_impl.cc                |     4 +-
 fors/fors_img_sky_flat_impl.cc                   |     2 +-
 fors/fors_photometry_impl.cc                     |     6 +-
 fors/fors_response.cc                            |    26 +-
 fors/fors_response.h                             |     4 +-
 fors/fors_zeropoint_impl.cc                      |    10 +-
 fors/moses.c                                     |     7 +-
 fors/tests/fors_bias-test.c                      |     2 +-
 fors/tests/fors_image-test.c                     |     2 +-
 fors/tests/fors_stack-test.c                     |     2 +-
 fors/tests/test_simulate.c                       |    12 +-
 irplib/irplib_distortion.c                       |    14 -
 irplib/irplib_framelist.c                        |     5 +-
 irplib/irplib_mkmaster.c                         |     5 +-
 irplib/irplib_plugin.c                           |   105 +-
 irplib/irplib_polynomial.c                       |   173 +-
 irplib/irplib_polynomial.h                       |    26 -
 irplib/irplib_ppm.c                              |    23 +-
 irplib/irplib_slitpos.c                          |    28 +-
 irplib/irplib_spectrum.c                         |    25 +-
 irplib/irplib_strehl.c                           |   953 +-
 irplib/irplib_strehl.h                           |    63 +-
 irplib/irplib_utils.c                            |   175 +-
 irplib/irplib_utils.h                            |     6 +
 irplib/irplib_wavecal.c                          |    23 +-
 irplib/irplib_wlxcorr.c                          |    31 +-
 irplib/tests/Makefile.am                         |     7 +-
 irplib/tests/Makefile.in                         |    32 +-
 irplib/tests/irplib_framelist-test.c             |    19 +
 irplib/tests/irplib_plugin-test.c                |    73 +
 irplib/tests/irplib_polynomial-test.c            |    13 +-
 irplib/tests/irplib_strehl-test.c                |   841 ++
 irplib/tests/irplib_utils-test.c                 |   116 +-
 irplib/tests/irplib_wlxcorr-test.c               |    20 +-
 mosca/libmosca/Makefile.am                       |     5 +-
 mosca/libmosca/Makefile.in                       |     1 +
 mosca/libmosca/flat_combine.tcc                  |    20 +-
 mosca/libmosca/response.cpp                      |     6 +-
 mosca/libmosca/response.h                        |     2 -
 recipes/fors_calib.cc                            |   113 +-
 recipes/fors_normalise_flat.cc                   |     6 +-
 recipes/fors_pmos_calib.c                        |     2 -
 recipes/fors_pmos_science.c                      |   323 +-
 recipes/fors_remove_bias.cc                      |     2 +-
 recipes/fors_science.cc                          |   326 +-
 reflex/Makefile.am                               |     4 +-
 reflex/Makefile.in                               |    13 +-
 reflex/fors1_spec_wkf_2006-10-24_2009-03-31.oca  |   275 -
 reflex/fors2_spec_wkf_pre2006.oca                |   352 -
 reflex/fors_calib_interact.py                    |    51 +-
 reflex/{fors_spec.xml.in => fors_imaging.xml}    |  9393 ++++++-------------
 reflex/{fors_spec.xml.in => fors_imaging.xml.in} | 10153 ++++++---------------
 reflex/fors_imaging_wkf.oca                      |    99 +
 reflex/fors_plot_common.py                       |    11 +-
 reflex/{fors_spec.xml.in => fors_pmos.xml.in}    |  7453 ++++-----------
 reflex/fors_pmos_wkf.oca                         |   168 +
 reflex/fors_response_interact.py                 |    37 +-
 reflex/fors_science_interact.py                  |    56 +-
 reflex/{fors_spec.xml.in => fors_spec.xml}       |   294 +-
 reflex/fors_spec.xml.in                          |   282 +-
 reflex/fors_spec_wkf.oca                         |   131 +-
 80 files changed, 10742 insertions(+), 22341 deletions(-)

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