[cpl-plugin-fors] 04/05: Merge branch 'upstream' into debian
Ole Streicher
olebole-guest at moszumanska.debian.org
Fri Apr 11 14:27:36 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 da1752d7bddc51fad76348d0c83caf409773f1c7
Merge: 99f6cd2 afdde89
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Apr 11 16:02:42 2014 +0200
Merge branch 'upstream' into debian
Makefile.in | 254 +-
acinclude.m4 | 40 +-
aclocal.m4 | 481 +-
admin/compile | 227 +-
admin/config.guess | 261 +-
admin/config.sub | 213 +-
admin/depcomp | 189 +-
admin/install-sh | 35 +-
admin/ltmain.sh | 4027 ++----
admin/missing | 148 +-
calib/cal_size | 2 +-
calib/dic/ESO-DFS-DIC.FORS | 3418 +++++
calib/gasgano/config/FORS1.prefs | 2 +-
calib/gasgano/config/FORS2.prefs | 2 +-
calib/gasgano/config/fors1.oca | 214 +-
calib/gasgano/config/fors2.oca | 232 +-
config.h.in | 3 -
configure | 12680 +++++++++++--------
configure.ac | 12 +-
fors/Makefile.am | 40 +-
fors/Makefile.in | 292 +-
fors/fors_bias_impl.c | 346 -
fors/fors_bias_impl.cc | 563 +
fors/fors_bias_impl.h | 4 +
fors/fors_bpm.cc | 94 +
fors/{fors_overscan.h => fors_bpm.h} | 32 +-
fors/fors_calibrated_slits.cc | 59 +
...rs_detected_slits.h => fors_calibrated_slits.h} | 42 +-
fors/fors_ccd_config.cc | 85 +
fors/{fors_overscan.h => fors_ccd_config.h} | 28 +-
fors/{fors_dark_impl.c => fors_dark_impl.cc} | 57 +-
fors/fors_data.h | 3 +
fors/fors_detected_slits.cc | 23 +-
fors/fors_detected_slits.h | 18 +-
fors/fors_detmodel.cc | 115 +
fors/{fors_overscan.h => fors_detmodel.h} | 31 +-
fors/fors_dfs.c | 268 +-
fors/fors_dfs.h | 22 +-
fors/fors_flat_normalise.cc | 291 +-
fors/fors_flat_normalise.h | 8 +-
fors/fors_grism.cc | 78 +
fors/{fors_overscan.h => fors_grism.h} | 31 +-
fors/fors_image.c | 288 +-
fors/fors_image.h | 50 +-
...img_science_impl.c => fors_img_science_impl.cc} | 85 +-
...en_flat_impl.c => fors_img_screen_flat_impl.cc} | 74 +-
...g_sky_flat_impl.c => fors_img_sky_flat_impl.cc} | 62 +-
fors/fors_instrument.h | 3 +
fors/fors_overscan.cc | 366 +-
fors/fors_overscan.h | 22 +-
...s_photometry_impl.c => fors_photometry_impl.cc} | 76 +-
fors/fors_preprocess.cc | 79 +
fors/{fors_overscan.h => fors_preprocess.h} | 24 +-
fors/fors_response.cc | 166 +
fors/{fors_overscan.h => fors_response.h} | 30 +-
fors/fors_saturation.cc | 85 +
fors/{fors_overscan.h => fors_saturation.h} | 23 +-
fors/fors_saturation_mos.cc | 106 +
fors/{fors_bias_impl.h => fors_saturation_mos.h} | 35 +-
fors/fors_setting.c | 2 +-
fors/fors_setting.h | 3 +
fors/fors_stack.c | 10 +-
fors/fors_stack.h | 4 +-
fors/fors_star.h | 3 +
fors/fors_std_cat.h | 3 +
fors/fors_subtract_bias.c | 58 +
fors/{fors_overscan.h => fors_subtract_bias.h} | 28 +-
fors/fors_tools.c | 8 +-
fors/fors_tools.h | 6 +
...ors_zeropoint_impl.c => fors_zeropoint_impl.cc} | 82 +-
fors/list.h | 36 +-
fors/moses.c | 30 +-
fors/moses.h | 4 +-
fors/tests/Makefile.am | 40 +-
fors/tests/Makefile.in | 283 +-
fors/tests/fors_bias-test.c | 16 +-
fors/tests/fors_dark-test.c | 16 +-
fors/tests/fors_image-test.c | 7 +-
fors/tests/fors_img_science-test.c | 4 +-
fors/tests/fors_img_screen_flat-test.c | 12 +-
fors/tests/fors_img_sky_flat-test.c | 8 +-
fors/tests/fors_stack-test.c | 2 +-
fors/tests/test.c | 7 +-
fors/tests/test_simulate.c | 141 +-
fors/tests/test_simulate.h | 7 +
irplib/Makefile.in | 197 +-
irplib/irplib_framelist.c | 16 +-
irplib/tests/Makefile.in | 125 +-
irplib/tests/irplib_polynomial-test.c | 2 +-
m4macros/gsl.m4 | 3 +-
m4macros/hdrl.m4 | 24 +
m4macros/libtool.m4 | 2242 ++--
m4macros/ltoptions.m4 | 32 +-
m4macros/ltversion.m4 | 12 +-
m4macros/lt~obsolete.m4 | 12 +-
mosca/Makefile.am | 2 +-
mosca/Makefile.in | 161 +-
mosca/hdrl/Makefile.am | 86 +
mosca/hdrl/Makefile.in | 942 ++
.../hdrl_imagelist_view.h => hdrl/hdrl.h} | 52 +-
mosca/{libmosca => hdrl}/hdrl_bpm.c | 14 +-
mosca/{libmosca => hdrl}/hdrl_bpm.h | 16 +-
mosca/hdrl/hdrl_buffer.c | 305 +
.../{libmosca/hdrl_types.h => hdrl/hdrl_buffer.h} | 31 +-
mosca/{libmosca => hdrl}/hdrl_collapse.c | 314 +-
mosca/{libmosca => hdrl}/hdrl_collapse.h | 105 +-
mosca/hdrl/hdrl_combine.c | 100 +
mosca/{libmosca => hdrl}/hdrl_combine.h | 31 +-
mosca/{libmosca => hdrl}/hdrl_elemop.c | 85 +-
mosca/{libmosca => hdrl}/hdrl_elemop.h | 44 +-
mosca/{libmosca => hdrl}/hdrl_flat.c | 32 +-
mosca/{libmosca => hdrl}/hdrl_flat.h | 15 +-
mosca/hdrl/hdrl_image.c | 650 +
mosca/{libmosca => hdrl}/hdrl_image.h | 73 +-
mosca/{libmosca => hdrl}/hdrl_image_defs.h | 11 +-
mosca/{libmosca => hdrl}/hdrl_image_math.c | 69 +-
mosca/{libmosca => hdrl}/hdrl_image_math.h | 9 +-
mosca/{libmosca => hdrl}/hdrl_imagelist.h | 25 +-
mosca/{libmosca => hdrl}/hdrl_imagelist_basic.c | 235 +-
mosca/{libmosca => hdrl}/hdrl_imagelist_basic.h | 54 +-
.../{libmosca => hdrl}/hdrl_imagelist_basic_body.h | 8 +-
mosca/{libmosca => hdrl}/hdrl_imagelist_defs.h | 13 +-
mosca/{libmosca => hdrl}/hdrl_imagelist_io.c | 96 +-
mosca/{libmosca => hdrl}/hdrl_imagelist_io.h | 28 +-
mosca/hdrl/hdrl_imagelist_view.c | 194 +
mosca/{libmosca => hdrl}/hdrl_imagelist_view.h | 19 +-
mosca/{libmosca => hdrl}/hdrl_iter.c | 110 +-
mosca/{libmosca => hdrl}/hdrl_iter.h | 67 +-
mosca/{libmosca => hdrl}/hdrl_overscan.c | 1000 +-
mosca/{libmosca => hdrl}/hdrl_overscan.h | 151 +-
mosca/hdrl/hdrl_overscan_defs.h | 79 +
mosca/{libmosca => hdrl}/hdrl_parameter.c | 112 +-
mosca/{libmosca => hdrl}/hdrl_parameter.h | 63 +-
.../hdrl_parameter_defs.h} | 42 +-
mosca/{libmosca => hdrl}/hdrl_prototyping.c | 0
mosca/{libmosca => hdrl}/hdrl_prototyping.h | 3 -
mosca/{libmosca => hdrl}/hdrl_sigclip.c | 82 +-
mosca/{libmosca => hdrl}/hdrl_sigclip.h | 18 +-
.../hdrl_imagelist_defs.h => hdrl/hdrl_test.h} | 43 +-
mosca/{libmosca => hdrl}/hdrl_types.h | 42 +-
mosca/{libmosca => hdrl}/hdrl_utils.c | 757 +-
mosca/{libmosca => hdrl}/hdrl_utils.h | 140 +-
mosca/hdrl/tests/Makefile.am | 82 +
{recipes => mosca/hdrl}/tests/Makefile.in | 361 +-
mosca/hdrl/tests/hdrl_bpm-test.c | 169 +
mosca/hdrl/tests/hdrl_buffer-test.c | 98 +
mosca/hdrl/tests/hdrl_collapse-test.c | 451 +
mosca/hdrl/tests/hdrl_combine-test.c | 292 +
mosca/hdrl/tests/hdrl_elemop-test.c | 671 +
mosca/hdrl/tests/hdrl_image-test.c | 333 +
mosca/hdrl/tests/hdrl_imagelist_basic-test.c | 161 +
mosca/hdrl/tests/hdrl_imagelist_io-test.c | 183 +
mosca/hdrl/tests/hdrl_imagelist_view-test.c | 266 +
mosca/hdrl/tests/hdrl_overscan-test.c | 801 ++
mosca/hdrl/tests/hdrl_parameter-test.c | 192 +
mosca/hdrl/tests/hdrl_sigclip-test.c | 333 +
mosca/hdrl/tests/hdrl_utils-test.c | 536 +
mosca/libmosca/Makefile.am | 76 +-
mosca/libmosca/Makefile.in | 399 +-
mosca/libmosca/calibrated_slit.cpp | 112 +
mosca/libmosca/calibrated_slit.h | 88 +
mosca/libmosca/ccd_config.cpp | 209 +
mosca/libmosca/ccd_config.h | 137 +
mosca/libmosca/detected_slit.cpp | 16 +-
mosca/libmosca/detected_slit.h | 12 +-
mosca/libmosca/extinction.cpp | 105 +
.../libmosca/extinction.h | 57 +-
mosca/libmosca/fiera_config.cpp | 265 +
.../libmosca/fiera_config.h | 44 +-
mosca/libmosca/flat_combine.h | 18 +-
mosca/libmosca/flat_combine.tcc | 140 +-
mosca/libmosca/grism_config.cpp | 74 +
.../libmosca/grism_config.h | 55 +-
mosca/libmosca/hdrl_combine.c | 189 -
mosca/libmosca/hdrl_image.c | 421 -
mosca/libmosca/hdrl_imagelist_view.c | 137 -
.../libmosca/image_normalisation.h | 35 +-
mosca/libmosca/image_normalisation.tcc | 103 +
mosca/libmosca/image_smooth.cpp | 80 +-
mosca/libmosca/image_spline_fit.h | 5 +
mosca/libmosca/image_spline_fit.tcc | 105 +-
mosca/libmosca/image_utils.tcc | 34 +-
mosca/libmosca/mosca_image.cpp | 74 +-
mosca/libmosca/mosca_image.h | 8 +-
mosca/libmosca/mosca_image.tcc | 62 +-
mosca/libmosca/rect_region.cpp | 233 +
mosca/libmosca/rect_region.h | 116 +
mosca/libmosca/reduce_method.cpp | 16 +-
mosca/libmosca/reduce_method.h | 10 +-
mosca/libmosca/response.cpp | 161 +
mosca/libmosca/response.h | 87 +
mosca/libmosca/spec_std_star.cpp | 85 +
.../libmosca/spec_std_star.h | 49 +-
mosca/libmosca/spectrum.cpp | 120 +
mosca/libmosca/spectrum.h | 83 +
mosca/libmosca/statistics.cpp | 106 +
.../fors_overscan.h => mosca/libmosca/statistics.h | 39 +-
mosca/libmosca/tests/Makefile.am | 18 +-
mosca/libmosca/tests/Makefile.in | 141 +-
mosca/libmosca/tests/fiera_config-test.cpp | 333 +
mosca/libmosca/type_traits.h | 6 +-
mosca/libmosca/vector_utils.h | 12 +
mosca/libmosca/vector_utils.tcc | 197 +-
mosca/libmosca/wavelength_calibration.cpp | 85 +-
mosca/libmosca/wavelength_calibration.h | 15 +-
recipes/Makefile.am | 114 +-
recipes/Makefile.in | 583 +-
recipes/fors_align_sky.c | 4 +-
recipes/fors_align_sky_lss.c | 4 +-
recipes/fors_bias.c | 4 +-
recipes/fors_calib.cc | 1098 +-
recipes/fors_config.c | 2 +-
recipes/fors_detect_objects.c | 4 +-
recipes/fors_detect_spectra.c | 4 +-
recipes/fors_extract.c | 4 +-
recipes/fors_extract_objects.c | 4 +-
recipes/fors_extract_slits.c | 4 +-
recipes/fors_flatfield.c | 4 +-
...ors_normalise_flat.c => fors_normalise_flat.cc} | 134 +-
recipes/fors_pmos_calib.c | 4 +-
recipes/fors_pmos_extract.c | 10 +-
recipes/fors_pmos_science.c | 12 +-
recipes/fors_remove_bias.c | 400 -
recipes/fors_remove_bias.cc | 395 +
recipes/fors_resample.c | 4 +-
recipes/{fors_science.c => fors_science.cc} | 476 +-
recipes/{fors_flat.cc => fors_spec_mflat.cc} | 358 +-
recipes/fors_subtract_sky.c | 4 +-
recipes/fors_subtract_sky_lss.c | 4 +-
recipes/fors_sumflux.c | 4 +-
recipes/fors_trace_flat.c | 4 +-
recipes/fors_wave_calib.c | 4 +-
recipes/fors_wave_calib_lss.c | 4 +-
recipes/montecarlo.c | 4 +-
recipes/tests/Makefile.in | 111 +-
reflex/Makefile.am | 4 +-
reflex/Makefile.in | 92 +-
reflex/fors_calib_interact.py | 159 +-
reflex/fors_plot_common.py | 192 +-
...ience_interact.py => fors_response_interact.py} | 85 +-
reflex/fors_science_interact.py | 127 +-
reflex/{ForsSpec.xml.in => fors_spec.xml.in} | 1794 ++-
reflex/fors_spec_wkf.oca | 8 +
setup | 2 +-
244 files changed, 33796 insertions(+), 18890 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