Commit fdc410d8 authored by Ole Streicher's avatar Ole Streicher

New upstream version 3.1.1+dfsg

parent eec8bce3
3.1.1 04/05/2017 Fixed typo workflow
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.
......
v 3.1.1 (2018-05-07):
-fixed typo in reflex top level layout RAW_DATA_DIR (appearing only for install_esoreflex based installations)
v 3.1.0 (2018-04-01):
-Support of reduction data after 31/01/2018 upgrade (PIPE-7651)
-Updated of DFS for Paranal 2018
......
......@@ -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.1.0
DATA_FILES=/usr/share/esopipes/datastatic/sinfo-3.1.1
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.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
RECIPE_SET=sinfo_rec_detlin=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_rec_detlin.so;sinfo_rec_distortion=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_rec_distortion.so;sinfo_rec_jitter=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_rec_jitter.so;sinfo_rec_mdark=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_rec_mdark.so;sinfo_rec_mflat=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_rec_mflat.so;sinfo_rec_pupil=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_rec_pupil.so;sinfo_rec_wavecal=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_rec_wavecal.so;sinfo_utl_bp_mask_add=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_utl_bp_mask_add.so;sinfo_utl_cube2ima=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_utl_cube2ima.so;sinfo_utl_cube_combine=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_utl_cube_combine.so;sinfo_utl_cube2spectrum=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_utl_cube2spectrum.so;sinfo_utl_cube_arith=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_utl_cube_arith.so;sinfo_utl_ima_arith=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_utl_ima_arith.so;sinfo_utl_skycor=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_utl_skycor.so;sinfo_utl_skymap=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_utl_skymap.so;sinfo_utl_spectrum_divide_by_blackbody=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_utl_spectrum_divide_by_blackbody.so;sinfo_utl_spectrum_wavelength_shift=/usr/lib64/esopipes-plugins/sinfo-3.1.1/sinfo_utl_spectrum_wavelength_shift.so
SCRIPTS_DIR=/home/astro4/gasgano/scripts/gas-scripts
SHORTEN_FILES_PATH=false
SHORT_FILENAME=true
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for SINFONI Instrument Pipeline 3.1.0.
# Generated by GNU Autoconf 2.69 for SINFONI Instrument Pipeline 3.1.1.
#
# Report bugs to <usd-help@eso.org>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='SINFONI Instrument Pipeline'
PACKAGE_TARNAME='sinfo'
PACKAGE_VERSION='3.1.0'
PACKAGE_STRING='SINFONI Instrument Pipeline 3.1.0'
PACKAGE_VERSION='3.1.1'
PACKAGE_STRING='SINFONI Instrument Pipeline 3.1.1'
PACKAGE_BUGREPORT='usd-help@eso.org'
PACKAGE_URL=''
......@@ -1383,7 +1383,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures SINFONI Instrument Pipeline 3.1.0 to adapt to many kinds of systems.
\`configure' configures SINFONI Instrument Pipeline 3.1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1454,7 +1454,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of SINFONI Instrument Pipeline 3.1.0:";;
short | recursive ) echo "Configuration of SINFONI Instrument Pipeline 3.1.1:";;
esac
cat <<\_ACEOF
......@@ -1586,7 +1586,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
SINFONI Instrument Pipeline configure 3.1.0
SINFONI Instrument Pipeline configure 3.1.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2001,7 +2001,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by SINFONI Instrument Pipeline $as_me 3.1.0, which was
It was created by SINFONI Instrument Pipeline $as_me 3.1.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2980,7 +2980,7 @@ fi
# Define the identity of the package.
PACKAGE='sinfo'
VERSION='3.1.0'
VERSION='3.1.1'
cat >>confdefs.h <<_ACEOF
......@@ -16319,7 +16319,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by SINFONI Instrument Pipeline $as_me 3.1.0, which was
This file was extended by SINFONI Instrument Pipeline $as_me 3.1.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -16385,7 +16385,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
SINFONI Instrument Pipeline config.status 3.1.0
SINFONI Instrument Pipeline config.status 3.1.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
# Process this file with autoconf to produce a configure script.
AC_INIT([SINFONI Instrument Pipeline], [3.1.0], [usd-help@eso.org], [sinfo])
AC_INIT([SINFONI Instrument Pipeline], [3.1.1], [usd-help@eso.org], [sinfo])
AC_PREREQ([2.59])
......
......@@ -199,16 +199,15 @@ void irplib_framelist_delete(irplib_framelist * self)
/*----------------------------------------------------------------------------*/
irplib_framelist * irplib_framelist_cast(const cpl_frameset * frameset)
{
irplib_framelist * self;
int i ;
cpl_ensure(frameset != NULL, CPL_ERROR_NULL_INPUT, NULL);
/* The function cannot fail now */
self = irplib_framelist_new();
for (int i = 0; i < cpl_frameset_get_size(frameset); i++)
for (i = 0; i < cpl_frameset_get_size(frameset); i++)
{
const cpl_frame * frame = cpl_frameset_get_position_const(frameset, i);
......@@ -242,15 +241,15 @@ irplib_framelist * irplib_framelist_cast(const cpl_frameset * frameset)
/*----------------------------------------------------------------------------*/
cpl_frameset * irplib_frameset_cast(const irplib_framelist * self)
{
cpl_frameset * new;
int i ;
cpl_ensure(self != NULL, CPL_ERROR_NULL_INPUT, NULL);
/* The function cannot fail now */
new = cpl_frameset_new();
for (int i = 0; i < self->size; i++) {
for (i = 0; i < self->size; i++) {
cpl_frame * frame = cpl_frame_duplicate(self->frame[i]);
#ifndef NDEBUG
const cpl_error_code error =
......
......@@ -216,6 +216,37 @@
goto cleanup, "Propagating error");\
} while (0)
/*----------------------------------------------------------------------------*/
/*
@brief Skip if A != B
@param A The 1st double to compare
@param B The 2nd double to compare
@param MSG A printf-style error message, 1st arg should be a string literal
@see skip_if()
@note A and B are evaluated exactly once
If no CPL error is set, sets CPL_ERROR_DATA_NOT_FOUND on failure
*/
/*----------------------------------------------------------------------------*/
#define skip_if_ne(A, B, ...) \
do { \
/* Name-space protected one-time only evaluation */ \
const double irplib_utils_a = (double)(A); \
const double irplib_utils_b = (double)(B); \
\
cpl_error_ensure(!cpl_error_get_code(), cpl_error_get_code(), \
goto cleanup, "Propagating a pre-existing error"); \
if (irplib_utils_a != irplib_utils_b) { \
char * irplib_utils_msg = cpl_sprintf(__VA_ARGS__); \
(void)cpl_error_set_message(cpl_func, CPL_ERROR_DATA_NOT_FOUND, \
"Need %g (not %g) %s", \
irplib_utils_b, irplib_utils_a, \
irplib_utils_msg); \
cpl_free(irplib_utils_msg); \
goto cleanup; \
} \
} while (0)
/*----------------------------------------------------------------------------*/
/*
@brief Skip if A < B
......
......@@ -59,7 +59,7 @@
</property>
<property name="_vergilCenter" class="ptolemy.data.expr.ExpertParameter" value="{1093.1207502930833, 473.5580304806565}">
</property>
<property name="RAW_DATA_DIR" class="ptolemy.data.expr.FileParameter" value="/data2/sinfoni/spr/mpe_meet/data_with_raw_calibs">
<property name="RAW_DATA_DIR" class="ptolemy.data.expr.FileParameter" value="$ROOT_DATA_DIR/reflex_input/sinfo">
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>none</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>yang zhao, edward lee</configure></property>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment