Commit eec8bce3 authored by Ole Streicher's avatar Ole Streicher

New upstream version 3.1.0+dfsg

parent c75fe6e5
3.1.0 13/03/2017 Paranal 2018 release.
3.1.0b10 19/02/2017 Candidate Paranal 2018 release. Proper handling of DRS_SETUP_WAVE and DRS_SETUP_WAVE_OH
3.1.0b9 19/02/2017 Candidate Paranal 2018 release. Merged HDRL-response branch.
3.1.0b8 19/02/2017 Candidate Paranal 2018 release. Set different PRO.CATG on DRS_SETUP_WAVE for OH lines
3.1.0b7 15/02/2018 Andling case where HIGH_ABS_REGIONS is missing
3.1.0b6 09/02/2017 Candidate Paranal 2018 release. Fix typo help parameter bp_dist.max_cut
3.1.0b5 09/02/2017 Candidate Paranal 2018 release. Better fix of PIPE-7651
3.1.0b4 06/02/2018 Updated for new data after commissioning
3.1.0b3 06/02/2017 Candidate Paranal 2018 release. Fixed problem reducing SINFONI J band distortion data after com 01/02/2017. PIPE-7651
3.1.0b1 15/12/2017 Candidate Paranal 2018 release
3.0.9 15/12/2017 Fixed PIPE-7570
3.0.8 07/12/2017 Fixed bug in fluxcal of cube
3.0.7 29/11/2017 Updated to reflect new HDRL
3.0.6 13/11/2017 Updated to test new esoreflex
3.0.5 04/09/2017 Fixed PIPE-7327, added response computation
3.0.4 04/06/2017 added creation QC param for efficiency
3.0.3 09/05/2017 fixed problems including GSL in HDRL
3.0.2 09/05/2017 fixed PIPE-7200
3.0.2 08/05/2017 3.0.2 fixed PIPE-7147
3.0.1 05/05/2017 3.0.1 including first implementation (not yet certified by SDP) of efficiency
3.0.0 19/04/2017 Renamed 2.9.9 as 3.0.0 for public release
2.9.9 03/04/2017 Fixed PIPE-7147
2.9.8 23/02/2017 Candidate April 2017 release (fixed RBS cfg)
......
......@@ -28,7 +28,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-maintainer-mode
COMPILE_FIRST =
TOPSUBDIRS = irplib sinfoni recipes regtests reflex
TOPSUBDIRS = hdrl irplib sinfoni recipes regtests reflex
#COMPILE_LAST = sinfoni/tests
COMPILE_LAST =
......
......@@ -92,7 +92,8 @@ target_triplet = @target@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4macros/cpl.m4 \
$(top_srcdir)/m4macros/eso.m4 \
$(top_srcdir)/m4macros/eso.m4 $(top_srcdir)/m4macros/gsl.m4 \
$(top_srcdir)/m4macros/hdrl.m4 \
$(top_srcdir)/m4macros/libtool.m4 \
$(top_srcdir)/m4macros/ltoptions.m4 \
$(top_srcdir)/m4macros/ltsugar.m4 \
......@@ -277,6 +278,13 @@ ESO_DEBUG_FLAGS = @ESO_DEBUG_FLAGS@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
GSL_INCLUDES = @GSL_INCLUDES@
GSL_LDFLAGS = @GSL_LDFLAGS@
GSL_LIBS = @GSL_LIBS@
HDRL_INCLUDES = @HDRL_INCLUDES@
HDRL_INTERNAL_CFLAGS = @HDRL_INTERNAL_CFLAGS@
HDRL_LDFLAGS = @HDRL_LDFLAGS@
HDRL_LIBS = @HDRL_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
......@@ -291,6 +299,7 @@ LIBCPLCORE = @LIBCPLCORE@
LIBCPLDFS = @LIBCPLDFS@
LIBCPLDRS = @LIBCPLDRS@
LIBCPLUI = @LIBCPLUI@
LIBHDRL = @LIBHDRL@
LIBIRPLIB = @LIBIRPLIB@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
......@@ -390,6 +399,7 @@ psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
......@@ -406,7 +416,7 @@ ACLOCAL_AMFLAGS = -I m4macros
DISTCLEANFILES = *~ .logfile
DISTCHECK_CONFIGURE_FLAGS = --enable-maintainer-mode
COMPILE_FIRST =
TOPSUBDIRS = irplib sinfoni recipes regtests reflex
TOPSUBDIRS = hdrl irplib sinfoni recipes regtests reflex
#COMPILE_LAST = sinfoni/tests
COMPILE_LAST =
......
v 3.1.0 (2018-04-01):
-Support of reduction data after 31/01/2018 upgrade (PIPE-7651)
-Updated of DFS for Paranal 2018
-Updated reflex oca rules to support new esoreflex-2.9.0
-Added efficiency compuation
-Added response computation
-Added flux calibration
-Fixed Reflex fv problem opening product files for inspection
-Fix minor bugs reported by QC
......@@ -13,7 +13,7 @@ AC_DEFUN([LIB_CHECK_FFTW],
detmon_fftw_libraries=""
AC_ARG_WITH(fftw,
AC_HELP_STRING([--with-fftw],
AS_HELP_STRING([--with-fftw],
[location where fftw is installed]),
[
detmon_with_fftw_includes=$withval/include
......@@ -21,17 +21,17 @@ AC_DEFUN([LIB_CHECK_FFTW],
])
AC_ARG_WITH(fftw-includes,
AC_HELP_STRING([--with-fftw-includes],
AS_HELP_STRING([--with-fftw-includes],
[location of the fftw header files]),
detmon_with_fftw_includes=$withval)
AC_ARG_WITH(fftw-libs,
AC_HELP_STRING([--with-fftw-libs],
AS_HELP_STRING([--with-fftw-libs],
[location of the fftw library]),
detmon_with_fftw_libs=$withval)
AC_ARG_ENABLE(fftw-test,
AC_HELP_STRING([--disable-fftw-test],
AS_HELP_STRING([--disable-fftw-test],
[disables checks for the fftw library and headers]),
detmon_enable_fftw_test=$enableval,
detmon_enable_fftw_test=yes)
......
......@@ -1211,6 +1211,8 @@ AC_SUBST([am__untar])
m4_include([m4macros/cpl.m4])
m4_include([m4macros/eso.m4])
m4_include([m4macros/gsl.m4])
m4_include([m4macros/hdrl.m4])
m4_include([m4macros/libtool.m4])
m4_include([m4macros/ltoptions.m4])
m4_include([m4macros/ltsugar.m4])
......
......@@ -5,7 +5,7 @@ CLASSRULE_FILE=/usr/share/esopipes/rul/sinfo.oca
COMPONENT_FONT=Dialog:14
CUBE_TO_VIEWER=
CUBE_VIEWER_TYPE=SHELLCOMMAND
DATA_FILES=/usr/share/esopipes/datastatic/sinfo-3.0.0
DATA_FILES=/usr/share/esopipes/datastatic/sinfo-3.1.0
DBOBS_DISPLAY_COLUMNS=CLASSIFICATION:RA:DEC:TPL.EXPNO:TPL.NEXP
DBOBS_DISPLAY_COLUMNS_SIZE=0:0:0:0:0
DBOBS_INSTRUMENT=All
......@@ -41,7 +41,7 @@ PRINTER_NAME=lp
PRINT_FONT=Monospaced:16
PRINT_ORIENTATION=P
RADEC_CONVERSION=true
RECIPE_SET=sinfo_rec_detlin=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_rec_detlin.so;sinfo_rec_distortion=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_rec_distortion.so;sinfo_rec_jitter=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_rec_jitter.so;sinfo_rec_mdark=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_rec_mdark.so;sinfo_rec_mflat=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_rec_mflat.so;sinfo_rec_pupil=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_rec_pupil.so;sinfo_rec_wavecal=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_rec_wavecal.so;sinfo_utl_bp_mask_add=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_bp_mask_add.so;sinfo_utl_cube2ima=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_cube2ima.so;sinfo_utl_cube_combine=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_cube_combine.so;sinfo_utl_cube2spectrum=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_cube2spectrum.so;sinfo_utl_cube_arith=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_cube_arith.so;sinfo_utl_ima_arith=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_ima_arith.so;sinfo_utl_skycor=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_skycor.so;sinfo_utl_skymap=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_skymap.so;sinfo_utl_spectrum_divide_by_blackbody=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_spectrum_divide_by_blackbody.so;sinfo_utl_spectrum_wavelength_shift=/usr/lib64/esopipes-plugins/sinfo-3.0.0/sinfo_utl_spectrum_wavelength_shift.so
RECIPE_SET=sinfo_rec_detlin=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_rec_detlin.so;sinfo_rec_distortion=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_rec_distortion.so;sinfo_rec_jitter=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_rec_jitter.so;sinfo_rec_mdark=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_rec_mdark.so;sinfo_rec_mflat=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_rec_mflat.so;sinfo_rec_pupil=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_rec_pupil.so;sinfo_rec_wavecal=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_rec_wavecal.so;sinfo_utl_bp_mask_add=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_utl_bp_mask_add.so;sinfo_utl_cube2ima=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_utl_cube2ima.so;sinfo_utl_cube_combine=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_utl_cube_combine.so;sinfo_utl_cube2spectrum=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_utl_cube2spectrum.so;sinfo_utl_cube_arith=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_utl_cube_arith.so;sinfo_utl_ima_arith=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_utl_ima_arith.so;sinfo_utl_skycor=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_utl_skycor.so;sinfo_utl_skymap=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_utl_skymap.so;sinfo_utl_spectrum_divide_by_blackbody=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_utl_spectrum_divide_by_blackbody.so;sinfo_utl_spectrum_wavelength_shift=/usr/lib64/esopipes-plugins/sinfo-3.1.0/sinfo_utl_spectrum_wavelength_shift.so
SCRIPTS_DIR=/home/astro4/gasgano/scripts/gas-scripts
SHORTEN_FILES_PATH=false
SHORT_FILENAME=true
......
......@@ -221,6 +221,21 @@ if PRO.CATG like "%FLUX_STD_CATALOG%" then
DO.CATG = "FLUX_STD_CATALOG";
}
if PRO.CATG like "%EFFICIENCY_WINDOWS%" then
{
DO.CATG = "EFFICIENCY_WINDOWS";
}
if PRO.CATG like "%FLUX_STD_CATALOG%" then
{
DO.CATG = "FLUX_STD_CATALOG";
}
if PRO.CATG like "%EFFICIENCY%" then
{
DO.CATG = "EFFICIENCY";
}
if PRO.CATG like "%BP_MAP%" then
{
......@@ -290,10 +305,16 @@ if PRO.CATG like "%FIRST_COL%" then
{
DO.CATG = "FIRST_COL";
}
if PRO.CATG like "%DRS_SETUP_WAVE%" then
if PRO.CATG == "DRS_SETUP_WAVE" then
{
DO.CATG = "DRS_SETUP_WAVE";
}
if PRO.CATG == "DRS_SETUP_WAVE_OH" then
{
DO.CATG = "DRS_SETUP_WAVE_OH";
}
if PRO.CATG like "%MASTER_FLAT_LAMP%" then
{
DO.CATG = "MASTER_FLAT_LAMP";
......@@ -571,6 +592,49 @@ if PRO.CATG like "%SKY_STACKED_DUMMY%" then
DO.CATG = "SKY_STACKED_DUMMY";
}
if PRO.CATG == "EFFICIENCY_WINDOWS" then
{
DO.CATG = "EFFICIENCY_WINDOWS";
}
if PRO.CATG == "RESPONSE_WINDOWS" then
{
DO.CATG = "RESPONSE_WINDOWS";
}
if PRO.CATG == "EXTCOEFF_TABLE" then
{
DO.CATG = "EXTCOEFF_TABLE";
}
if PRO.CATG == "FLUX_STD_CATALOG" then
{
DO.CATG = "FLUX_STD_CATALOG";
}
if PRO.CATG == "FIT_AREAS" then
{
DO.CATG = "FIT_AREAS";
}
if PRO.CATG == "QUALITY_AREAS" then
{
DO.CATG = "QUALITY_AREAS";
}
if PRO.CATG == "HIGH_ABS_REGIONS" then
{
DO.CATG = "HIGH_ABS_REGIONS";
}
if PRO.CATG == "RESPONSE" then
{
DO.CATG = "RESPONSE";
}
if PRO.CATG == "RESP_FIT_POINTS_CATALOG" then
{
DO.CATG = "RESP_FIT_POINTS_CATALOG";
}
if PRO.CATG == "TELL_MOD_CATALOG" then
{
DO.CATG = "TELL_MOD_CATALOG";
}
select execute(sinfo_rec_jitter_stdstar) from inputFiles where SIG.TEMPLATE == 1 and LF.DO.CATG == "STD";
select execute(sinfo_rec_mflat) from inputFiles where SIG.TEMPLATE == 1 and LF.DO.CATG == "FLAT_LAMP";
select execute(sinfo_rec_distortion) from inputFiles where SIG.TEMPLATE == 1 and LF.DO.CATG == "FLAT_NS";
......@@ -678,6 +742,17 @@ select file as SLIT_POS from calibFiles where DO.CATG == "SLIT_POS"
minRet = 1; maxRet = 1;
select file as DISTORTION from calibFiles where DO.CATG == "DISTORTION"
and inputFile.INSTRUME==INSTRUME and inputFile.INS.SETUP.ID==INS.SETUP.ID;
minRet = 0; maxRet = 1;
select file as EXTCOEFF_TABLE from calibFiles where DO.CATG == "EXTCOEFF_TABLE"
and inputFile.INSTRUME==INSTRUME and inputFile.INS.SETUP.ID==INS.SETUP.ID;
minRet = 0; maxRet = 1;
select file as RESPONSE from calibFiles where DO.CATG == "RESPONSE"
and inputFile.INSTRUME==INSTRUME and inputFile.INS.SETUP.ID==INS.SETUP.ID;
recipe sinfo_rec_jitter;
}
......@@ -691,6 +766,13 @@ select file as EXTCOEFF_TABLE from calibFiles where DO.CATG == "EXTCOEFF_TABLE"
minRet = 0; maxRet = 1;
select file as FLUX_STD_CATALOG from calibFiles where DO.CATG == "FLUX_STD_CATALOG"
and inputFile.INSTRUME==INSTRUME;
minRet = 0; maxRet = 1;
select file as EFFICIENCY_WINDOWS from calibFiles where DO.CATG == "EFFICIENCY_WINDOWS" and inputFile.INS.FILT1.NAME==INS.FILT1.NAME
and inputFile.INSTRUME==INSTRUME;
minRet = 1; maxRet = 1;
select file as MASTER_BP_MAP from calibFiles where DO.CATG == "MASTER_BP_MAP"
and inputFile.INSTRUME==INSTRUME and inputFile.INS.SETUP.ID==INS.SETUP.ID and inputFile.INS.OPTI1.NAME==INS.OPTI1.NAME;
......@@ -715,6 +797,50 @@ select file as SLIT_POS from calibFiles where DO.CATG == "SLIT_POS"
minRet = 1; maxRet = 1;
select file as DISTORTION from calibFiles where DO.CATG == "DISTORTION"
and inputFile.INSTRUME==INSTRUME and inputFile.INS.SETUP.ID==INS.SETUP.ID;
minRet = 0; maxRet = 1;
select file as EFFICIENCY_WINDOWS from calibFiles where DO.CATG == "EFFICIENCY_WINDOWS"
and inputFile.INSTRUME==INSTRUME and inputFile.INS.FILT1.NAME == INS.FILT1.NAME;
minRet = 0; maxRet = 1;
select file as RESPONSE_WINDOWS from calibFiles where DO.CATG == "RESPONSE_WINDOWS"
and inputFile.INSTRUME==INSTRUME and inputFile.INS.FILT1.NAME == INS.FILT1.NAME;
minRet = 0; maxRet = 1;
select file as EXTCOEFF_TABLE from calibFiles where DO.CATG == "EXTCOEFF_TABLE"
and inputFile.INSTRUME==INSTRUME;
minRet = 0; maxRet = 1;
select file as FLUX_STD_CATALOG from calibFiles where DO.CATG == "FLUX_STD_CATALOG"
and inputFile.INSTRUME==INSTRUME;
minRet = 0; maxRet = 1;
select file as TELL_MOD_CATALOG from calibFiles where DO.CATG == "TELL_MOD_CATALOG"
and inputFile.INSTRUME==INSTRUME;
minRet = 0; maxRet = 1;
select file as FIT_AREAS from calibFiles where DO.CATG == "FIT_AREAS"
and inputFile.INSTRUME==INSTRUME and inputFile.INS.FILT1.NAME == INS.FILT1.NAME;
minRet = 0; maxRet = 1;
select file as QUALITY_AREAS from calibFiles where DO.CATG == "QUALITY_AREAS"
and inputFile.INSTRUME==INSTRUME and inputFile.INS.FILT1.NAME == INS.FILT1.NAME;
minRet = 0; maxRet = 1;
select file as HIGH_ABS_REGIONS from calibFiles where DO.CATG == "HIGH_ABS_REGIONS"
and inputFile.INSTRUME==INSTRUME and inputFile.INS.FILT1.NAME == INS.FILT1.NAME;
minRet = 0; maxRet = 1;
select file as RESP_FIT_POINTS_CATALOG from calibFiles where DO.CATG == "RESP_FIT_POINTS_CATALOG"
and inputFile.INSTRUME==INSTRUME;
//minRet = 0; maxRet = 1;
//select file as RESPONSE from calibFiles where DO.CATG == "RESPONSE"
// and inputFile.INSTRUME==INSTRUME and inputFile.INS.FILT1.NAME == INS.FILT1.NAME;
recipe sinfo_rec_jitter;
}
......
......@@ -24,9 +24,15 @@
/* Define to 1 if you have the `floor' function. */
#undef HAVE_FLOOR
/* Define to 1 iff you have GSL */
#undef HAVE_GSL
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 iff you have GSL */
#undef HAVE_LIBGSL
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
......
This diff is collapsed.
# Process this file with autoconf to produce a configure script.
AC_INIT([SINFONI Instrument Pipeline], [3.0.0], [usd-help@eso.org], [sinfo])
AC_INIT([SINFONI Instrument Pipeline], [3.1.0], [usd-help@eso.org], [sinfo])
AC_PREREQ([2.59])
......@@ -11,6 +11,7 @@ AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
AC_CONFIG_SUBDIRS([hdrl])
AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE([enable])
......@@ -46,6 +47,57 @@ ESO_PROG_CC_FLAG([fno-builtin], [CFLAGS="$CFLAGS -fno-builtin"])
ESO_PROG_CC_FLAG([std=c99], [CFLAGS="$CFLAGS -std=c99"])
ESO_PROG_CC_FLAG([Werror=implicit-function-declaration],
[CFLAGS="-Werror=implicit-function-declaration $CFLAGS"])
#From Lars
ESO_PROG_CC_FLAG([Werror=incompatible-pointer-types],
[CFLAGS="$CFLAGS -Werror=incompatible-pointer-types"])
# Werror=format=2 replaced by below for CPL_DIAG_PRAGMA_PUSH_IGN(-Wformat-nonliteral)
ESO_PROG_CC_FLAG([Werror=format], [CFLAGS="$CFLAGS -Werror=format"])
ESO_PROG_CC_FLAG([Werror=format-nonliteral],
[CFLAGS="$CFLAGS -Werror=format-nonliteral"])
ESO_PROG_CC_FLAG([Werror=format-security],
[CFLAGS=" $CFLAGS -Werror=format-security"])
ESO_PROG_CC_FLAG([Werror=format-y2k],
[CFLAGS="$CFLAGS -Werror=format-y2k"])
ESO_PROG_CC_FLAG([Werror=init-self],
[CFLAGS="$CFLAGS -Werror=init-self"])
ESO_PROG_CC_FLAG([Werror=missing-declarations],
[CFLAGS="$CFLAGS -Werror=missing-declarations"])
ESO_PROG_CC_FLAG([Werror=missing-format-attribute],
[CFLAGS="$CFLAGS -Werror=missing-format-attribute"])
ESO_PROG_CC_FLAG([Werror=missing-noreturn],
[CFLAGS="$CFLAGS -Werror=missing-noreturn"])
ESO_PROG_CC_FLAG([Werror=nested-externs],
[CFLAGS="$CFLAGS -Werror=nested-externs"])
ESO_PROG_CC_FLAG([Werror=pointer-arith],
[CFLAGS="$CFLAGS -Werror=pointer-arith"])
ESO_PROG_CC_FLAG([Werror=redundant-decls],
[CFLAGS="$CFLAGS -Werror=redundant-decls"])
ESO_PROG_CC_FLAG([Werror=sign-compare],
[CFLAGS="$CFLAGS -Werror=sign-compare"])
ESO_PROG_CC_FLAG([Werror=undef],
[CFLAGS="$CFLAGS -Werror=undef"])
ESO_PROG_CC_FLAG([Werror=variadic-macros],
[CFLAGS="$CFLAGS -Werror=variadic-macros"])
ESO_PROG_CC_FLAG([Werror=volatile-register-var],
[CFLAGS="$CFLAGS -Werror=volatile-register-var"])
ESO_PROG_CC_FLAG([Werror=write-strings],
[CFLAGS="$CFLAGS -Werror=write-strings"])
ESO_PROG_CC_FLAG([Werror=old-style-definition],
[CFLAGS="$CFLAGS -Werror=old-style-definition"])
ESO_PROG_CC_FLAG([Werror=missing-prototypes],
[CFLAGS="$CFLAGS -Wmissing-prototypes"])
ESO_PROG_CC_FLAG([Werror=maybe-uninitialized],
[CFLAGS="$CFLAGS -Wmaybe-uninitialized"])
ESO_PROG_CC_FLAG([fno-common], [CFLAGS="$CFLAGS -fno-common"])
ESO_PROG_CC_FLAG([fstrict-aliasing], [CFLAGS="$CFLAGS -fstrict-aliasing"])
ESO_CHECK_DOCTOOLS
AC_ENABLE_STATIC(no)
......@@ -60,6 +112,7 @@ AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])
AC_CHECK_LIB(nsl, inet_ntoa, [LIBS="$LIBS -lnsl"])
#LIB_CHECK_FFTW
GSL_CHECK_LIBS
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([string.h])
......@@ -74,6 +127,7 @@ ESO_FUNC_STRDUP
# Check for CPL/Qfits presence and usability
CPL_CHECK_LIBS
HDRL_CHECK([hdrl])
# Check for Purify
CHECK_PURIFY
......
......@@ -180,8 +180,8 @@ INCLUDED_BY_GRAPH = YES
GRAPHICAL_HIERARCHY = NO
DOT_PATH =
DOTFILE_DIRS =
MAX_DOT_GRAPH_WIDTH = 1024
MAX_DOT_GRAPH_HEIGHT = 1024
#MAX_DOT_GRAPH_WIDTH = 1024
#MAX_DOT_GRAPH_HEIGHT = 1024
GENERATE_LEGEND = YES
DOT_CLEANUP = YES
......@@ -189,9 +189,9 @@ DOT_CLEANUP = YES
# Configuration::addtions related to the search engine
#---------------------------------------------------------------------------
SEARCHENGINE = NO
CGI_NAME =
CGI_URL =
DOC_URL =
DOC_ABSPATH =
BIN_ABSPATH =
EXT_DOC_PATHS =
#CGI_NAME =
#CGI_URL =
#DOC_URL =
#DOC_ABSPATH =
#BIN_ABSPATH =
#EXT_DOC_PATHS =
## Process this file with automake to produce Makefile.in
## This file is part of the HDRL Pipeline
## Copyright (C) 2012,2013 European Southern Observatory
## This library 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.
## You should have received a copy of the GNU General Public License
## 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
DISTCLEANFILES = *~
SUBDIRS = catalogue . catalogue/tests tests
EXTRA_DIST = m4macros/eso.m4 m4macros/cpl-pipeline.m4
if MAINTAINER_MODE
MAINTAINERCLEANFILES = Makefile.in
endif
ACLOCAL_AMFLAGS = -I m4macros
AM_CPPFLAGS = -DCX_LOG_DOMAIN=\"HdrlLib\" -DHDRL_USE_PRIVATE $(CPL_INCLUDES) $(GSL_INCLUDES)
hdrlHEADERS = hdrl_overscan.h \
hdrl_sigclip.h \
hdrl_utils.h \
hdrl_combine.h \
hdrl_bpm_2d.h \
hdrl_bpm_3d.h \
hdrl_bpm_fit.h \
hdrl_bpm_utils.h \
hdrl_iter.h \
hdrl_frameiter.h \
hdrl_multiiter.h \
hdrl_collapse.h \
hdrl_elemop.h \
hdrl_flat.h \
hdrl_prototyping.h \
hdrl_image.h \
hdrl_image_math.h \
hdrl_imagelist.h \
hdrl_imagelist_io.h \
hdrl_imagelist_basic.h \
hdrl_imagelist_view.h \
hdrl_parameter.h \
hdrl_parameter_defs.h \
hdrl_strehl.h \
hdrl_types.h \
hdrl_test.h \
hdrl_buffer.h \
hdrl_overscan_defs.h \
hdrl_image_defs.h \
hdrl_imagelist_defs.h \
hdrl_spectrum_defs.h \
hdrl_lacosmics.h \
hdrl_fit.h \
hdrl_fringe.h \
hdrl_catalogue.h \
hdrl_random.h \
hdrl_spectrum.h \
hdrl_spectrumlist.h \
hdrl_spectrum_resample.h \
hdrl_spectrum_shift.h \
hdrl_DER_SNR.h \
hdrl_correlation.h \
hdrl_efficiency.h \
hdrl_response.h \
hdrl_dar.h \
hdrl.h
libhdrl_la_SOURCES = hdrl_overscan.c \
hdrl_sigclip.c \
hdrl_utils.c \
hdrl_combine.c \
hdrl_bpm_2d.c \
hdrl_bpm_3d.c \
hdrl_bpm_fit.c \
hdrl_bpm_utils.c \
hdrl_iter.c \
hdrl_frameiter.c \
hdrl_multiiter.c \
hdrl_collapse.c \
hdrl_elemop.c \
hdrl_flat.c \
hdrl_fit.c \
hdrl_strehl.c \
hdrl_prototyping.c \
hdrl_image.c \
hdrl_image_math.c \
hdrl_imagelist_io.c \
hdrl_imagelist_basic.c \
hdrl_imagelist_view.c \
hdrl_parameter.c \
hdrl_lacosmics.c \
hdrl_buffer.c \
hdrl_fringe.c \
hdrl_catalogue.c \
hdrl_random.c \
hdrl_spectrum.c \
hdrl_spectrumlist.c \
hdrl_spectrum_resample.c \
hdrl_spectrum_shift.c \
hdrl_DER_SNR.c \
hdrl_correlation.c \
hdrl_response.c \
hdrl_efficiency.c \
hdrl_dar.c \
igam.c
libhdrl_la_CFLAGS = $(AM_CFLAGS)
libhdrl_la_LDFLAGS = $(CPL_LDFLAGS) $(GSL_LDFLAGS) -static
libhdrl_la_LIBADD = $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLDRS) $(LIBCPLCORE) $(GSL_LIBS) catalogue/libcatalogue.la
if VLTSW
lib_LTLIBRARIES = libhdrl.la
pkginclude_HEADERS = $(hdrlHEADERS)
else
noinst_LTLIBRARIES = libhdrl.la
noinst_HEADERS = $(hdrlHEADERS)
endif
This diff is collapsed.
# on SL6 aclocal 1.11 doesn't check this folder even though its in
# AC_CONFIG_MACRO_DIR. Fixed in later aclocal versions
m4_include([m4macros/cpl-pipeline.m4])
m4_include([m4macros/eso.m4])
# HDRL_SET_VERSION_INFO(VERSION, [CURRENT], [REVISION], [AGE])
#----------------------------------------------------------------
# Setup various version information, especially the libtool versioning
AC_DEFUN([HDRL_SET_VERSION_INFO],
[
hdrldemo_version=`echo "$1" | sed -e 's/[[a-z,A-Z]].*$//'`
hdrldemo_major_version=`echo "$hdrldemo_version" | \
sed 's/\([[0-9]]*\).\(.*\)/\1/'`
hdrldemo_minor_version=`echo "$hdrldemo_version" | \
sed 's/\([[0-9]]*\).\([[0-9]]*\)\(.*\)/\2/'`
hdrldemo_micro_version=`echo "$hdrldemo_version" | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test -z "$hdrldemo_major_version"; then hdrldemo_major_version=0
fi
if test -z "$hdrldemo_minor_version"; then hdrldemo_minor_version=0
fi
if test -z "$hdrldemo_micro_version"; then hdrldemo_micro_version=0
fi
HDRL_VERSION="$hdrldemo_version"
HDRL_MAJOR_VERSION=$hdrldemo_major_version
HDRL_MINOR_VERSION=$hdrldemo_minor_version
HDRL_MICRO_VERSION=$hdrldemo_micro_version
if test -z "$4"; then HDRL_INTERFACE_AGE=0
else HDRL_INTERFACE_AGE="$4"
fi
HDRL_BINARY_AGE=`expr 100 '*' $HDRL_MINOR_VERSION + $HDRL_MICRO_VERSION`