[Debian-astro-commits] [cpl-plugin-fors] 01/01: 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 20aef9134a8b40885d96f18a9a623d3aadab414d
Merge: 9ea9838 27a9681
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Sep 23 11:05:31 2015 +0200

    Merge branch 'upstream' into debian

 calib/cal_size                            |   2 +-
 calib/gasgano/config/FORS1.prefs          |   2 +-
 calib/gasgano/config/FORS2.prefs          |   2 +-
 configure                                 |  20 +-
 configure.ac                              |   2 +-
 fors/fors_bias_impl.cc                    |   4 +-
 fors/fors_ccd_config.cc                   |  81 +++++--
 fors/fors_ccd_config.h                    |  29 ++-
 fors/fors_dark_impl.cc                    |   6 +-
 fors/fors_flat_normalise.cc               |  59 ++++-
 fors/fors_flat_normalise.h                |   7 +
 fors/fors_img_science_impl.cc             |   4 +-
 fors/fors_img_screen_flat_impl.cc         |   4 +-
 fors/fors_img_sky_flat_impl.cc            |   4 +-
 fors/fors_photometry_impl.cc              |   3 +-
 fors/fors_preprocess.cc                   |   4 +-
 fors/fors_response.cc                     |  43 ++++
 fors/fors_response.h                      |   6 +
 fors/fors_zeropoint_impl.cc               |   6 +-
 fors/moses.c                              |  12 +-
 mosca/libmosca/fiera_config.h             |   8 +-
 mosca/libmosca/flat_combine.tcc           |  24 +--
 mosca/libmosca/wavelength_calibration.cpp |  50 +++--
 mosca/libmosca/wavelength_calibration.h   |   3 +-
 recipes/fors_calib.cc                     |  15 +-
 recipes/fors_remove_bias.cc               |  14 +-
 recipes/fors_science.cc                   |  51 ++++-
 recipes/fors_spec_mflat.cc                |   4 +-
 reflex/fors_calib_interact.py             |   5 +-
 reflex/fors_imaging.xml                   | 281 ++++++++++++++++--------
 reflex/fors_imaging.xml.in                | 275 +++++++++++++++++-------
 reflex/fors_pmos.xml.in                   | 279 +++++++++++++++++-------
 reflex/fors_spec.xml                      | 345 +++++++++++++++++++-----------
 reflex/fors_spec.xml.in                   | 333 ++++++++++++++++++----------
 34 files changed, 1376 insertions(+), 611 deletions(-)

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