[cpl-plugin-fors] 01/02: Merge branch 'upstream' into debian
Ole Streicher
olebole-guest at moszumanska.debian.org
Fri Oct 3 18:31:01 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-fors.
commit b6496adf342efee4d6356d39de479c1a26f570b9
Merge: 0513ac3 78626dc
Author: Ole Streicher <olebole at debian.org>
Date: Fri Oct 3 12:28:58 2014 +0200
Merge branch 'upstream' into debian
Makefile.am | 2 +-
Makefile.in | 2 +-
calib/cal_size | 2 +-
calib/dic/ESO-VLT-DIC.FORS | 3418 ++++++++++++++++++++++++++
calib/gasgano/config/FORS1.prefs | 2 +-
calib/gasgano/config/FORS2.prefs | 2 +-
configure | 24 +-
configure.ac | 6 +-
fors/fors_bpm.cc | 3 +
fors/fors_ccd_config.cc | 29 +
fors/fors_ccd_config.h | 2 +
fors/fors_dfs.c | 16 +-
fors/fors_extract.c | 3 -
fors/fors_flat_normalise.cc | 59 +-
fors/fors_flat_normalise.h | 19 +-
fors/fors_image.c | 6 +-
fors/fors_overscan.cc | 17 +-
fors/fors_overscan.h | 3 +
fors/fors_preprocess.cc | 3 -
fors/fors_response.cc | 229 +-
fors/fors_response.h | 7 +-
fors/fors_saturation_mos.cc | 2 +-
fors/moses.c | 559 ++++-
fors/moses.h | 7 +-
mosca/hdrl/Makefile.am | 22 +-
mosca/hdrl/Makefile.in | 105 +-
mosca/hdrl/hdrl.h | 8 +
mosca/hdrl/hdrl_bpm.c | 202 --
mosca/hdrl/hdrl_bpm_2d.c | 1289 ++++++++++
mosca/hdrl/hdrl_bpm_2d.h | 101 +
mosca/hdrl/hdrl_bpm_3d.c | 511 ++++
mosca/hdrl/{hdrl_iter.h => hdrl_bpm_3d.h} | 86 +-
mosca/hdrl/hdrl_bpm_fit.c | 665 +++++
mosca/hdrl/hdrl_bpm_fit.h | 81 +
mosca/hdrl/hdrl_bpm_utils.c | 318 +++
mosca/hdrl/{hdrl_bpm.h => hdrl_bpm_utils.h} | 36 +-
mosca/hdrl/hdrl_buffer.c | 32 +-
mosca/hdrl/hdrl_buffer.h | 1 +
mosca/hdrl/hdrl_collapse.c | 906 ++++++-
mosca/hdrl/hdrl_collapse.h | 52 +-
mosca/hdrl/hdrl_elemop.c | 193 +-
mosca/hdrl/hdrl_elemop.h | 18 +
mosca/hdrl/hdrl_fit.c | 501 ++++
mosca/hdrl/{hdrl_bpm.h => hdrl_fit.h} | 31 +-
mosca/hdrl/hdrl_flat.c | 174 +-
mosca/hdrl/hdrl_image.c | 211 +-
mosca/hdrl/hdrl_image.h | 20 +-
mosca/hdrl/hdrl_image_math.c | 489 +++-
mosca/hdrl/hdrl_image_math.h | 27 +-
mosca/hdrl/hdrl_imagelist_basic.c | 187 +-
mosca/hdrl/hdrl_imagelist_basic.h | 14 +-
mosca/hdrl/hdrl_imagelist_basic_body.h | 2 +-
mosca/hdrl/hdrl_imagelist_defs.h | 13 +-
mosca/hdrl/hdrl_imagelist_io.c | 147 +-
mosca/hdrl/hdrl_imagelist_io.h | 2 +
mosca/hdrl/hdrl_imagelist_view.c | 319 ++-
mosca/hdrl/hdrl_imagelist_view.h | 26 +-
mosca/hdrl/hdrl_iter.c | 2 +-
mosca/hdrl/hdrl_iter.h | 2 +
mosca/hdrl/hdrl_lacosmics.c | 722 ++++++
mosca/hdrl/{hdrl_bpm.h => hdrl_lacosmics.h} | 55 +-
mosca/hdrl/hdrl_overscan.c | 433 ++--
mosca/hdrl/hdrl_overscan.h | 26 +-
mosca/hdrl/hdrl_parameter.h | 18 +-
mosca/hdrl/hdrl_prototyping.c | 56 +-
mosca/hdrl/hdrl_sigclip.c | 544 +++-
mosca/hdrl/hdrl_sigclip.h | 45 +-
mosca/hdrl/hdrl_strehl.c | 1314 ++++++++++
mosca/hdrl/hdrl_strehl.h | 99 +
mosca/hdrl/hdrl_types.h | 5 +
mosca/hdrl/hdrl_utils.c | 509 +++-
mosca/hdrl/hdrl_utils.h | 39 +
mosca/hdrl/igam.c | 247 ++
mosca/hdrl/tests/Makefile.am | 21 +-
mosca/hdrl/tests/Makefile.in | 230 +-
mosca/hdrl/tests/hdrl_bpm-test.c | 169 --
mosca/hdrl/tests/hdrl_bpm_2d-test.c | 233 ++
mosca/hdrl/tests/hdrl_bpm_3d-test.c | 266 ++
mosca/hdrl/tests/hdrl_bpm_fit-test.c | 227 ++
mosca/hdrl/tests/hdrl_bpm_utils-test.c | 414 ++++
mosca/hdrl/tests/hdrl_buffer-test.c | 6 +-
mosca/hdrl/tests/hdrl_collapse-test.c | 478 ++--
mosca/hdrl/tests/hdrl_combine-test.c | 41 +
mosca/hdrl/tests/hdrl_elemop-test.c | 279 +++
mosca/hdrl/tests/hdrl_fit-test.c | 320 +++
mosca/hdrl/tests/hdrl_image-test.c | 266 +-
mosca/hdrl/tests/hdrl_imagelist_basic-test.c | 4 +-
mosca/hdrl/tests/hdrl_imagelist_io-test.c | 47 +-
mosca/hdrl/tests/hdrl_imagelist_view-test.c | 263 +-
mosca/hdrl/tests/hdrl_lacosmics-test.c | 221 ++
mosca/hdrl/tests/hdrl_overscan-test.c | 159 +-
mosca/hdrl/tests/hdrl_sigclip-test.c | 442 +++-
mosca/hdrl/tests/hdrl_strehl-test.c | 572 +++++
mosca/hdrl/tests/hdrl_utils-test.c | 95 +-
mosca/libmosca/Makefile.am | 9 +-
mosca/libmosca/Makefile.in | 16 +-
mosca/libmosca/calibrated_slit.cpp | 12 +
mosca/libmosca/extinction.cpp | 18 +-
mosca/libmosca/fiera_config.cpp | 8 +-
mosca/libmosca/flat_combine.tcc | 11 +-
mosca/libmosca/global_distortion.cpp | 435 ++++
mosca/libmosca/global_distortion.h | 59 +
mosca/libmosca/image_normalisation.tcc | 16 +-
mosca/libmosca/image_utils.tcc | 1 +
mosca/libmosca/mosca_image.cpp | 21 +
mosca/libmosca/mosca_image.h | 6 +
mosca/libmosca/response.cpp | 167 +-
mosca/libmosca/response.h | 79 +-
mosca/libmosca/spec_std_star.cpp | 13 +-
mosca/libmosca/spec_std_star.h | 8 +-
mosca/libmosca/spectrum.cpp | 75 +-
mosca/libmosca/spectrum.h | 28 +-
mosca/libmosca/tests/fiera_config-test.cpp | 224 +-
mosca/libmosca/tests/flat_combine-test.cpp | 5 +-
mosca/libmosca/tests/image_smooth-test.cpp | 123 -
mosca/libmosca/vector_utils.cpp | 88 +
mosca/libmosca/vector_utils.h | 99 +-
mosca/libmosca/vector_utils.tcc | 147 +-
mosca/libmosca/wavelength_calibration.cpp | 68 +-
mosca/libmosca/wavelength_calibration.h | 6 +
recipes/fors_align_sky.c | 6 +-
recipes/fors_align_sky_lss.c | 6 +-
recipes/fors_calib.cc | 516 ++--
recipes/fors_detect_objects.c | 6 +-
recipes/fors_detect_spectra.c | 6 +-
recipes/fors_extract.c | 10 +-
recipes/fors_extract_objects.c | 4 +-
recipes/fors_flatfield.c | 6 +-
recipes/fors_normalise_flat.cc | 54 +-
recipes/fors_pmos_calib.c | 6 +-
recipes/fors_pmos_extract.c | 8 +-
recipes/fors_pmos_science.c | 8 +-
recipes/fors_resample.c | 6 +-
recipes/fors_science.cc | 1013 +++++---
recipes/fors_spec_mflat.cc | 6 +-
recipes/fors_subtract_sky.c | 6 +-
recipes/fors_subtract_sky_lss.c | 2 -
recipes/fors_sumflux.c | 3 +-
recipes/fors_trace_flat.c | 6 +-
recipes/fors_wave_calib.c | 6 +-
recipes/fors_wave_calib_lss.c | 9 +-
reflex/fors_calib_interact.py | 39 +-
reflex/fors_plot_common.py | 87 +-
reflex/fors_response_interact.py | 15 +-
reflex/fors_science_interact.py | 16 +-
reflex/fors_spec.xml.in | 318 ++-
reflex/fors_spec_wkf.oca | 37 +-
regtests/Makefile.am | 30 +
{mosca/libmosca => regtests}/Makefile.in | 270 +-
regtests/tests/Makefile.am | 77 +
regtests/tests/Makefile.in | 538 ++++
151 files changed, 21628 insertions(+), 3314 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-fors.git
More information about the debian-science-commits
mailing list