[Debian-astro-commits] [cpl-plugin-vimos] 02/03: Merge branch 'upstream' into debian
Ole Streicher
olebole at moszumanska.debian.org
Tue Oct 13 14:35:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository cpl-plugin-vimos.
commit fa252005eee58efc8add87a6a728fb95231026ef
Merge: 71fcbaf 03f75d3
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Oct 13 15:52:36 2015 +0200
Merge branch 'upstream' into debian
Makefile.am | 2 +-
Makefile.in | 17 +-
acinclude.m4 | 35 +-
aclocal.m4 | 217 +
calib/cal_size | 2 +-
calib/gasgano/config/VIMOS.prefs | 2 +-
calib/gasgano/config/vimos.oca | 174 +-
config.h.in | 9 +
config/Makefile.in | 15 +-
configure | 495 +-
configure.ac | 21 +-
external/Makefile.in | 15 +-
external/libwcs/dateutil.c | 3 +-
external/libwcs/webread.c | 4 +-
irplib/Makefile.in | 15 +-
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 | 47 +-
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 +-
libpil/Makefile.am | 10 +-
libpil/Makefile.in | 90 +-
libpil/acinclude.m4 | 11 +-
libpil/admin/doxygen.am | 80 +
libpil/admin/html.am | 74 -
libpil/configure | 15 +-
libpil/kazlib/docs.dvi | Bin 196916 -> 196916 bytes
libpil/pil/Makefile.in | 2 +
libpil/pil/pilastroutils.c | 1 +
libpil/pil/pilmessages.c | 1 +
libpil/pil/pilrecipe.c | 6 +-
libpil/pil/piltask.c | 5 +-
libpil/tests/Makefile.in | 2 +
m4macros/gsl.m4 | 24 +
m4macros/hdrl.m4 | 24 +
mosca/Makefile.am | 31 +
{regtests => mosca}/Makefile.in | 31 +-
mosca/README | 1 +
mosca/hdrl/Makefile.am | 98 +
mosca/hdrl/Makefile.in | 1100 +++
mosca/hdrl/hdrl.h | 64 +
mosca/hdrl/hdrl_bpm_2d.c | 1289 +++
mosca/hdrl/hdrl_bpm_2d.h | 101 +
mosca/hdrl/hdrl_bpm_3d.c | 511 ++
mosca/hdrl/hdrl_bpm_3d.h | 84 +
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_utils.h | 56 +
mosca/hdrl/hdrl_buffer.c | 331 +
mosca/hdrl/hdrl_buffer.h | 51 +
mosca/hdrl/hdrl_collapse.c | 1991 +++++
mosca/hdrl/hdrl_collapse.h | 174 +
mosca/hdrl/hdrl_combine.c | 100 +
mosca/hdrl/hdrl_combine.h | 64 +
mosca/hdrl/hdrl_elemop.c | 835 ++
mosca/hdrl/hdrl_elemop.h | 231 +
mosca/hdrl/hdrl_fit.c | 501 ++
mosca/hdrl/hdrl_fit.h | 57 +
mosca/hdrl/hdrl_flat.c | 561 ++
mosca/hdrl/hdrl_flat.h | 72 +
mosca/hdrl/hdrl_image.c | 801 ++
mosca/hdrl/hdrl_image.h | 131 +
vimos/fors_tools.h => mosca/hdrl/hdrl_image_defs.h | 34 +-
mosca/hdrl/hdrl_image_math.c | 609 ++
mosca/hdrl/hdrl_image_math.h | 64 +
vimos/fors_tools.h => mosca/hdrl/hdrl_imagelist.h | 35 +-
mosca/hdrl/hdrl_imagelist_basic.c | 722 ++
mosca/hdrl/hdrl_imagelist_basic.h | 79 +
mosca/hdrl/hdrl_imagelist_basic_body.h | 83 +
mosca/hdrl/hdrl_imagelist_defs.h | 51 +
mosca/hdrl/hdrl_imagelist_io.c | 660 ++
mosca/hdrl/hdrl_imagelist_io.h | 91 +
mosca/hdrl/hdrl_imagelist_view.c | 461 ++
mosca/hdrl/hdrl_imagelist_view.h | 61 +
mosca/hdrl/hdrl_iter.c | 219 +
mosca/hdrl/hdrl_iter.h | 98 +
mosca/hdrl/hdrl_lacosmics.c | 722 ++
mosca/hdrl/hdrl_lacosmics.h | 73 +
mosca/hdrl/hdrl_overscan.c | 1721 ++++
mosca/hdrl/hdrl_overscan.h | 146 +
mosca/hdrl/hdrl_overscan_defs.h | 79 +
mosca/hdrl/hdrl_parameter.c | 163 +
mosca/hdrl/hdrl_parameter.h | 139 +
mosca/hdrl/hdrl_parameter_defs.h | 51 +
mosca/hdrl/hdrl_prototyping.c | 1269 +++
mosca/hdrl/hdrl_prototyping.h | 65 +
mosca/hdrl/hdrl_sigclip.c | 938 +++
mosca/hdrl/hdrl_sigclip.h | 108 +
mosca/hdrl/hdrl_strehl.c | 1314 +++
mosca/hdrl/hdrl_strehl.h | 99 +
mosca/hdrl/hdrl_test.h | 54 +
mosca/hdrl/hdrl_types.h | 82 +
mosca/hdrl/hdrl_utils.c | 1327 +++
mosca/hdrl/hdrl_utils.h | 278 +
mosca/hdrl/igam.c | 247 +
mosca/hdrl/tests/Makefile.am | 95 +
{irplib => mosca/hdrl}/tests/Makefile.in | 662 +-
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 | 98 +
mosca/hdrl/tests/hdrl_collapse-test.c | 625 ++
mosca/hdrl/tests/hdrl_combine-test.c | 333 +
mosca/hdrl/tests/hdrl_elemop-test.c | 950 +++
mosca/hdrl/tests/hdrl_fit-test.c | 320 +
mosca/hdrl/tests/hdrl_image-test.c | 481 ++
mosca/hdrl/tests/hdrl_imagelist_basic-test.c | 161 +
mosca/hdrl/tests/hdrl_imagelist_io-test.c | 204 +
mosca/hdrl/tests/hdrl_imagelist_view-test.c | 507 ++
mosca/hdrl/tests/hdrl_lacosmics-test.c | 221 +
mosca/hdrl/tests/hdrl_overscan-test.c | 856 ++
mosca/hdrl/tests/hdrl_parameter-test.c | 192 +
mosca/hdrl/tests/hdrl_sigclip-test.c | 705 ++
mosca/hdrl/tests/hdrl_strehl-test.c | 572 ++
mosca/hdrl/tests/hdrl_utils-test.c | 629 ++
mosca/libmosca/Makefile.am | 70 +
{irplib => mosca/libmosca}/Makefile.in | 374 +-
mosca/libmosca/calibrated_slit.cpp | 124 +
mosca/libmosca/calibrated_slit.h | 88 +
mosca/libmosca/ccd_config.cpp | 209 +
mosca/libmosca/ccd_config.h | 137 +
mosca/libmosca/detected_slit.cpp | 172 +
mosca/libmosca/detected_slit.h | 130 +
mosca/libmosca/detected_slits.cpp | 102 +
.../libmosca/detected_slits.h | 34 +-
mosca/libmosca/extinction.cpp | 111 +
mosca/libmosca/extinction.h | 62 +
mosca/libmosca/fiera_config.cpp | 265 +
.../fors_tools.h => mosca/libmosca/fiera_config.h | 47 +-
mosca/libmosca/flat_combine.h | 61 +
mosca/libmosca/flat_combine.tcc | 318 +
mosca/libmosca/global_distortion.cpp | 435 +
mosca/libmosca/global_distortion.h | 59 +
mosca/libmosca/grism_config.cpp | 74 +
mosca/libmosca/grism_config.h | 60 +
.../libmosca/image_normalisation.h | 42 +-
mosca/libmosca/image_normalisation.tcc | 108 +
mosca/libmosca/image_smooth.cpp | 123 +
.../VimosUtils.cc => mosca/libmosca/image_smooth.h | 33 +-
.../libmosca/image_spline_fit.h | 39 +-
mosca/libmosca/image_spline_fit.tcc | 284 +
.../VimosUtils.cc => mosca/libmosca/image_utils.h | 38 +-
mosca/libmosca/image_utils.tcc | 160 +
mosca/libmosca/mosca_image.cpp | 194 +
mosca/libmosca/mosca_image.h | 132 +
mosca/libmosca/mosca_image.tcc | 151 +
mosca/libmosca/rect_region.cpp | 233 +
mosca/libmosca/rect_region.h | 116 +
mosca/libmosca/reduce_method.cpp | 68 +
mosca/libmosca/reduce_method.h | 104 +
mosca/libmosca/response.cpp | 318 +
mosca/libmosca/response.h | 155 +
mosca/libmosca/spec_std_star.cpp | 92 +
mosca/libmosca/spec_std_star.h | 60 +
mosca/libmosca/spectrum.cpp | 175 +
mosca/libmosca/spectrum.h | 103 +
mosca/libmosca/statistics.cpp | 106 +
vimos/fors_tools.h => mosca/libmosca/statistics.h | 42 +-
mosca/libmosca/tests/Makefile.am | 51 +
{libpil => mosca/libmosca}/tests/Makefile.in | 291 +-
.../tests/data/ccid20_14_5_3_out1_bin1.fits.gz | Bin 0 -> 37250 bytes
.../tests/data/ccid20_14_5_3_out1_bin2.fits.gz | Bin 0 -> 12311 bytes
.../tests/data/ccid20_14_5_6_out1_bin2.fits.gz | Bin 0 -> 12466 bytes
.../tests/data/eev_ccd_44_82__david.fits.gz | Bin 0 -> 25250 bytes
.../libmosca/tests/data/eev_ccd_44_82__tom.fits.gz | Bin 0 -> 25237 bytes
.../tests/data/eev_ccd_44_82__tom_ny_4096.fits.gz | Bin 0 -> 39064 bytes
.../tests/data/eev_ccd_44__ccd_59a.fits.gz | Bin 0 -> 38843 bytes
.../tests/data/eev_ccd_44__ccd_59b.fits.gz | Bin 0 -> 38849 bytes
.../tests/data/eev_ccd_44__ccd_60a.fits.gz | Bin 0 -> 46061 bytes
.../tests/data/eev_ccd_44__ccd_60b.fits.gz | Bin 0 -> 46132 bytes
.../libmosca/tests/data/marlene_out1_bin2.fits.gz | Bin 0 -> 12793 bytes
.../tests/data/tk2048eb4_1_160_out1_bin1.fits.gz | Bin 0 -> 20737 bytes
.../tests/data/tk2048eb4_1_160_out4_bin1.fits.gz | Bin 0 -> 21761 bytes
.../tests/data/tk2048eb4_1_160_out4_bin2.fits.gz | Bin 0 -> 9367 bytes
mosca/libmosca/tests/fiera_config-test.cpp | 535 ++
mosca/libmosca/tests/flat_combine-test.cpp | 90 +
mosca/libmosca/tests/image_smooth-test.cpp | 249 +
mosca/libmosca/tests/test_driver | 6 +
mosca/libmosca/type_traits.h | 72 +
mosca/libmosca/vector_utils.cpp | 88 +
mosca/libmosca/vector_utils.h | 150 +
mosca/libmosca/vector_utils.tcc | 326 +
mosca/libmosca/wavelength_calibration.cpp | 302 +
mosca/libmosca/wavelength_calibration.h | 87 +
recipes/Makefile.am | 14 +-
recipes/Makefile.in | 47 +-
recipes/vimos_calib.c | 116 +-
recipes/{vimos_science.c => vimos_science.cc} | 760 +-
recipes/{vmbias.c => vmbias.cc} | 1038 +--
recipes/vmdark.c | 130 +-
recipes/vmdet.c | 134 +-
recipes/vmifucalib.c | 20 +-
recipes/vmifucombine.c | 3 +-
recipes/vmifucombinecube.cc | 46 +-
recipes/vmifuscience.c | 42 +-
recipes/vmifustandard.c | 36 +-
recipes/vmimcalphot.c | 47 +-
recipes/vmimflatscreen.c | 200 +-
recipes/vmimflatsky.c | 168 +-
recipes/vmimobsjitter.c | 44 +-
recipes/vmimobsstare.c | 55 +-
recipes/vmimpreimaging.c | 14 +-
recipes/vmimstandard.c | 44 +-
recipes/vmmasktoccd.c | 19 +-
recipes/vmmoscombine.c | 119 +-
recipes/vmmosobsjitter.c | 204 +-
recipes/vmmosobsstare.c | 90 +-
recipes/vmmosstandard.c | 90 +-
recipes/vmskyccd.c | 31 +-
recipes/vmspcaldisp.c | 150 +-
recipes/vmspflat.c | 200 +-
recipes/vmspphot.c | 27 +-
reflex/Makefile.am | 2 +-
reflex/Makefile.in | 17 +-
reflex/vimos_calib_interact.py | 382 +
reflex/vimos_ifu.xml | 2117 ++---
reflex/vimos_ifu.xml.in | 2113 ++---
reflex/vimos_ifu_wkf.oca | 12 +-
reflex/vimos_mos.xml.in | 8527 ++++++++++++++------
reflex/vimos_mos_wkf.oca | 128 +-
reflex/vimos_plot_common.py | 684 ++
reflex/vimos_response_interact.py | 201 +
reflex/vimos_science_interact.py | 283 +
regtests/Makefile.in | 15 +-
regtests/tests/Makefile.in | 15 +-
tests/Makefile.in | 15 +-
vimos/Makefile.am | 25 +-
vimos/Makefile.in | 65 +-
vimos/fors_qc.c | 2 +-
vimos/fors_tools.h | 4 +
vimos/moses.c | 1704 +++-
vimos/moses.h | 30 +-
vimos/{TwoDLinearWCS.cc => two_d_linear_wcs.cc} | 46 +-
vimos/{TwoDLinearWCS.h => two_d_linear_wcs.h} | 22 +-
vimos/{vimos_calib_impl.c => vimos_calib_impl.cc} | 1045 ++-
vimos/{vimos_calib_mult.c => vimos_calib_mult.cc} | 901 ++-
vimos/vimos_calibrated_slits.cc | 59 +
vimos/vimos_calibrated_slits.h | 51 +
vimos/vimos_detected_slits.cc | 106 +
vimos/vimos_detected_slits.h | 45 +
vimos/vimos_detmodel.cc | 127 +
vimos/{fors_tools.h => vimos_detmodel.h} | 42 +-
vimos/{fors_dfs.c => vimos_dfs.c} | 168 +-
vimos/{fors_dfs.h => vimos_dfs.h} | 16 +-
vimos/vimos_flat_normalise.cc | 521 ++
vimos/vimos_flat_normalise.h | 89 +
vimos/vimos_grism.cc | 62 +
vimos/{fors_tools.h => vimos_grism.h} | 30 +-
vimos/{VimosIfuWCS.cc => vimos_ifu_wcs.cc} | 19 +-
vimos/{VimosIfuWCS.h => vimos_ifu_wcs.h} | 4 +-
vimos/vimos_lines.cc | 167 +
vimos/{fors_tools.h => vimos_lines.h} | 25 +-
vimos/vimos_overscan.cc | 356 +
vimos/vimos_overscan.h | 88 +
vimos/vimos_response.cc | 487 ++
vimos/vimos_response.h | 64 +
...{vimos_science_impl.c => vimos_science_impl.cc} | 1143 ++-
vimos/{VimosUtils.cc => vimos_utils.cc} | 4 +-
vimos/{VimosUtils.h => vimos_utils.h} | 6 +-
vimos/{VimosUtils.tcc => vimos_utils.tcc} | 16 +-
vimos/vmadf.c | 45 +-
vimos/vmccdtable.c | 19 +-
vimos/vmcpl.c | 9 +-
vimos/vmcube.c | 15 +-
vimos/vmdetector.c | 39 +-
vimos/vmdistmodels.c | 43 +-
vimos/vmextractiontable.c | 35 +-
vimos/vmfit.c | 66 +-
vimos/vmgrismtable.c | 3 +-
vimos/vmidstable.c | 3 +-
vimos/vmifu.c | 8 +-
vimos/vmifutable.c | 27 +-
vimos/vmifutypes.c | 29 +-
vimos/vmimage.c | 83 +-
vimos/vmimagearray.c | 9 +-
vimos/vmimageset.c | 13 +-
vimos/vmimgastrometry.c | 7 +-
vimos/vmimgextraction.c | 213 +-
vimos/vmimgpreprocessing.c | 9 +-
vimos/vmimgutils.c | 45 +-
vimos/vmlinecatalog.c | 17 +-
vimos/vmmath.c | 221 +-
vimos/vmmath.h | 7 +
vimos/vmmatrix.c | 93 +-
vimos/vmmatrix.h | 2 -
vimos/vmmosextraction.c | 63 +-
vimos/vmmosflat.c | 9 +-
vimos/vmmosfringes.c | 5 +-
vimos/vmmosmodels.c | 7 +-
vimos/vmmossky.c | 11 +-
vimos/vmmossphotcalib.c | 13 +-
vimos/vmmosutils.c | 209 +-
vimos/vmmoswavecalib.c | 153 +-
vimos/vmobjecttable.c | 19 +-
vimos/vmqcutils.c | 59 +-
vimos/vmsextractor.c | 7 +-
vimos/vmsphottable.c | 13 +-
vimos/vmtable.c | 133 +-
vimos/vmtable.h | 2 +
vimos/vmtablearray.c | 9 +-
vimos/vmtypes.c | 9 +-
vimos/vmtypes.h | 1 +
vimos/vmutils.c | 47 +-
vimos/vmwcsutils.c | 89 +-
vimos/vmwcsutils.h | 2 +-
vimos/vmwindowtable.c | 23 +-
326 files changed, 61225 insertions(+), 10096 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-vimos.git
More information about the Debian-astro-commits
mailing list