debian/0000755000000000000000000000000012264536116007174 5ustar debian/README.Source0000644000000000000000000000053512260542123011305 0ustar The original -kit tar file contains a number of additional components which are not DFSG-free (namely gasgano), or already included in Debian (like cpl, esorex, and additional libraries). Only the pipeline sources and calibration files are extracted from this -kit tar file. -- Ole Streicher Tue, 01 Dec 2013 09:18:46 +0100 debian/cpl-plugin-doc.manpages.in0000644000000000000000000000001112260542145014116 0ustar man/*.7 debian/repackage.sh0000755000000000000000000000376112260542123011453 0ustar #!/bin/sh # # The ESO pipeline packages come in the form of a "kit" containing all # packages needed to build the pipeline. This also includes some non-free # packages like Gasgano. # To allow the pipelines to be put to Debian "main", and to have a more # convienient build process, we extract just the source package. # # Debian package name ("cpl-plugin-fors") DEBIAN_PACKAGE=$(echo $(basename $3) | cut -d_ -f1) # Pipeline name ("fors") PIPELINE=$(echo ${DEBIAN_PACKAGE} | cut -d- -f3-) # Version number ("4.9.4") VERSION=$2 # Include full calibration set? # If not, the "calib" package will act as a "downloader" package for the # calibration files. INCLUDE_CALIB="no" #INCLUDE_CALIB="yes" # Include test data? # If not, the test (fits) data are removed from the source package. # In this case, also the tests need to be adjusted. #INCLUDE_TEST_DATA="no" INCLUDE_TEST_DATA="yes" BASEDIR=$(dirname $3) FILENAME=${BASEDIR}/${PIPELINE}-kit-${VERSION}.tar.gz tar xf ${FILENAME} -C ${BASEDIR} rm -f ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}.orig*.tar.* ${FILENAME} TAREXCLUDE="--exclude ${PIPELINE}-${VERSION}/html" if [ $INCLUDE_TEST_DATA = "no" ] ; then TAREXCLUDE=${TAREXCLUDE}" --exclude ${PIPELINE}-${VERSION}/*/tests/ref_data" fi tar xf ${BASEDIR}/${PIPELINE}-kit-${VERSION}/${PIPELINE}-${VERSION}.tar.gz\ -C ${BASEDIR} ${TAREXCLUDE} tar xf ${BASEDIR}/${PIPELINE}-kit-${VERSION}/${PIPELINE}-calib-${VERSION}.tar.gz\ -C ${BASEDIR}/${PIPELINE}-${VERSION}/ mv ${BASEDIR}/${PIPELINE}-${VERSION}/${PIPELINE}-calib-${VERSION}/ \ ${BASEDIR}/${PIPELINE}-${VERSION}/calib/ if [ $INCLUDE_CALIB = "no" ] ; then du -s ${BASEDIR}/${PIPELINE}-${VERSION}/calib/cal | cut -f1 \ > ${BASEDIR}/${PIPELINE}-${VERSION}/calib/cal_size rm -rf ${BASEDIR}/${PIPELINE}-${VERSION}/calib/cal fi tar cJf ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}+dfsg.orig.tar.xz \ -C ${BASEDIR} ${PIPELINE}-${VERSION}/ rm -rf ${BASEDIR}/${PIPELINE}-${VERSION}/ rm -rf ${BASEDIR}/${PIPELINE}-kit-${VERSION}/ exec uupdate --no-symlink "$@" debian/create_sphinx.py0000644000000000000000000001522312264535072012405 0ustar #!/usr/bin/env python import cpl import os import sys import re rst_template = '''The {recipe} recipe =============================================================== .. data:: {recipe} Synopsis -------- {synopsis} Description ----------- {description} Constructor ----------- .. method:: cpl.Recipe("{recipe}") :noindex: Create an object for the recipe {recipe}. :: import cpl {recipe} = cpl.Recipe("{recipe}") {parameters} .. seealso:: `cpl.Recipe `_ for more information about the recipe object. Bug reports ----------- Please report any problems to `{author} <{email}>`_. Alternatively, you may send a report to the `ESO User Support Department `_. Copyright --------- {license} .. codeauthor:: {author} <{email}> ''' par_template = '''.. py:attribute:: {recipe}.param.{par} {description} [default={default}]. ''' fname_template ="{recipe}.rst" index_template = '''.. title:: Overview The {PIPELINE} {version} pipeline ################################### These pages describe the python interface for the {PIPELINE} pipeline recipes. {recipes} .. toctree:: :hidden: {toctree} .. seealso:: * The `{PIPELINE} Pipeline User Manual `_ in PDF format, * an `overview `_ over the existing ESO pipelines, * the `python-cpl `_ package. Bug reports =========== If you experience an unexpected behavior of any component of the {PIPELINE} pipeline recipes package, please, first refer to the list of known problems and limitations in the pipeline manual of the current {PIPELINE} pipeline release. For any other issues or requests, please, send a report to the `ESO User Support Department `_, describing: * the {PIPELINE} pipeline version, * the version of your OS and C compiler, * the exact sequence of actions that were performed before the problem occurred, * what were precisely the symptoms and the possible error message(s), * whether the problem is repeatable. ''' rst_partemplate = '''Parameters ---------- {pars} The following code snippet shows the default settings for the available parameters. :: import cpl {recipe} = cpl.Recipe("{recipe}") {pars_example1} You may also set or overwrite some or all parameters by the recipe parameter `param`, as shown in the following example: :: import cpl {recipe} = cpl.Recipe("{recipe}") [...] res = {recipe}( ..., param = {{{pars_example2}}}) ''' conf_template = '''project = u'{PIPELINE} pipeline' version = '{version}' release = '{version}' master_doc = 'index' show_authors = True html_theme = 'sphinxdoc' ''' pipeline = sys.argv[1] cpl.Recipe.path = "recipes" recipes = [ cpl.Recipe(name) for name, version in cpl.Recipe.list() ] oca = file(os.path.join("calib", "gasgano", "config", pipeline + ".oca")).read() oca = oca[oca.find("action"):] recipes_oca = [recipe for recipe in recipes if recipe.__name__ in oca] index = [ oca.find(recipe.__name__) for recipe in recipes_oca ] recipes_oca = [r for (i, r) in sorted(zip(index, recipes_oca))] recipes_x = [recipe for recipe in recipes if not recipe.__name__ in oca] recipes_x.sort(key = lambda recipe: recipe.__name__) def par(recipe, template, delimiter = "", count = None): return delimiter.join(template.format( recipe = recipe.__name__, par = p.name.replace("-","_"), type = p.type.__name__, description = p.__doc__.replace("\n", " "), default = '"{0}"'.format(p.default) if p.type is str else p.default ) for i, p in enumerate(recipe.param) if count is None or i < count) def get_description(s): o = [] l = s.splitlines() enabled = True for i, s in enumerate(l): if "BASIC PARAMETERS" in s: enabled = False elif "Examples:" in s: enabled = False elif "Input files" in s: enabled = True o += ["Input files", "^^^^^^^^^^^^", "::"] if len(l[i+1]) != 0: o += [""] elif "Output files" in s: enabled = True o += ["Output files", "^^^^^^^^^^^^", "::"] if len(l[i+1]) != 0: o += [""] elif not enabled: continue elif "-"*40 in s: pass elif len(s) == 0: o += [ s ] elif s[-1] == ".": o += [ s, "" ] else: o += [ s ] return "\n".join(o) def rstpage(recipe, template, partemplate): return template.format( recipe = recipe.__name__, version = recipe.__version__, synopsis = recipe.description[0], description = get_description(recipe.description[1]), email = recipe.__email__, author = recipe.__author__, license = recipe.__copyright__, pipeline = pipeline, parameters = partemplate.format( recipe = recipe.__name__, pars = par(recipe, par_template), pars_example1 = par(recipe, ' {recipe}.param.{par} = {default}\n'), pars_example2 = par(recipe, '"{par}":{default}', ', ', 2) ) if len(recipe.param) > 0 else '' ) for recipe in recipes_oca + recipes_x: f = open(os.path.join("sphinx", fname_template.format(recipe = recipe.__name__)), "w") f.write(rstpage(recipe, rst_template, rst_partemplate)) f.close() if len(recipes_oca) > 0 and len(recipes_x) > 0: toc_recipes = "Standard recipes\n----------------\n" toc_recipes += "\n\n".join(":data:`{recipe}`\n {synopsis}".format( recipe = recipe.__name__, synopsis = recipe.description[0] ) for recipe in recipes_oca) if len(recipes_oca) > 0 and len(recipes_x) > 0: toc_recipes += "\n\nAdditional recipes\n--------------------\n" toc_recipes += "\n\n".join(":data:`{recipe}`\n {synopsis}".format( recipe = recipe.__name__, synopsis = recipe.description[0] ) for recipe in recipes_x) toc = "\n".join(" {recipe}".format( recipe = recipe.__name__ ) for recipe in recipes_oca + recipes_x) f = open(os.path.join("sphinx", "index.rst"), "w") f.write(index_template.format(toctree = toc, recipes = toc_recipes, pipeline = pipeline, PIPELINE = pipeline.upper(), version = recipes[0].__version__)) f.close() f = open(os.path.join("sphinx", "conf.py"), "w") f.write(conf_template.format(PIPELINE = pipeline.upper(), version = recipes[0].__version__)) f.close() debian/compat0000644000000000000000000000000212234447622010372 0ustar 9 debian/changelog0000644000000000000000000000131212264535500011037 0ustar cpl-plugin-xsh (2.3.0+dfsg-3) unstable; urgency=low * Lower -doc dependency to "suggested" * Declare Breaks/Replaces with initial version. (Closes: #734915) -- Ole Streicher Sun, 12 Jan 2014 16:55:52 +0100 cpl-plugin-xsh (2.3.0+dfsg-2) unstable; urgency=low * Enable verbose test output * Upgrade to Standards-Version 3.9.5 (no changes needed) * Move documentation into separate package. (Closes: #733515) * Fix documentation title. -- Ole Streicher Tue, 31 Dec 2013 14:24:38 +0100 cpl-plugin-xsh (2.3.0+dfsg-1) unstable; urgency=low * Initial release. (Closes: #728368) -- Ole Streicher Wed, 27 Nov 2013 16:57:02 +0100 debian/cpl-plugin.install.in0000644000000000000000000000020012234447624013235 0ustar usr/lib/* calib/dic usr/share/cpl-plugins/__PIPELINE__-__VERSION__ calib/gasgano usr/share/cpl-plugins/__PIPELINE__-__VERSION__ debian/control0000644000000000000000000000445712264535736010620 0ustar Source: cpl-plugin-xsh Section: science Priority: optional Maintainer: Debian Science Maintainers Uploaders: Ole Streicher Build-Depends: debhelper (>= 9), dh-autoreconf, libcpl-dev (>= 5.3.1), libgsl0-dev, liblapack-dev, python, python-cpl, python-pyfits, python-sphinx Standards-Version: 3.9.5 Homepage: http://www.eso.org/sci/software/pipelines/xshooter/ Vcs-Git: git://anonscm.debian.org/debian-science/packages/cpl-plugin-xsh.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/cpl-plugin-xsh.git Package: cpl-plugin-xsh Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: esorex|python-cpl Suggests: cpl-plugin-xsh-calib, cpl-plugin-xsh-doc Multi-Arch: same Description: ESO data reduction pipeline for XSHOOTER This is the data reduction pipeline for the XSHOOTER instrument of the Very Large Telescope (VLT) from the European Southern Observatory (ESO). . XSHOOTER is a multi wavelength (300-2500nm) medium resolution spectrograph mounted at the UT2 Cassegrain focus. XSHOOTER consists of 3 arms, each with optimized optics, dispersive elements and detectors: . * UVB, covering the wavelength range 300-559.5 nm, * VIS, covering the wavelength range 559.5-1024 nm, * NIR, covering the wavelength range 1024-2480 nm. Package: cpl-plugin-xsh-doc Architecture: all Multi-Arch: foreign Depends: ${misc:Depends} Replaces: cpl-plugin-xsh (= 2.3.0+dfsg-1) Breaks: cpl-plugin-xsh (= 2.3.0+dfsg-1) Section: doc Description: ESO data reduction pipeline documentation for XSHOOTER This package contains the HTML documentation and manpages for the data reduction pipeline for the XSHOOTER instrument of the Very Large Telescope (VLT) from the European Southern Observatory (ESO). Package: cpl-plugin-xsh-calib Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, cpl-plugin-xsh, wget Section: contrib/science Description: ESO data reduction pipeline calibration data downloader for XSHOOTER This package downloads calibration and other static data of the data reduction pipeline for the XSHOOTER instrument of the Very Large Telescope (VLT) from the European Southern Observatory (ESO). debian/copyright0000644000000000000000000000170712264535072011134 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: xsh Upstream-Contact: ESO User Support Department Source: ftp://ftp.eso.org/pub/dfs/pipelines/xsh/ Files: * Copyright: Copyright (C) 2001-2012 European Southern Observatory 2013 Ole Streicher (Debian packaging) License: GPL-v2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. debian/cpl-plugin-calib.prerm.in0000644000000000000000000000013512234447624013773 0ustar #!/bin/sh set -e rm -rfd /usr/share/cpl-plugins/__PIPELINE__-__VERSION__/cal/ #DEBHELPER# debian/cpl-plugin-calib.postinst.in0000644000000000000000000000075112234447624014535 0ustar #!/bin/sh set -e PIPELINE=__PIPELINE__ VERSION=__VERSION__ KIT=${PIPELINE}-kit-${VERSION} CALIB=${PIPELINE}-calib-${VERSION} URL=ftp://ftp.eso.org/pub/dfs/pipelines/${PIPELINE}/${KIT}.tar.gz TAR=${KIT}/${CALIB}.tar.gz COMPONENTS="${CALIB}/cal" TARGETDIR="/usr/share/cpl-plugins/${PIPELINE}-${VERSION}" if [ "$1" = "configure" ] ; then mkdir -p ${TARGETDIR} wget -O- ${URL} | \ tar xzO ${TAR} | \ tar xzC ${TARGETDIR} ${COMPONENTS} --strip-components=1 fi #DEBHELPER# debian/watch0000644000000000000000000000021612264535072010224 0ustar version=3 opts=dversionmangle=s/\+dfsg// \ http://www.eso.org/sci/software/pipelines/ \ .*/xsh-kit-(.*).tar.gz \ debian debian/repackage.sh debian/cpl-plugin-calib.lintian-overrides.in0000644000000000000000000000016512234447624016307 0ustar # The calibration file installer is an empty package on purpose. cpl-plugin-__PIPELINE__-calib: empty-binary-package debian/cpl-plugin-doc.docs.in0000644000000000000000000000001412260542145013256 0ustar sphinx/html debian/patches/0000755000000000000000000000000012264535141010620 5ustar debian/patches/libadd_cpl.patch0000644000000000000000000003451512264535072013731 0ustar Author: Ole Streicher Description: Add the cpl libraries to the recips.so and the test program --- a/recipes/Makefile.am +++ b/recipes/Makefile.am @@ -110,109 +110,109 @@ #xsh_absorp_la_DEPENDENCIES = $(LIBXSH) xsh_cfg_recover_la_SOURCES = xsh_cfg_recover.c -xsh_cfg_recover_la_LIBADD = $(LIBXSH) +xsh_cfg_recover_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI) xsh_cfg_recover_la_LDFLAGS = -module -avoid-version xsh_cfg_recover_la_DEPENDENCIES = $(LIBXSH) xsh_lingain_la_SOURCES = xsh_lingain.c -xsh_lingain_la_LIBADD = $(LIBXSH) +xsh_lingain_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_lingain_la_LDFLAGS = -module -avoid-version xsh_lingain_la_DEPENDENCIES = $(LIBXSH) xsh_mbias_la_SOURCES = xsh_mbias.c -xsh_mbias_la_LIBADD = $(LIBXSH) +xsh_mbias_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_mbias_la_LDFLAGS = -module -avoid-version xsh_mbias_la_DEPENDENCIES = $(LIBXSH) xsh_mdark_la_SOURCES = xsh_mdark.c -xsh_mdark_la_LIBADD = $(LIBXSH) +xsh_mdark_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_mdark_la_LDFLAGS = -module -avoid-version xsh_mdark_la_DEPENDENCIES = $(LIBXSH) xsh_mflat_la_SOURCES = xsh_mflat.c -xsh_mflat_la_LIBADD = $(LIBXSH) +xsh_mflat_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_mflat_la_LDFLAGS = -module -avoid-version xsh_mflat_la_DEPENDENCIES = $(LIBXSH) xsh_orderpos_la_SOURCES = xsh_orderpos.c -xsh_orderpos_la_LIBADD = $(LIBXSH) +xsh_orderpos_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_orderpos_la_LDFLAGS = -module -avoid-version xsh_orderpos_la_DEPENDENCIES = $(LIBXSH) xsh_predict_la_SOURCES = xsh_predict.c -xsh_predict_la_LIBADD = $(LIBXSH) +xsh_predict_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_predict_la_LDFLAGS = -module -avoid-version xsh_predict_la_DEPENDENCIES = $(LIBXSH) xsh_2dmap_la_SOURCES = xsh_2dmap.c -xsh_2dmap_la_LIBADD = $(LIBXSH) +xsh_2dmap_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_2dmap_la_LDFLAGS = -module -avoid-version xsh_2dmap_la_DEPENDENCIES = $(LIBXSH) xsh_wavecal_la_SOURCES = xsh_wavecal.c -xsh_wavecal_la_LIBADD = $(LIBXSH) +xsh_wavecal_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_wavecal_la_LDFLAGS = -module -avoid-version xsh_wavecal_la_DEPENDENCIES = $(LIBXSH) xsh_flexcomp_la_SOURCES = xsh_flexcomp.c -xsh_flexcomp_la_LIBADD = $(LIBXSH) +xsh_flexcomp_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_flexcomp_la_LDFLAGS = -module -avoid-version xsh_flexcomp_la_DEPENDENCIES = $(LIBXSH) xsh_respon_slit_stare_la_SOURCES = xsh_respon_slit_stare.c -xsh_respon_slit_stare_la_LIBADD = $(LIBXSH) +xsh_respon_slit_stare_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_respon_slit_stare_la_LDFLAGS = -module -avoid-version xsh_respon_slit_stare_la_DEPENDENCIES = $(LIBXSH) xsh_respon_slit_offset_la_SOURCES = xsh_respon_slit_offset.c -xsh_respon_slit_offset_la_LIBADD = $(LIBXSH) +xsh_respon_slit_offset_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_respon_slit_offset_la_LDFLAGS = -module -avoid-version xsh_respon_slit_offset_la_DEPENDENCIES = $(LIBXSH) xsh_respon_slit_nod_la_SOURCES = xsh_respon_slit_nod.c -xsh_respon_slit_nod_la_LIBADD = $(LIBXSH) +xsh_respon_slit_nod_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_respon_slit_nod_la_LDFLAGS = -module -avoid-version xsh_respon_slit_nod_la_DEPENDENCIES = $(LIBXSH) xsh_scired_slit_stare_la_SOURCES = xsh_scired_slit_stare.c -xsh_scired_slit_stare_la_LIBADD = $(LIBXSH) +xsh_scired_slit_stare_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_scired_slit_stare_la_LDFLAGS = -module -avoid-version xsh_scired_slit_stare_la_DEPENDENCIES = $(LIBXSH) xsh_scired_slit_nod_la_SOURCES = xsh_scired_slit_nod.c -xsh_scired_slit_nod_la_LIBADD = $(LIBXSH) +xsh_scired_slit_nod_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_scired_slit_nod_la_LDFLAGS = -module -avoid-version xsh_scired_slit_nod_la_DEPENDENCIES = $(LIBXSH) xsh_scired_slit_offset_la_SOURCES = xsh_scired_slit_offset.c -xsh_scired_slit_offset_la_LIBADD = $(LIBXSH) +xsh_scired_slit_offset_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_scired_slit_offset_la_LDFLAGS = -module -avoid-version xsh_scired_slit_offset_la_DEPENDENCIES = $(LIBXSH) xsh_scired_ifu_stare_la_SOURCES = xsh_util_ifu_stare.c -xsh_scired_ifu_stare_la_LIBADD = $(LIBXSH) +xsh_scired_ifu_stare_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_scired_ifu_stare_la_LDFLAGS = -module -avoid-version xsh_scired_ifu_stare_la_DEPENDENCIES = $(LIBXSH) xsh_scired_ifu_offset_la_SOURCES = xsh_util_ifu_offset.c -xsh_scired_ifu_offset_la_LIBADD = $(LIBXSH) +xsh_scired_ifu_offset_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_scired_ifu_offset_la_LDFLAGS = -module -avoid-version xsh_scired_ifu_offset_la_DEPENDENCIES = $(LIBXSH) xsh_scired_ifu_stare_drl_la_SOURCES = xsh_scired_ifu_stare.c -xsh_scired_ifu_stare_drl_la_LIBADD = $(LIBXSH) +xsh_scired_ifu_stare_drl_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_scired_ifu_stare_drl_la_LDFLAGS = -module -avoid-version xsh_scired_ifu_stare_drl_la_DEPENDENCIES = $(LIBXSH) xsh_scired_ifu_offset_drl_la_SOURCES = xsh_scired_ifu_offset.c -xsh_scired_ifu_offset_drl_la_LIBADD = $(LIBXSH) +xsh_scired_ifu_offset_drl_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_scired_ifu_offset_drl_la_LDFLAGS = -module -avoid-version xsh_scired_ifu_offset_drl_la_DEPENDENCIES = $(LIBXSH) xsh_util_physmod_la_SOURCES = xsh_util_physmod.c -xsh_util_physmod_la_LIBADD = $(LIBXSH) +xsh_util_physmod_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_util_physmod_la_LDFLAGS = -module -avoid-version xsh_util_physmod_la_DEPENDENCIES = $(LIBXSH) @@ -223,141 +223,141 @@ #xsh_util_ipml_la_CPPFLAGS=-Wall -fPIC $(CPL_INCLUDES) -rdynamic #xsh_util_bpmap2rp_la_SOURCES = xsh_util_bpmap2rp.c -#xsh_util_bpmap2rp_la_LIBADD = $(LIBXSH) +#xsh_util_bpmap2rp_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_bpmap2rp_la_LDFLAGS = -module -avoid-version #xsh_util_bpmap2rp_la_DEPENDENCIES = $(LIBXSH) #xsh_util_bpmap_nl_raw2pre_la_SOURCES = xsh_util_bpmap_nl_raw2pre.c -#xsh_util_bpmap_nl_raw2pre_la_LIBADD = $(LIBXSH) +#xsh_util_bpmap_nl_raw2pre_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_bpmap_nl_raw2pre_la_LDFLAGS = -module -avoid-version #xsh_util_bpmap_nl_raw2pre_la_DEPENDENCIES = $(LIBXSH) #xsh_util_bpmap_coadd_la_SOURCES = xsh_util_bpmap_coadd.c -#xsh_util_bpmap_coadd_la_LIBADD = $(LIBXSH) +#xsh_util_bpmap_coadd_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_bpmap_coadd_la_LDFLAGS = -module -avoid-version #xsh_util_bpmap_coadd_la_DEPENDENCIES = $(LIBXSH) #xsh_util_afc_la_SOURCES = xsh_util_afc.c -#xsh_util_afc_la_LIBADD = $(LIBXSH) +#xsh_util_afc_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_afc_la_LDFLAGS = -module -avoid-version #xsh_util_afc_la_DEPENDENCIES = $(LIBXSH) #xsh_util_crh_single_la_SOURCES = xsh_util_crh_single.c -#xsh_util_crh_single_la_LIBADD = $(LIBXSH) +#xsh_util_crh_single_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_crh_single_la_LDFLAGS = -module -avoid-version #xsh_util_crh_single_la_DEPENDENCIES = $(LIBXSH) #xsh_util_efficiency2d_la_SOURCES = xsh_util_efficiency2d.c -#xsh_util_efficiency2d_la_LIBADD = $(LIBXSH) +#xsh_util_efficiency2d_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_efficiency2d_la_LDFLAGS = -module -avoid-version #xsh_util_efficiency2d_la_DEPENDENCIES = $(LIBXSH) #xsh_util_efficiency1d_la_SOURCES = xsh_util_efficiency1d.c -#xsh_util_efficiency1d_la_LIBADD = $(LIBXSH) +#xsh_util_efficiency1d_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_efficiency1d_la_LDFLAGS = -module -avoid-version #xsh_util_efficiency1d_la_DEPENDENCIES = $(LIBXSH) #xsh_util_integrate_la_SOURCES = xsh_util_integrate.c -#xsh_util_integrate_la_LIBADD = $(LIBXSH) +#xsh_util_integrate_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_integrate_la_LDFLAGS = -module -avoid-version #xsh_util_integrate_la_DEPENDENCIES = $(LIBXSH) #xsh_util_ima_oversample_la_SOURCES = xsh_util_ima_oversample.c -#xsh_util_ima_oversample_la_LIBADD = $(LIBXSH) +#xsh_util_ima_oversample_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_ima_oversample_la_LDFLAGS = -module -avoid-version #xsh_util_ima_oversample_la_DEPENDENCIES = $(LIBXSH) #xsh_util_ima_subsample_la_SOURCES = xsh_util_ima_subsample.c -#xsh_util_ima_subsample_la_LIBADD = $(LIBXSH) +#xsh_util_ima_subsample_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_ima_subsample_la_LDFLAGS = -module -avoid-version #xsh_util_ima_subsample_la_DEPENDENCIES = $(LIBXSH) #xsh_util_apply_response_la_SOURCES = xsh_util_apply_response.c -#xsh_util_apply_response_la_LIBADD = $(LIBXSH) +#xsh_util_apply_response_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_apply_response_la_LDFLAGS = -module -avoid-version #xsh_util_apply_response_la_DEPENDENCIES = $(LIBXSH) #xsh_util_compute_response_la_SOURCES = xsh_util_compute_response.c -#xsh_util_compute_response_la_LIBADD = $(LIBXSH) +#xsh_util_compute_response_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_compute_response_la_LDFLAGS = -module -avoid-version #xsh_util_compute_response_la_DEPENDENCIES = $(LIBXSH) #xsh_util_ima_getextno_la_SOURCES = xsh_util_ima_getextno.c -#xsh_util_ima_getextno_la_LIBADD = $(LIBXSH) +#xsh_util_ima_getextno_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_ima_getextno_la_LDFLAGS = -module -avoid-version #xsh_util_ima_getextno_la_DEPENDENCIES = $(LIBXSH) #xsh_util_ima_arith_la_SOURCES = xsh_util_ima_arith.c -#xsh_util_ima_arith_la_LIBADD = $(LIBXSH) +#xsh_util_ima_arith_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_ima_arith_la_LDFLAGS = -module -avoid-version #xsh_util_ima_arith_la_DEPENDENCIES = $(LIBXSH) #xsh_util_ima_shift_la_SOURCES = xsh_util_ima_shift.c -#xsh_util_ima_shift_la_LIBADD = $(LIBXSH) +#xsh_util_ima_shift_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_ima_shift_la_LDFLAGS = -module -avoid-version #xsh_util_ima_shift_la_DEPENDENCIES = $(LIBXSH) #xsh_util_ima_rebin_la_SOURCES = xsh_util_ima_rebin.c -#xsh_util_ima_rebin_la_LIBADD = $(LIBXSH) +#xsh_util_ima_rebin_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_ima_rebin_la_LDFLAGS = -module -avoid-version #xsh_util_ima_rebin_la_DEPENDENCIES = $(LIBXSH) #xsh_linear_la_SOURCES = xsh_linear.c -#xsh_linear_la_LIBADD = $(LIBXSH) +#xsh_linear_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_linear_la_LDFLAGS = -module -avoid-version #xsh_linear_la_DEPENDENCIES = $(LIBXSH) #xsh_model_compute_la_SOURCES = xsh_model_compute.c -#xsh_model_compute_la_LIBADD = $(LIBXSH) +#xsh_model_compute_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_model_compute_la_LDFLAGS = -module -avoid-version #xsh_model_compute_la_DEPENDENCIES = $(LIBXSH) #xsh_model_anneal_la_SOURCES = xsh_model_anneal.c -#xsh_model_anneal_la_LIBADD = $(LIBXSH) +#xsh_model_anneal_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_model_anneal_la_LDFLAGS = -module -avoid-version #xsh_model_anneal_la_DEPENDENCIES = $(LIBXSH) #xsh_model_first_anneal_la_SOURCES = xsh_model_first_anneal.c -#xsh_model_first_anneal_la_LIBADD = $(LIBXSH) +#xsh_model_first_anneal_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_model_first_anneal_la_LDFLAGS = -module -avoid-version #xsh_model_first_anneal_la_DEPENDENCIES = $(LIBXSH) #xsh_util_genconfig_la_SOURCES = xsh_util_genconfig.c -#xsh_util_genconfig_la_LIBADD = $(LIBXSH) +#xsh_util_genconfig_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_genconfig_la_LDFLAGS = -module -avoid-version #xsh_util_genconfig_la_DEPENDENCIES = $(LIBXSH) #xsh_respon_uvbvis_la_SOURCES = xsh_respon_uvbvis.c -#xsh_respon_uvbvis_la_LIBADD = $(LIBXSH) +#xsh_respon_uvbvis_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_respon_uvbvis_la_LDFLAGS = -module -avoid-version #xsh_respon_uvbvis_la_DEPENDENCIES = $(LIBXSH) #xsh_respon_visnir_la_SOURCES = xsh_respon_visnir.c -#xsh_respon_visnir_la_LIBADD = $(LIBXSH) +#xsh_respon_visnir_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_respon_visnir_la_LDFLAGS = -module -avoid-version #xsh_respon_visnir_la_DEPENDENCIES = $(LIBXSH) xsh_geom_ifu_la_SOURCES = xsh_geom_ifu.c -xsh_geom_ifu_la_LIBADD = $(LIBXSH) +xsh_geom_ifu_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) xsh_geom_ifu_la_LDFLAGS = -module -avoid-version xsh_geom_ifu_la_DEPENDENCIES = $(LIBXSH) #xsh_util_ifu_stare_la_SOURCES = xsh_util_ifu_stare.c -#xsh_util_ifu_stare_la_LIBADD = $(LIBXSH) +#xsh_util_ifu_stare_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_ifu_stare_la_LDFLAGS = -module -avoid-version #xsh_util_ifu_stare_la_DEPENDENCIES = $(LIBXSH) #xsh_util_ifu_offset_la_SOURCES = xsh_util_ifu_offset.c -#xsh_util_ifu_offset_la_LIBADD = $(LIBXSH) +#xsh_util_ifu_offset_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_ifu_offset_la_LDFLAGS = -module -avoid-version #xsh_util_ifu_offset_la_DEPENDENCIES = $(LIBXSH) #xsh_util_ifu_build_cube_la_SOURCES = xsh_util_ifu_build_cube.c -#xsh_util_ifu_build_cube_la_LIBADD = $(LIBXSH) +#xsh_util_ifu_build_cube_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_ifu_build_cube_la_LDFLAGS = -module -avoid-version #xsh_util_ifu_build_cube_la_DEPENDENCIES = $(LIBXSH) #xsh_util_guess_xy_la_SOURCES = xsh_util_guess_xy.c -#xsh_util_guess_xy_la_LIBADD = $(LIBXSH) +#xsh_util_guess_xy_la_LIBADD = $(LIBXSH) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) #xsh_util_guess_xy_la_LDFLAGS = -module -avoid-version #xsh_util_guess_xy_la_DEPENDENCIES = $(LIBXSH) --- a/xsh/Makefile.am +++ b/xsh/Makefile.am @@ -221,5 +221,5 @@ libxsh_la_LDFLAGS = $(LAPACK_LDFLAGS) $(GSL_LDFLAGS) $(CPL_LDFLAGS) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -libxsh_la_LIBADD = $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLDRS) $(LIBCPLCORE) $(GSL_LIBS) $(LIBLAPACK) +libxsh_la_LIBADD = $(LIBCEXT) $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLDRS) $(LIBCPLCORE) $(GSL_LIBS) $(LIBLAPACK) $(LIBCFITSIO) libxsh_la_DEPENDENCIES = debian/patches/series0000644000000000000000000000021612264535141012034 0ustar libadd_cpl.patch set_plugindir.patch use-std-paths-for-cpl.patch lapack.patch fix_typos.patch shlib-calls-exit.patch force-serial-tests.patch debian/patches/set_plugindir.patch0000644000000000000000000000062712264535072014521 0ustar Author: Ole Streicher Description: Set the plugin directory so that esorex and python-cpl can find it. --- a/acinclude.m4 +++ b/acinclude.m4 @@ -211,7 +211,7 @@ [ if test -z "$plugindir"; then - plugindir='${libdir}/esopipes-plugins/${PACKAGE}-${VERSION}' + plugindir='${libdir}/cpl/plugins/${PACKAGE}-${VERSION}' fi if test -z "$privatelibdir"; then debian/patches/shlib-calls-exit.patch0000644000000000000000000000657112264535072015021 0ustar Author: Ole Streicher Description: Replace exit() by abort() in shared libs. --- a/xsh/xsh_compute_response.c +++ b/xsh/xsh_compute_response.c @@ -2890,7 +2890,7 @@ ncoeffs = 12; } else { xsh_msg("instrument arm not set"); - exit(0); + abort(); } nbreak = ncoeffs + 2 - order; @@ -3400,7 +3400,7 @@ } //response_fit=xsh_bspline_interpol(response,phigh,instrument); - //exit(0); + //abort(); /* double* spline_fit=NULL; int i=0; --- a/xsh/xsh_create_master.c +++ b/xsh/xsh_create_master.c @@ -373,7 +373,7 @@ xsh_pfits_set_qc_norm_fpn(preFrame->data_header,qc_fpn_val); xsh_pfits_set_qc_norm_fpn_err(preFrame->data_header,qc_fpn_err); } - //exit(0); + //abort(); /* xsh_msg("DRS fpn=%g",qc_fpn_val); */ cleanup: --- a/xsh/xsh_model_anneal.c +++ b/xsh/xsh_model_anneal.c @@ -233,7 +233,7 @@ /* FILE * matchfile=fopen("match.dat","r");*/ if(measfile ==NULL ){ printf("Cannot open the measured coords file\n"); - exit(EXIT_FAILURE);} + abort();} while(fscanf(measfile, "%d %lf %lf %d %lf %d %lf %d\n", &meas_coord[feat_cnt].counter, @@ -249,7 +249,7 @@ fclose(measfile); if (feat_cnt != sizearraywavelengths) { printf("Number of spectral features is not equal to the number of wavelengths and slit posn's supplied! \n %d != %d \n",feat_cnt, sizearraywavelengths); - exit(EXIT_FAILURE);} + abort();} } /*count lines of the calibration files in order to dimension the array's size.*/ @@ -265,7 +265,7 @@ int linecounter=0; if((myfile=fopen((char*)filename,"r"))==NULL){ printf("Cannot open file %s for reading.\n",filename); - exit(EXIT_FAILURE); + abort(); } do --- a/xsh/xsh_model_metric.c +++ b/xsh/xsh_model_metric.c @@ -146,7 +146,7 @@ if ( xsh_SAInit(xsh_3_energy,nparam) == 0 ) { fprintf(stderr,"trouble initializing in xsh_SAInit\n"); - exit(1); + abort(); } local_p_abest=abest; --- a/xsh/xsh_model_r250.c +++ b/xsh/xsh_model_r250.c @@ -243,14 +243,14 @@ if ( argc != 3 ) { printf("Usage -- %s nmr_bins seed\n", argv[0]); - exit(1); + abort(); } nmr_bins = atoi( argv[1] ); if ( nmr_bins > MAX_BINS ) { printf("ERROR -- maximum number of bins is %d\n", MAX_BINS); - exit(1); + abort(); } seed = atoi( argv[2] ); @@ -261,7 +261,7 @@ { for (j = 0; j < NMR_RAND; j++) printf("%f\n", xsh_dr250() ); - exit(0); + abort(); } bin_inc = 1.0 / nmr_bins; --- a/xsh/xsh_utils_efficiency.c +++ b/xsh/xsh_utils_efficiency.c @@ -1109,7 +1109,7 @@ //check(cpl_table_save(tbl_eff,plist, x_plist,name_eff, CPL_IO_DEFAULT)); } - //exit(0); + //abort(); xsh_msg("nclip_tot=%d",nclip_tot); HIGH_ABS_REGION * phigh=NULL; --- a/xsh/xsh_utils_image.c +++ b/xsh/xsh_utils_image.c @@ -1789,7 +1789,7 @@ j_stack += 2; if (j_stack > PIX_STACK_SIZE) { xsh_msg_error("stack too small : aborting"); - exit(-2001) ; + abort() ; } if (ir-i+1 >= j-l) { i_stack[j_stack-1] = ir; --- a/xsh/xsh_model_io.c +++ b/xsh/xsh_model_io.c @@ -695,7 +695,7 @@ (p_all_par+ii)->best>(p_all_par+ii)->max) { printf("limits wrong in config file for parameter: %s \n", (p_all_par+ii)->name); - exit (EXIT_FAILURE); + abort(); } } } debian/patches/fix_test_fail.patch0000644000000000000000000000075412264535075014475 0ustar Author: Ole Streicher Description: Increase tolerance to fix FTBS on mips and ia64 --- a/irplib/tests/irplib_polynomial-test.c +++ b/irplib/tests/irplib_polynomial-test.c @@ -569,7 +569,7 @@ for (i = nreal; i < degree; i++) { const double root = cpl_vector_get(roots, i); - cpl_test_abs(root, cpl_vector_get(self, i), tolerance); + cpl_test_abs(root, cpl_vector_get(self, i), 2*tolerance); /* FIXME: Verify residual as well */ debian/patches/lapack.patch0000644000000000000000000000552512264535072013106 0ustar Author: Ole Streicher Description: Replace clapack by lapack. Gnu Fortran uses the same calling interface as F2c. Therefore, just the C prototypes are needed. The only recipe using lapack is xsh_subtract_sky_single. --- a/acinclude.m4 +++ b/acinclude.m4 @@ -7,7 +7,7 @@ AC_MSG_CHECKING([for lapack]) xsh_lapack_check_header="clapack.h" - xsh_lapack_check_lib="libclapack.a" + xsh_lapack_check_lib="liblapack.so" xsh_lapack_includes="" xsh_lapack_libraries="" @@ -53,8 +53,7 @@ xsh_lapack_incdirs="$xsh_with_lapack_includes" fi - ESO_FIND_FILE($xsh_lapack_check_header, $xsh_lapack_incdirs, - xsh_lapack_includes) + xsh_lapack_includes=notneeded # Check for the lapack library @@ -100,7 +99,7 @@ LAPACK_LDFLAGS="-L$xsh_lapack_libraries" LDFLAGS="$LDFLAGS $LAPACK_LDFLAGS" CPPFLAGS="$CPPFLAGS $LAPACK_INCLUDES" - AC_CHECK_LIB([clapack], [main], [LIBLAPACKC="-lclapack"], AC_MSG_ERROR([Library clapack not found])) + AC_CHECK_LIB([lapack], [main], [LIBLAPACKC="-llapack"], AC_MSG_ERROR([Library lapacke not found])) LIBS="$LIBS $LIBLAPACKC" LIBLAPACK="$LIBLAPACKC" else --- a/xsh/xsh_subtract_sky_single.c +++ b/xsh/xsh_subtract_sky_single.c @@ -67,9 +67,10 @@ #ifdef DARWIN #include #else - #include - #include -#endif +void spbtrf_(char *, int *, int *, float *, int *, int *); +void spbtrs_(char *, int *, int *, int *, const float *, + int *, float *,int *, int *); +#endif #define REGDEBUG_MEDIAN_SPLINE 0 /*----------------------------------------------------------------------------- @@ -245,7 +246,7 @@ double kappa2 = kappa*kappa; for (iii=0;iii Description: Force serial-tests to get better verbose output Bug: http://bugs.debian.org/715204 --- a/xsh/tests/Makefile.am +++ b/xsh/tests/Makefile.am @@ -17,7 +17,7 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -AUTOMAKE_OPTIONS = 1.6 foreign +AUTOMAKE_OPTIONS = 1.13 foreign serial-tests DISTCLEANFILES = *~ *.dat *.dmp --- a/regtests/tests/Makefile.am +++ b/regtests/tests/Makefile.am @@ -17,7 +17,7 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -AUTOMAKE_OPTIONS = 1.8 foreign +AUTOMAKE_OPTIONS = 1.13 foreign serial-tests DISTCLEANFILES = *~ debian/patches/use-std-paths-for-cpl.patch0000644000000000000000000000514112264535072015706 0ustar Author: Ole Streicher Description: Use standard path and name for cpl --- a/m4macros/cpl.m4 +++ b/m4macros/cpl.m4 @@ -8,7 +8,7 @@ cpl_cfitsio_check_version="$1" cpl_cfitsio_check_header="fitsio.h" - cpl_cfitsio_check_lib="libcfitsio.a" + cpl_cfitsio_check_lib="libcfitsio.so" cpl_cfitsio_incdirs="" cpl_cfitsio_libdirs="" @@ -109,7 +109,7 @@ cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib64" cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib" cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib32" - + cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)" test -n "$CFITSIODIR" && \ cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \ $CFITSIODIR/lib32 $cpl_cfitsio_libdirs" @@ -556,6 +556,7 @@ cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib64" cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib" cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib32" + cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)" test -n "$CPLDIR" && \ cpl_cext_libdirs="$CPLDIR/lib64 \ @@ -742,6 +743,7 @@ cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib64" cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib" cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib32" + cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)" test -n "$WCSDIR" && \ cpl_wcs_libdirs="$WCSDIR/lib64 \ @@ -976,6 +978,7 @@ cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib64" cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib" cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib32" + cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)" test -n "$FFTWDIR" && \ cpl_fftw_libdirs="$FFTWDIR/lib64 \ @@ -1314,7 +1317,7 @@ AC_MSG_CHECKING([for CPL]) cpl_check_cpl_header="cpl.h" - cpl_check_cpl_lib="libcplcore.a" + cpl_check_cpl_lib="libcplcore.so" cpl_incdirs="" cpl_libdirs="" @@ -1391,6 +1394,7 @@ cpl_libdirs="$cpl_libdirs /usr/lib64" cpl_libdirs="$cpl_libdirs /usr/lib" cpl_libdirs="$cpl_libdirs /usr/lib32" + cpl_libdirs="$cpl_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)" test -n "$CPLDIR" && \ cpl_libdirs="$CPLDIR/lib64 $CPLDIR/lib $CPLDIR/lib32 \ debian/patches/fix_typos.patch0000644000000000000000000000435112264535072013673 0ustar Author: Ole Streicher Description: Fix several typos mentioned by lintian --- a/xsh/xsh_compute_noise_map.c +++ b/xsh/xsh_compute_noise_map.c @@ -171,7 +171,7 @@ //xsh_msg( "pixel[%d,%d] (%d) = %lf", ix, iy, idpix, fval ) ; if (rej > 0) { /* bad pixel */ - xsh_msg_dbg_medium("Dont use pixel %d,%d [%d]", ix, iy, j); + xsh_msg_dbg_medium("Don't use pixel %d,%d [%d]", ix, iy, j); continue; } sum += fval; --- a/xsh/xsh_compute_response.c +++ b/xsh/xsh_compute_response.c @@ -2269,7 +2269,7 @@ double flux_save=0; - cpl_error_ensure(ref_std_star_list != NULL, CPL_ERROR_NULL_INPUT,return res,"NULL input refence std star list"); + cpl_error_ensure(ref_std_star_list != NULL, CPL_ERROR_NULL_INPUT,return res,"NULL input reference std star list"); cpl_error_ensure(resp_fit_points != NULL, CPL_ERROR_NULL_INPUT,return res,"NULL input table with response fit points"); cpl_error_ensure(inst != NULL, CPL_ERROR_NULL_INPUT,return res,"NULL input instrument"); --- a/xsh/xsh_detmon.c +++ b/xsh/xsh_detmon.c @@ -614,7 +614,7 @@ "CPL_TYPE_INT", ref_ury, "stacking.method", - "Method to be used when stacking the master. Posible values < MINMAX | MEAN | MEDIAN | KSIGMA >", + "Method to be used when stacking the master. Possible values < MINMAX | MEAN | MEDIAN | KSIGMA >", "CPL_TYPE_STRING", stacking_method, "stacking.ks.low", @@ -2495,7 +2495,7 @@ skip_if(cpl_propertylist_append(xplist, qclist)); } - cpl_msg_info(cpl_func,"dealing with extention %d",whichext); + cpl_msg_info(cpl_func,"dealing with extension %d",whichext); /* This is only used later for PAF */ /* Get FITS header from reference file */ --- a/xsh/xsh_parameters.c +++ b/xsh/xsh_parameters.c @@ -1018,7 +1018,7 @@ check( xsh_parameters_new_boolean( list, recipe_id, "detectorder-qc-mode", CPL_FALSE, - "If true allows to skip edge detection on orders below detectorder-min-sn (oly for QC mode, not to be set by normal users)")); + "If true allows one to skip edge detection on orders below detectorder-min-sn (oly for QC mode, not to be set by normal users)")); cleanup: return; debian/cpl-plugin-doc.doc-base.in0000644000000000000000000000150112260542145014005 0ustar Document: cpl-plugin-__PIPELINE__ Title: __PIPELINE__ pipeline documentation Section: Science/Astronomy Abstract: The __PIPELINE__ pipeline is a subsystem of the Data Flow System for handling data taken with the Very Large Telescope (VLT) of the European Southern Observatory (ESO). It provides the standard algorithms for the quick-look assessment of data, the generation of master calibration data, the reduction of scientific exposures, in the data quality control. The FORS pipeline recipes are made public to the user community, to enable a more personalised processing of the data from the instrument. . This document describes the Python interface for the __PIPELINE__ pipeline. Format: HTML Index: /usr/share/doc/cpl-plugin-__PIPELINE__-doc/html/index.html Files: /usr/share/doc/cpl-plugin-__PIPELINE__-doc/html/* debian/rules0000755000000000000000000000437112260542145010254 0ustar #!/usr/bin/make -f # -*- makefile -*- #export DH_VERBOSE=1 DEBVERS ?= $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') VERSION ?= $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/+.*//') DEBPKGNAME ?= $(shell dpkg-parsechangelog | grep -E ^Source: | cut -d" " -f2) PIPELINE ?= $(shell echo '$(DEBPKGNAME)' | sed -e 's/cpl-plugin-//') get-orig-source: sh ./debian/repackage.sh %: dh $@ --with autoreconf,sphinxdoc debian_files: if [ -d calib/cal ] ; then \ dfiles=".install -doc.manpages -doc.docs -doc.doc-base -calib.install" ; \ else \ cp -f debian/README.Debian.in debian/README.Debian ; \ dfiles=".install -doc.manpages -doc.docs -doc.doc-base -calib.postinst -calib.prerm -calib.lintian-overrides" ; \ fi ; \ for f in $$dfiles ; do \ sed "s/__VERSION__/$(VERSION)/g;s/__PIPELINE__/${PIPELINE}/g" \ < debian/cpl-plugin$$f.in \ > debian/${DEBPKGNAME}$$f ; \ done override_dh_install: debian_files dh_install override_dh_installman-indep: mkdir -p man python debian/create_manpage.py ${PIPELINE} dh_installman override_dh_installdocs-indep: mkdir -p sphinx python debian/create_sphinx.py ${PIPELINE} sphinx-build sphinx sphinx/html dh_installdocs override_dh_sphinxdoc: if [ -d sphinx ] ; then \ dh_sphinxdoc ; \ fi override_dh_clean: dh_clean rm -rf debian/${DEBPKGNAME}.install \ debian/${DEBPKGNAME}-doc.manpages \ debian/${DEBPKGNAME}-doc.docs \ debian/${DEBPKGNAME}-doc.doc-base \ debian/${DEBPKGNAME}-calib.lintian-overrides \ debian/${DEBPKGNAME}-calib.install \ debian/${DEBPKGNAME}-calib.postinst \ debian/${DEBPKGNAME}-calib.prerm \ debian/README.Debian \ man sphinx override_dh_auto_configure: dh_auto_configure -- --prefix=/usr/ override_dh_makeshlibs: sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'` override_dh_installchangelogs: if [ -s ChangeLog ] ; then \ dh_installchangelogs ChangeLog ; \ else \ dh_installchangelogs ; \ fi override_dh_gencontrol-indep: dh_gencontrol if [ ! -d calib/cal ] ; then \ sed "s/Installed-Size:.*/Installed-Size: $(shell cat calib/cal_size)/" -i debian/${DEBPKGNAME}-calib/DEBIAN/control ; \ fi debian/source/0000755000000000000000000000000012234447622010474 5ustar debian/source/format0000644000000000000000000000001412234447622011702 0ustar 3.0 (quilt) debian/create_manpage.py0000644000000000000000000000707312264535072012510 0ustar #!/usr/bin/env python import cpl import os import sys import re man_template = '''.TH {NAME} "{section}" "{version}" "{name}" "{pipeline} recipes" .SH NAME {name} - {synopsis} .SH SYNOPSIS esorex .B {name} [OPTIONS] FILE.sof .SH DESCRIPTION {description} .SH OPTIONS {options} .PP Note that it is possible to create a configuration file containing these options, along with suitable default values. Please refer to the details provided by the 'esorex --help' command. .SH SEE ALSO The full documentation for the {pipeline} pipeline can be downloaded as a PDF file using the following URL: .IP .B ftp://ftp.eso.org/pub/dfs/pipelines/{pipeline}/{pipeline}-pipeline-manual-12.1.pdf .PP An overview over the existing ESO pipelines can be found on the web page \\fBhttp://www.eso.org/sci/software/pipelines/\\fR. .PP Basic documentation about the EsoRex program can be found at the esorex (1) man page. .PP It is possible to call the pipelines from python using the python-cpl package. See \\fBhttp://packages.python.org/python-cpl/index.html\\fR for further information. .PP The other recipes of the {pipeline} pipeline are {seealso} .SH VERSION {name} {version} .SH AUTHOR {author} <{email}> .SH BUG REPORTS Please report any problems to {email}. Alternatively, you may send a report to the ESO User Support Department . .SH LICENSE {license} ''' par_template = '''.TP \\fB--{name}\\fR \\fI<{type}>\\fR {description}. The full name of this option for the EsoRex configuration file is \\fB{fullname}\\fR [default = \\fI{default}\\fR]. ''' seealso_template = ".IR {name} ({section})" fname_template ="{name}.{section}" section = 7 pipeline = sys.argv[1] cpl.Recipe.path = "recipes" recipes = cpl.Recipe.list() def param(recipe, template): return "".join(template.format(name = p.name, fullname = p.fullname, type = p.type.__name__, description = p.__doc__.replace("'", "\\'"), default = p.default) for p in recipe.param) def seealso(recipe, template): return ",\n".join(template.format(name = name, section=section) for name,v in recipes if (name != recipe.__name__)) def manpage(recipe): description = recipe.description[1] description = re.sub("-"*40+"+", "", description) \ .replace(".\n", ".\n.PP\n").replace("'", "\\'") description = re.sub("\n([A-Z][A-Z 0-9]+):?\n----+", "\n.SS \\1", description) return man_template.format(name = recipe.__name__, NAME = recipe.__name__.upper(), section = section, version = recipe.__version__, synopsis = recipe.description[0], description = description, seealso = seealso(recipe, seealso_template), email = recipe.__email__, author = recipe.__author__, license = recipe.__copyright__, pipeline = pipeline, options = param(recipe, par_template)) for name, version in recipes: recipe = cpl.Recipe(name) f = open(os.path.join("man", fname_template.format(name = name, section=section)), "w") f.write(manpage(recipe).replace('-', '\\-')) f.close() debian/cpl-plugin-calib.install.in0000644000000000000000000000007112234447624014313 0ustar calib/cal usr/share/cpl-plugins/__PIPELINE__-__VERSION__ debian/README.Debian.in0000644000000000000000000000034612234447624011647 0ustar Due to their size, static calibration files are not included. Installing the "calib" subpackage will download the corresponding files from the ESO archive. -- Ole Streicher Fri, 13 Sep 2013 18:50:00 +0200