[cpl-plugin-iiinstrument] 01/02: New upstream version 0.0.5
Ole Streicher
olebole-guest at moszumanska.debian.org
Wed Nov 27 16:24:31 UTC 2013
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository cpl-plugin-iiinstrument.
commit 512240bc39216d36e3301981f60caf88fe862c37
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Nov 4 14:50:42 2013 +0100
New upstream version 0.0.5
---
Makefile.am | 2 +-
Makefile.in | 2 +-
Makefile.purify.in | 2 +-
calib/dic/ESO-DFS-DIC.IIINSTRUMENT_QC | 6 +-
config.h.in | 11 +
configure | 238 +++-
configure.ac | 7 +-
html/dir_b351cdfeb4656d7d168dc72b273024e7.html | 4 +-
html/files.html | 4 +-
html/index.html | 4 +-
html/rrrecipe_8c_source.html | 10 +-
html/rrrecipe__calib_8c_source.html | 10 +-
iiinstrument/iiinstrument_dfs.c | 6 +-
iiinstrument/iiinstrument_dfs.h | 12 +-
iiinstrument/iiinstrument_pfits.c | 6 +-
iiinstrument/iiinstrument_pfits.h | 14 +-
iiinstrument/iiinstrument_utils.c | 6 +-
iiinstrument/iiinstrument_utils.h | 14 +-
iiinstrument/tests/Makefile.am | 2 +-
iiinstrument/tests/Makefile.in | 2 +-
iiinstrument/tests/iiinstrument_dfs-test.c | 6 +-
irplib/irplib_calib.c | 6 +-
irplib/irplib_calib.h | 6 +-
irplib/irplib_cat.c | 6 +-
irplib/irplib_cat.h | 6 +-
irplib/irplib_distortion.c | 6 +-
irplib/irplib_distortion.h | 6 +-
irplib/irplib_flat.c | 6 +-
irplib/irplib_flat.h | 6 +-
irplib/irplib_framelist.c | 6 +-
irplib/irplib_framelist.h | 6 +-
irplib/irplib_hist.c | 12 +-
irplib/irplib_hist.h | 6 +-
irplib/irplib_ksigma_clip.c | 6 +-
irplib/irplib_ksigma_clip.h | 6 +-
irplib/irplib_ksigma_clip_body.h | 6 +-
irplib/irplib_match_cats.c | 6 +-
irplib/irplib_match_cats.h | 6 +-
irplib/irplib_mkmaster.c | 6 +-
irplib/irplib_mkmaster.h | 6 +-
irplib/irplib_oddeven.c | 6 +-
irplib/irplib_oddeven.h | 6 +-
irplib/irplib_plugin.c | 19 +-
irplib/irplib_plugin.h | 6 +-
irplib/irplib_polynomial.c | 6 +-
irplib/irplib_polynomial.h | 6 +-
irplib/irplib_ppm.c | 6 +-
irplib/irplib_ppm.h | 6 +-
irplib/irplib_slitpos.c | 12 +-
irplib/irplib_slitpos.h | 6 +-
irplib/irplib_spectrum.c | 6 +-
irplib/irplib_spectrum.h | 6 +-
irplib/irplib_stdstar.c | 6 +-
irplib/irplib_stdstar.h | 6 +-
irplib/irplib_strehl.c | 6 +-
irplib/irplib_strehl.h | 6 +-
irplib/irplib_utils.c | 39 +-
irplib/irplib_utils.h | 14 +-
irplib/irplib_wavecal.c | 6 +-
irplib/irplib_wavecal.h | 6 +-
irplib/irplib_wavecal_impl.h | 6 +-
irplib/irplib_wcs.c | 6 +-
irplib/irplib_wcs.h | 6 +-
irplib/irplib_wlxcorr.c | 6 +-
irplib/irplib_wlxcorr.h | 6 +-
irplib/tests/irplib_cat-test.c | 6 +-
irplib/tests/irplib_polynomial-test.c | 6 +-
irplib/tests/irplib_wcs-test.c | 6 +-
irplib/tests/irplib_wlxcorr-test.c | 6 +-
recipes/rrrecipe.c | 6 +-
recipes/rrrecipe_calib.c | 6 +-
reflex/Makefile.am | 2 +-
reflex/Makefile.in | 10 +-
.../{Iiinstrument.xml.in => iiinstrument.xml.in} | 1426 ++++++++++++++------
reflex/iiinstrument_wkf.oca | 4 +-
regtests/tests/Makefile.am | 2 +-
regtests/tests/Makefile.in | 2 +-
setup | 4 +-
78 files changed, 1490 insertions(+), 694 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 3d20c0f..8d403ab 100644
--- a/Makefile.am
+++ b/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.8 foreign serial-tests
ACLOCAL_AMFLAGS = -I m4macros
diff --git a/Makefile.in b/Makefile.in
index fa08758..b8b5e01 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -330,7 +330,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
wkfcopydir = @wkfcopydir@
wkfextradir = @wkfextradir@
-AUTOMAKE_OPTIONS = 1.8 foreign
+AUTOMAKE_OPTIONS = 1.8 foreign serial-tests
ACLOCAL_AMFLAGS = -I m4macros
DISTCLEANFILES = *~
COMPILE_FIRST =
diff --git a/Makefile.purify.in b/Makefile.purify.in
index c4eadcb..1c15f55 100644
--- a/Makefile.purify.in
+++ b/Makefile.purify.in
@@ -1,7 +1,7 @@
#*******************************************************************************
# E.S.O. - VLT project
#
-# "@(#) $Id: Makefile.purify.in,v 1.2 2008/05/09 11:46:25 cguirao Exp $"
+# "@(#) $Id: Makefile.purify.in,v 1.2 2008-05-09 11:46:25 cguirao Exp $"
#
# Makefile of Pipeline subsystem.
#
diff --git a/calib/dic/ESO-DFS-DIC.IIINSTRUMENT_QC b/calib/dic/ESO-DFS-DIC.IIINSTRUMENT_QC
index f2a4379..655d716 100644
--- a/calib/dic/ESO-DFS-DIC.IIINSTRUMENT_QC
+++ b/calib/dic/ESO-DFS-DIC.IIINSTRUMENT_QC
@@ -1,9 +1,9 @@
#******************************************************************************
# E.S.O. - VLT project
#
-# $Id: ESO-DFS-DIC.IIINSTRUMENT_QC,v 1.2 2012/03/14 12:21:03 cgarcia Exp $
+# $Id: ESO-DFS-DIC.IIINSTRUMENT_QC,v 1.2 2012-03-14 12:21:03 cgarcia Exp $
# $Author: cgarcia $
-# $Date: 2012/03/14 12:21:03 $
+# $Date: 2012-03-14 12:21:03 $
# $Revision: 1.2 $
#
#******************************************************************************
@@ -14,7 +14,7 @@
Dictionary Name: ESO-DFS-DIC.IIINSTRUMENT_QC
Scope: QC
Source: ESO SDD/PSD
-Version Control: "$Id: ESO-DFS-DIC.IIINSTRUMENT_QC,v 1.2 2012/03/14 12:21:03 cgarcia Exp $"
+Version Control: "$Id: ESO-DFS-DIC.IIINSTRUMENT_QC,v 1.2 2012-03-14 12:21:03 cgarcia Exp $"
Revision: 1.0
Date: 2007-08-20
Status: submitted
diff --git a/config.h.in b/config.h.in
index c5c2b77..f230327 100644
--- a/config.h.in
+++ b/config.h.in
@@ -109,6 +109,17 @@
/* Define if using the dmalloc debugging malloc package */
#undef WITH_DMALLOC
+/* Enable large inode numbers on Mac OS X 10.5. */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
diff --git a/configure b/configure
index 7e30c64..4dc9192 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for IIINSTRUMENT Instrument Pipeline 0.0.3.
+# Generated by GNU Autoconf 2.69 for IIINSTRUMENT Instrument Pipeline 0.0.5.
#
# Report bugs to <flastname at eso.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='IIINSTRUMENT Instrument Pipeline'
PACKAGE_TARNAME='iiinstrument'
-PACKAGE_VERSION='0.0.3'
-PACKAGE_STRING='IIINSTRUMENT Instrument Pipeline 0.0.3'
+PACKAGE_VERSION='0.0.5'
+PACKAGE_STRING='IIINSTRUMENT Instrument Pipeline 0.0.5'
PACKAGE_BUGREPORT='flastname at eso.org'
PACKAGE_URL=''
@@ -796,6 +796,7 @@ ac_user_opts='
enable_option_checking
enable_maintainer_mode
enable_dependency_tracking
+enable_largefile
enable_purify
enable_debug
enable_strict
@@ -1369,7 +1370,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 IIINSTRUMENT Instrument Pipeline 0.0.3 to adapt to many kinds of systems.
+\`configure' configures IIINSTRUMENT Instrument Pipeline 0.0.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1440,7 +1441,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of IIINSTRUMENT Instrument Pipeline 0.0.3:";;
+ short | recursive ) echo "Configuration of IIINSTRUMENT Instrument Pipeline 0.0.5:";;
esac
cat <<\_ACEOF
@@ -1455,6 +1456,7 @@ Optional Features:
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
+ --disable-largefile omit support for large files
--disable-purify disalbes the check for the PURIFY installation
--enable-debug creates debugging code [[default=no]]
--enable-strict compiles with strict compiler options (may not
@@ -1564,7 +1566,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-IIINSTRUMENT Instrument Pipeline configure 0.0.3
+IIINSTRUMENT Instrument Pipeline configure 0.0.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1979,7 +1981,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 IIINSTRUMENT Instrument Pipeline $as_me 0.0.3, which was
+It was created by IIINSTRUMENT Instrument Pipeline $as_me 0.0.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2918,7 +2920,7 @@ fi
# Define the identity of the package.
PACKAGE='iiinstrument'
- VERSION='0.0.3'
+ VERSION='0.0.5'
cat >>confdefs.h <<_ACEOF
@@ -4374,6 +4376,209 @@ $as_echo "no, using $LN_S" >&6; }
fi
+# large file support
+
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+ enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_sys_largefile_CC=no
+ if test "$GCC" != yes; then
+ ac_save_CC=$CC
+ while :; do
+ # IRIX 6.2 and later do not support large files by default,
+ # so use the C compiler's -n32 option if that helps.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+ break
+fi
+rm -f core conftest.err conftest.$ac_objext
+ CC="$CC -n32"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+ break
+ done
+ CC=$ac_save_CC
+ rm -f conftest.$ac_ext
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+ if test "$ac_cv_sys_largefile_CC" != no; then
+ CC=$CC$ac_cv_sys_largefile_CC
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if ${ac_cv_sys_file_offset_bits+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_file_offset_bits=64; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_sys_file_offset_bits=unknown
+ break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+ no | unknown) ;;
+ *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+ if test $ac_cv_sys_file_offset_bits = unknown; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if ${ac_cv_sys_large_files+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ && LARGE_OFF_T % 2147483647 == 1)
+ ? 1 : -1];
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_sys_large_files=unknown
+ break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+ no | unknown) ;;
+ *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+ fi
+
+
+fi
+
+
#
# Check for purify
#
@@ -6709,7 +6914,6 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
if test -n "$ac_tool_prefix"; then
for ac_prog in ar
do
@@ -12948,7 +13152,7 @@ fi
for i in $cpl_incdirs; do
for j in $cpl_check_cpl_header; do
- echo "configure: 12951: $i/$j" >&5
+ echo "configure: 13155: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
@@ -12998,7 +13202,7 @@ fi
for i in $cpl_libdirs; do
for j in $cpl_check_cpl_lib; do
- echo "configure: 13001: $i/$j" >&5
+ echo "configure: 13205: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
@@ -13133,7 +13337,7 @@ fi
for i in $cpl_cext_incdirs; do
for j in $cpl_cext_check_header; do
- echo "configure: 13136: $i/$j" >&5
+ echo "configure: 13340: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
@@ -13189,7 +13393,7 @@ fi
for i in $cpl_cext_libdirs; do
for j in $cpl_cext_check_lib; do
- echo "configure: 13192: $i/$j" >&5
+ echo "configure: 13396: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
@@ -13611,7 +13815,7 @@ fi
-ac_config_files="$ac_config_files Makefile Makefile.purify doxygen/Doxyfile iiinstrument/Makefile iiinstrument/tests/Makefile reflex/Makefile reflex/Iiinstrument.xml recipes/Makefile regtests/Makefile regtests/tests/Makefile irplib/Makefile irplib/tests/Makefile"
+ac_config_files="$ac_config_files Makefile Makefile.purify doxygen/Doxyfile iiinstrument/Makefile iiinstrument/tests/Makefile reflex/Makefile reflex/iiinstrument.xml recipes/Makefile regtests/Makefile regtests/tests/Makefile irplib/Makefile irplib/tests/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -14151,7 +14355,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 IIINSTRUMENT Instrument Pipeline $as_me 0.0.3, which was
+This file was extended by IIINSTRUMENT Instrument Pipeline $as_me 0.0.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14217,7 +14421,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="\\
-IIINSTRUMENT Instrument Pipeline config.status 0.0.3
+IIINSTRUMENT Instrument Pipeline config.status 0.0.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -14632,7 +14836,7 @@ do
"iiinstrument/Makefile") CONFIG_FILES="$CONFIG_FILES iiinstrument/Makefile" ;;
"iiinstrument/tests/Makefile") CONFIG_FILES="$CONFIG_FILES iiinstrument/tests/Makefile" ;;
"reflex/Makefile") CONFIG_FILES="$CONFIG_FILES reflex/Makefile" ;;
- "reflex/Iiinstrument.xml") CONFIG_FILES="$CONFIG_FILES reflex/Iiinstrument.xml" ;;
+ "reflex/iiinstrument.xml") CONFIG_FILES="$CONFIG_FILES reflex/iiinstrument.xml" ;;
"recipes/Makefile") CONFIG_FILES="$CONFIG_FILES recipes/Makefile" ;;
"regtests/Makefile") CONFIG_FILES="$CONFIG_FILES regtests/Makefile" ;;
"regtests/tests/Makefile") CONFIG_FILES="$CONFIG_FILES regtests/tests/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index ad44ef7..7725b6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT([IIINSTRUMENT Instrument Pipeline], [0.0.3], [flastname at eso.org],
+AC_INIT([IIINSTRUMENT Instrument Pipeline], [0.0.5], [flastname at eso.org],
[iiinstrument])
AC_PREREQ([2.59])
@@ -39,6 +39,9 @@ AC_PROG_CPP
AM_PROG_CC_C_O
AC_PROG_LN_S
+# large file support
+AC_SYS_LARGEFILE
+
#
# Check for purify
#
@@ -96,7 +99,7 @@ AC_CONFIG_FILES(Makefile
iiinstrument/Makefile
iiinstrument/tests/Makefile
reflex/Makefile
- reflex/Iiinstrument.xml
+ reflex/iiinstrument.xml
recipes/Makefile
regtests/Makefile
regtests/tests/Makefile
diff --git a/html/dir_b351cdfeb4656d7d168dc72b273024e7.html b/html/dir_b351cdfeb4656d7d168dc72b273024e7.html
index 5920b95..b5c3e0a 100644
--- a/html/dir_b351cdfeb4656d7d168dc72b273024e7.html
+++ b/html/dir_b351cdfeb4656d7d168dc72b273024e7.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">IIINSTRUMENT Pipeline Reference Manual
- <span id="projectnumber">0.0.3</span>
+ <span id="projectnumber">0.0.5</span>
</div>
</td>
</tr>
@@ -54,7 +54,7 @@ Files</h2></td></tr>
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Wed Mar 27 2013 16:30:25 for IIINSTRUMENT Pipeline Reference Manual by <a href="http://www.doxygen.org/index.html">
+Generated on Mon Nov 4 2013 14:15:20 for IIINSTRUMENT Pipeline Reference Manual by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.3.1
</small></address>
diff --git a/html/files.html b/html/files.html
index 14aedd2..bda6f74 100644
--- a/html/files.html
+++ b/html/files.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">IIINSTRUMENT Pipeline Reference Manual
- <span id="projectnumber">0.0.3</span>
+ <span id="projectnumber">0.0.5</span>
</div>
</td>
</tr>
@@ -53,7 +53,7 @@
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Wed Mar 27 2013 16:30:25 for IIINSTRUMENT Pipeline Reference Manual by <a href="http://www.doxygen.org/index.html">
+Generated on Mon Nov 4 2013 14:15:20 for IIINSTRUMENT Pipeline Reference Manual by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.3.1
</small></address>
diff --git a/html/index.html b/html/index.html
index 600e777..b6559e6 100644
--- a/html/index.html
+++ b/html/index.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">IIINSTRUMENT Pipeline Reference Manual
- <span id="projectnumber">0.0.3</span>
+ <span id="projectnumber">0.0.5</span>
</div>
</td>
</tr>
@@ -42,7 +42,7 @@
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Wed Mar 27 2013 16:30:25 for IIINSTRUMENT Pipeline Reference Manual by <a href="http://www.doxygen.org/index.html">
+Generated on Mon Nov 4 2013 14:15:20 for IIINSTRUMENT Pipeline Reference Manual by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.3.1
</small></address>
diff --git a/html/rrrecipe_8c_source.html b/html/rrrecipe_8c_source.html
index de40ebf..4887fdd 100644
--- a/html/rrrecipe_8c_source.html
+++ b/html/rrrecipe_8c_source.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">IIINSTRUMENT Pipeline Reference Manual
- <span id="projectnumber">0.0.3</span>
+ <span id="projectnumber">0.0.5</span>
</div>
</td>
</tr>
@@ -48,7 +48,7 @@
<div class="title">rrrecipe.c</div> </div>
</div><!--header-->
<div class="contents">
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno"> 1</span> <span class="comment">/* $Id: rrrecipe.c,v 1.33 2013/03/26 17:00:45 jtaylor Exp $</span></div>
+<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno"> 1</span> <span class="comment">/* $Id: rrrecipe.c,v 1.33 2013-03-26 17:00:45 jtaylor Exp $</span></div>
<div class="line"><a name="l00002"></a><span class="lineno"> 2</span> <span class="comment"> *</span></div>
<div class="line"><a name="l00003"></a><span class="lineno"> 3</span> <span class="comment"> * This file is part of the IIINSTRUMENT Pipeline</span></div>
<div class="line"><a name="l00004"></a><span class="lineno"> 4</span> <span class="comment"> * Copyright (C) 2002,2003 European Southern Observatory</span></div>
@@ -70,9 +70,9 @@
<div class="line"><a name="l00020"></a><span class="lineno"> 20</span> </div>
<div class="line"><a name="l00021"></a><span class="lineno"> 21</span> <span class="comment">/*</span></div>
<div class="line"><a name="l00022"></a><span class="lineno"> 22</span> <span class="comment"> * $Author: jtaylor $</span></div>
-<div class="line"><a name="l00023"></a><span class="lineno"> 23</span> <span class="comment"> * $Date: 2013/03/26 17:00:45 $</span></div>
+<div class="line"><a name="l00023"></a><span class="lineno"> 23</span> <span class="comment"> * $Date: 2013-03-26 17:00:45 $</span></div>
<div class="line"><a name="l00024"></a><span class="lineno"> 24</span> <span class="comment"> * $Revision: 1.33 $</span></div>
-<div class="line"><a name="l00025"></a><span class="lineno"> 25</span> <span class="comment"> * $Name: iiinstrument-0_0_3 $</span></div>
+<div class="line"><a name="l00025"></a><span class="lineno"> 25</span> <span class="comment"> * $Name: not supported by cvs2svn $</span></div>
<div class="line"><a name="l00026"></a><span class="lineno"> 26</span> <span class="comment"> */</span></div>
<div class="line"><a name="l00027"></a><span class="lineno"> 27</span> </div>
<div class="line"><a name="l00028"></a><span class="lineno"> 28</span> <span class="preprocessor">#ifdef HAVE_CONFIG_H</span></div>
@@ -432,7 +432,7 @@
</div><!-- fragment --></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Wed Mar 27 2013 16:30:25 for IIINSTRUMENT Pipeline Reference Manual by <a href="http://www.doxygen.org/index.html">
+Generated on Mon Nov 4 2013 14:15:20 for IIINSTRUMENT Pipeline Reference Manual by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.3.1
</small></address>
diff --git a/html/rrrecipe__calib_8c_source.html b/html/rrrecipe__calib_8c_source.html
index 6c8f0e9..33ece5e 100644
--- a/html/rrrecipe__calib_8c_source.html
+++ b/html/rrrecipe__calib_8c_source.html
@@ -18,7 +18,7 @@
<tr style="height: 56px;">
<td style="padding-left: 0.5em;">
<div id="projectname">IIINSTRUMENT Pipeline Reference Manual
- <span id="projectnumber">0.0.3</span>
+ <span id="projectnumber">0.0.5</span>
</div>
</td>
</tr>
@@ -48,7 +48,7 @@
<div class="title">rrrecipe_calib.c</div> </div>
</div><!--header-->
<div class="contents">
-<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno"> 1</span> <span class="comment">/* $Id: rrrecipe_calib.c,v 1.6 2013/03/26 17:17:32 jtaylor Exp $</span></div>
+<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno"> 1</span> <span class="comment">/* $Id: rrrecipe_calib.c,v 1.6 2013-03-26 17:17:32 jtaylor Exp $</span></div>
<div class="line"><a name="l00002"></a><span class="lineno"> 2</span> <span class="comment"> *</span></div>
<div class="line"><a name="l00003"></a><span class="lineno"> 3</span> <span class="comment"> * This file is part of the IIINSTRUMENT Pipeline</span></div>
<div class="line"><a name="l00004"></a><span class="lineno"> 4</span> <span class="comment"> * Copyright (C) 2002,2003 European Southern Observatory</span></div>
@@ -70,9 +70,9 @@
<div class="line"><a name="l00020"></a><span class="lineno"> 20</span> </div>
<div class="line"><a name="l00021"></a><span class="lineno"> 21</span> <span class="comment">/*</span></div>
<div class="line"><a name="l00022"></a><span class="lineno"> 22</span> <span class="comment"> * $Author: jtaylor $</span></div>
-<div class="line"><a name="l00023"></a><span class="lineno"> 23</span> <span class="comment"> * $Date: 2013/03/26 17:17:32 $</span></div>
+<div class="line"><a name="l00023"></a><span class="lineno"> 23</span> <span class="comment"> * $Date: 2013-03-26 17:17:32 $</span></div>
<div class="line"><a name="l00024"></a><span class="lineno"> 24</span> <span class="comment"> * $Revision: 1.6 $</span></div>
-<div class="line"><a name="l00025"></a><span class="lineno"> 25</span> <span class="comment"> * $Name: iiinstrument-0_0_3 $</span></div>
+<div class="line"><a name="l00025"></a><span class="lineno"> 25</span> <span class="comment"> * $Name: not supported by cvs2svn $</span></div>
<div class="line"><a name="l00026"></a><span class="lineno"> 26</span> <span class="comment"> */</span></div>
<div class="line"><a name="l00027"></a><span class="lineno"> 27</span> </div>
<div class="line"><a name="l00028"></a><span class="lineno"> 28</span> <span class="preprocessor">#ifdef HAVE_CONFIG_H</span></div>
@@ -408,7 +408,7 @@
</div><!-- fragment --></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
-Generated on Wed Mar 27 2013 16:30:25 for IIINSTRUMENT Pipeline Reference Manual by <a href="http://www.doxygen.org/index.html">
+Generated on Mon Nov 4 2013 14:15:20 for IIINSTRUMENT Pipeline Reference Manual by <a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.3.1
</small></address>
diff --git a/iiinstrument/iiinstrument_dfs.c b/iiinstrument/iiinstrument_dfs.c
index 07c83cc..2aeeedf 100644
--- a/iiinstrument/iiinstrument_dfs.c
+++ b/iiinstrument/iiinstrument_dfs.c
@@ -1,4 +1,4 @@
-/* $Id: iiinstrument_dfs.c,v 1.9 2013/03/26 17:00:44 jtaylor Exp $
+/* $Id: iiinstrument_dfs.c,v 1.9 2013-03-26 17:00:44 jtaylor Exp $
*
* This file is part of the IIINSTRUMENT Pipeline
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: jtaylor $
- * $Date: 2013/03/26 17:00:44 $
+ * $Date: 2013-03-26 17:00:44 $
* $Revision: 1.9 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/iiinstrument/iiinstrument_dfs.h b/iiinstrument/iiinstrument_dfs.h
index f3b7b15..f8aaf68 100644
--- a/iiinstrument/iiinstrument_dfs.h
+++ b/iiinstrument/iiinstrument_dfs.h
@@ -1,4 +1,4 @@
-/* $Id: iiinstrument_dfs.h,v 1.13 2013/03/26 17:00:45 jtaylor Exp $
+/* $Id: iiinstrument_dfs.h,v 1.14 2013-07-22 13:38:01 jtaylor Exp $
*
* This file is part of the IIINSTRUMENT Pipeline
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,14 +20,18 @@
/*
* $Author: jtaylor $
- * $Date: 2013/03/26 17:00:45 $
- * $Revision: 1.13 $
- * $Name: iiinstrument-0_0_3 $
+ * $Date: 2013-07-22 13:38:01 $
+ * $Revision: 1.14 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IIINSTRUMENT_DFS_H
#define IIINSTRUMENT_DFS_H
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
/*-----------------------------------------------------------------------------
Define
-----------------------------------------------------------------------------*/
diff --git a/iiinstrument/iiinstrument_pfits.c b/iiinstrument/iiinstrument_pfits.c
index 979550f..97ab864 100644
--- a/iiinstrument/iiinstrument_pfits.c
+++ b/iiinstrument/iiinstrument_pfits.c
@@ -1,4 +1,4 @@
-/* $Id: iiinstrument_pfits.c,v 1.14 2013/03/25 11:46:49 cgarcia Exp $
+/* $Id: iiinstrument_pfits.c,v 1.14 2013-03-25 11:46:49 cgarcia Exp $
*
* This file is part of the IIINSTRUMENT Pipeline
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: cgarcia $
- * $Date: 2013/03/25 11:46:49 $
+ * $Date: 2013-03-25 11:46:49 $
* $Revision: 1.14 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/iiinstrument/iiinstrument_pfits.h b/iiinstrument/iiinstrument_pfits.h
index 2509942..0d6020a 100644
--- a/iiinstrument/iiinstrument_pfits.h
+++ b/iiinstrument/iiinstrument_pfits.h
@@ -1,4 +1,4 @@
-/* $Id: iiinstrument_pfits.h,v 1.10 2013/03/25 11:46:49 cgarcia Exp $
+/* $Id: iiinstrument_pfits.h,v 1.11 2013-07-22 13:38:01 jtaylor Exp $
*
* This file is part of the IIINSTRUMENT Pipeline
* Copyright (C) 2002,2003 European Southern Observatory
@@ -19,15 +19,19 @@
*/
/*
- * $Author: cgarcia $
- * $Date: 2013/03/25 11:46:49 $
- * $Revision: 1.10 $
- * $Name: iiinstrument-0_0_3 $
+ * $Author: jtaylor $
+ * $Date: 2013-07-22 13:38:01 $
+ * $Revision: 1.11 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IIINSTRUMENT_PFITS_H
#define IIINSTRUMENT_PFITS_H
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
/*-----------------------------------------------------------------------------
Includes
-----------------------------------------------------------------------------*/
diff --git a/iiinstrument/iiinstrument_utils.c b/iiinstrument/iiinstrument_utils.c
index b6a8c4c..73c43cf 100644
--- a/iiinstrument/iiinstrument_utils.c
+++ b/iiinstrument/iiinstrument_utils.c
@@ -1,4 +1,4 @@
-/* $Id: iiinstrument_utils.c,v 1.12 2013/03/25 11:46:49 cgarcia Exp $
+/* $Id: iiinstrument_utils.c,v 1.12 2013-03-25 11:46:49 cgarcia Exp $
*
* This file is part of the IIINSTRUMENT Pipeline
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: cgarcia $
- * $Date: 2013/03/25 11:46:49 $
+ * $Date: 2013-03-25 11:46:49 $
* $Revision: 1.12 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/iiinstrument/iiinstrument_utils.h b/iiinstrument/iiinstrument_utils.h
index e73fa49..f4012d0 100644
--- a/iiinstrument/iiinstrument_utils.h
+++ b/iiinstrument/iiinstrument_utils.h
@@ -1,4 +1,4 @@
-/* $Id: iiinstrument_utils.h,v 1.14 2013/03/25 11:46:49 cgarcia Exp $
+/* $Id: iiinstrument_utils.h,v 1.15 2013-07-22 13:38:01 jtaylor Exp $
*
* This file is part of the IIINSTRUMENT Pipeline
* Copyright (C) 2002,2003 European Southern Observatory
@@ -19,15 +19,19 @@
*/
/*
- * $Author: cgarcia $
- * $Date: 2013/03/25 11:46:49 $
- * $Revision: 1.14 $
- * $Name: iiinstrument-0_0_3 $
+ * $Author: jtaylor $
+ * $Date: 2013-07-22 13:38:01 $
+ * $Revision: 1.15 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IIINSTRUMENT_UTILS_H
#define IIINSTRUMENT_UTILS_H
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
/*-----------------------------------------------------------------------------
Includes
-----------------------------------------------------------------------------*/
diff --git a/iiinstrument/tests/Makefile.am b/iiinstrument/tests/Makefile.am
index f37d85c..6c63a67 100644
--- a/iiinstrument/tests/Makefile.am
+++ b/iiinstrument/tests/Makefile.am
@@ -42,7 +42,7 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" \
- MALLOC_PERTURB_=231 MALLOC_CHECK_=2
+ MALLOC_PERTURB_=31 MALLOC_CHECK_=2
TESTS = $(check_PROGRAMS)
diff --git a/iiinstrument/tests/Makefile.in b/iiinstrument/tests/Makefile.in
index 9f1a5bf..a625973 100644
--- a/iiinstrument/tests/Makefile.in
+++ b/iiinstrument/tests/Makefile.in
@@ -273,7 +273,7 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" \
- MALLOC_PERTURB_=231 MALLOC_CHECK_=2
+ MALLOC_PERTURB_=31 MALLOC_CHECK_=2
TESTS = $(check_PROGRAMS)
all: all-am
diff --git a/iiinstrument/tests/iiinstrument_dfs-test.c b/iiinstrument/tests/iiinstrument_dfs-test.c
index 556ffa7..881cf63 100644
--- a/iiinstrument/tests/iiinstrument_dfs-test.c
+++ b/iiinstrument/tests/iiinstrument_dfs-test.c
@@ -1,4 +1,4 @@
-/* $Id: iiinstrument_dfs-test.c,v 1.6 2013/03/25 11:46:49 cgarcia Exp $
+/* $Id: iiinstrument_dfs-test.c,v 1.6 2013-03-25 11:46:49 cgarcia Exp $
*
* This file is part of the IIINSTRUMENT Pipeline
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: cgarcia $
- * $Date: 2013/03/25 11:46:49 $
+ * $Date: 2013-03-25 11:46:49 $
* $Revision: 1.6 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_calib.c b/irplib/irplib_calib.c
index 8b9017c..00ade1d 100644
--- a/irplib/irplib_calib.c
+++ b/irplib/irplib_calib.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_calib.c,v 1.19 2013/03/01 10:26:22 llundin Exp $
+/* $Id: irplib_calib.c,v 1.19 2013-03-01 10:26:22 llundin Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: llundin $
- * $Date: 2013/03/01 10:26:22 $
+ * $Date: 2013-03-01 10:26:22 $
* $Revision: 1.19 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_calib.h b/irplib/irplib_calib.h
index f77f6fc..e889751 100644
--- a/irplib/irplib_calib.h
+++ b/irplib/irplib_calib.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_calib.h,v 1.8 2007/02/12 10:34:51 amodigli Exp $
+/* $Id: irplib_calib.h,v 1.8 2007-02-12 10:34:51 amodigli Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: amodigli $
- * $Date: 2007/02/12 10:34:51 $
+ * $Date: 2007-02-12 10:34:51 $
* $Revision: 1.8 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_CALIB_H
diff --git a/irplib/irplib_cat.c b/irplib/irplib_cat.c
index c953249..16e6a32 100644
--- a/irplib/irplib_cat.c
+++ b/irplib/irplib_cat.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_cat.c,v 1.10 2009/12/01 12:34:25 cgarcia Exp $
+/* $Id: irplib_cat.c,v 1.10 2009-12-01 12:34:25 cgarcia Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: cgarcia $
- * $Date: 2009/12/01 12:34:25 $
+ * $Date: 2009-12-01 12:34:25 $
* $Revision: 1.10 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_cat.h b/irplib/irplib_cat.h
index d0e7a56..314aef6 100644
--- a/irplib/irplib_cat.h
+++ b/irplib/irplib_cat.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_cat.h,v 1.5 2009/12/16 14:49:52 cgarcia Exp $
+/* $Id: irplib_cat.h,v 1.5 2009-12-16 14:49:52 cgarcia Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: cgarcia $
- * $Date: 2009/12/16 14:49:52 $
+ * $Date: 2009-12-16 14:49:52 $
* $Revision: 1.5 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_CAT_H
diff --git a/irplib/irplib_distortion.c b/irplib/irplib_distortion.c
index e73f0fc..02a53dc 100644
--- a/irplib/irplib_distortion.c
+++ b/irplib/irplib_distortion.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_distortion.c,v 1.52 2013/01/29 08:43:33 jtaylor Exp $
+/* $Id: irplib_distortion.c,v 1.52 2013-01-29 08:43:33 jtaylor Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: jtaylor $
- * $Date: 2013/01/29 08:43:33 $
+ * $Date: 2013-01-29 08:43:33 $
* $Revision: 1.52 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_distortion.h b/irplib/irplib_distortion.h
index b35f338..69076dd 100644
--- a/irplib/irplib_distortion.h
+++ b/irplib/irplib_distortion.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_distortion.h,v 1.6 2013/01/29 08:43:33 jtaylor Exp $
+/* $Id: irplib_distortion.h,v 1.6 2013-01-29 08:43:33 jtaylor Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: jtaylor $
- * $Date: 2013/01/29 08:43:33 $
+ * $Date: 2013-01-29 08:43:33 $
* $Revision: 1.6 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_DISTORTION_H
diff --git a/irplib/irplib_flat.c b/irplib/irplib_flat.c
index 120d3ac..4b83bc8 100644
--- a/irplib/irplib_flat.c
+++ b/irplib/irplib_flat.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_flat.c,v 1.15 2007/08/07 12:15:41 llundin Exp $
+/* $Id: irplib_flat.c,v 1.15 2007-08-07 12:15:41 llundin Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: llundin $
- * $Date: 2007/08/07 12:15:41 $
+ * $Date: 2007-08-07 12:15:41 $
* $Revision: 1.15 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_flat.h b/irplib/irplib_flat.h
index 58dad87..bc8c450 100644
--- a/irplib/irplib_flat.h
+++ b/irplib/irplib_flat.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_flat.h,v 1.4 2005/09/15 11:47:16 llundin Exp $
+/* $Id: irplib_flat.h,v 1.4 2005-09-15 11:47:16 llundin Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: llundin $
- * $Date: 2005/09/15 11:47:16 $
+ * $Date: 2005-09-15 11:47:16 $
* $Revision: 1.4 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_FLAT_H
diff --git a/irplib/irplib_framelist.c b/irplib/irplib_framelist.c
index 514e83e..fb0c2b4 100644
--- a/irplib/irplib_framelist.c
+++ b/irplib/irplib_framelist.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_framelist.c,v 1.30 2013/02/27 16:05:13 jtaylor Exp $
+/* $Id: irplib_framelist.c,v 1.30 2013-02-27 16:05:13 jtaylor Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: jtaylor $
- * $Date: 2013/02/27 16:05:13 $
+ * $Date: 2013-02-27 16:05:13 $
* $Revision: 1.30 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
diff --git a/irplib/irplib_framelist.h b/irplib/irplib_framelist.h
index 7e6f22d..b61ad0b 100644
--- a/irplib/irplib_framelist.h
+++ b/irplib/irplib_framelist.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_framelist.h,v 1.8 2008/11/20 10:24:47 llundin Exp $
+/* $Id: irplib_framelist.h,v 1.8 2008-11-20 10:24:47 llundin Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: llundin $
- * $Date: 2008/11/20 10:24:47 $
+ * $Date: 2008-11-20 10:24:47 $
* $Revision: 1.8 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_FRAMELIST_H
diff --git a/irplib/irplib_hist.c b/irplib/irplib_hist.c
index 6c269bf..1f480df 100644
--- a/irplib/irplib_hist.c
+++ b/irplib/irplib_hist.c
@@ -20,11 +20,11 @@
*/
/*
- * $Author: kmirny $
- * $Id: irplib_hist.c,v 1.7 2009/10/15 14:02:18 kmirny Exp $
- * $Date: 2009/10/15 14:02:18 $
- * $Revision: 1.7 $
- * $Name: iiinstrument-0_0_3 $
+ * $Author: jtaylor $
+ * $Id: irplib_hist.c,v 1.8 2013-07-04 12:10:12 jtaylor Exp $
+ * $Date: 2013-07-04 12:10:12 $
+ * $Revision: 1.8 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
@@ -218,7 +218,7 @@ irplib_hist_fill(irplib_hist * hist,
for (i = 0; i < nsamples; i++)
{
int pos = 0;
- if(bpm_data && bpm_data[i] == CPL_BINARY_1)
+ if(bpm_data && bpm_data[i] != CPL_BINARY_0)
{
continue;
}
diff --git a/irplib/irplib_hist.h b/irplib/irplib_hist.h
index ea00e52..08c7d00 100644
--- a/irplib/irplib_hist.h
+++ b/irplib/irplib_hist.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_hist.h,v 1.3 2007/09/07 14:23:50 lbilbao Exp $
+/* $Id: irplib_hist.h,v 1.3 2007-09-07 14:23:50 lbilbao Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002, 2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: lbilbao $
- * $Date: 2007/09/07 14:23:50 $
+ * $Date: 2007-09-07 14:23:50 $
* $Revision: 1.3 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_HIST_H
diff --git a/irplib/irplib_ksigma_clip.c b/irplib/irplib_ksigma_clip.c
index ef616bf..8fd696d 100644
--- a/irplib/irplib_ksigma_clip.c
+++ b/irplib/irplib_ksigma_clip.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_ksigma_clip.c,v 1.1 2011/11/02 13:18:28 amodigli Exp $
+/* $Id: irplib_ksigma_clip.c,v 1.1 2011-11-02 13:18:28 amodigli Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002, 2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: amodigli $
- * $Date: 2011/11/02 13:18:28 $
+ * $Date: 2011-11-02 13:18:28 $
* $Revision: 1.1 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_ksigma_clip.h b/irplib/irplib_ksigma_clip.h
index 49ab669..c7e8107 100644
--- a/irplib/irplib_ksigma_clip.h
+++ b/irplib/irplib_ksigma_clip.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_ksigma_clip.h,v 1.1 2011/11/02 13:18:28 amodigli Exp $
+/* $Id: irplib_ksigma_clip.h,v 1.1 2011-11-02 13:18:28 amodigli Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002, 2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: amodigli $
- * $Date: 2011/11/02 13:18:28 $
+ * $Date: 2011-11-02 13:18:28 $
* $Revision: 1.1 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_KSIGMA_CLIP_H
diff --git a/irplib/irplib_ksigma_clip_body.h b/irplib/irplib_ksigma_clip_body.h
index e48abaa..f196fb9 100644
--- a/irplib/irplib_ksigma_clip_body.h
+++ b/irplib/irplib_ksigma_clip_body.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_ksigma_clip_body.h,v 1.1 2011/11/02 13:18:28 amodigli Exp $
+/* $Id: irplib_ksigma_clip_body.h,v 1.1 2011-11-02 13:18:28 amodigli Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: amodigli $
- * $Date: 2011/11/02 13:18:28 $
+ * $Date: 2011-11-02 13:18:28 $
* $Revision: 1.1 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#define TYPE_ADD(a) CONCAT2X(a, CPL_TYPE)
diff --git a/irplib/irplib_match_cats.c b/irplib/irplib_match_cats.c
index a75ee17..da84b9e 100644
--- a/irplib/irplib_match_cats.c
+++ b/irplib/irplib_match_cats.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_match_cats.c,v 1.10 2009/12/18 10:44:48 cgarcia Exp $
+/* $Id: irplib_match_cats.c,v 1.10 2009-12-18 10:44:48 cgarcia Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: cgarcia $
- * $Date: 2009/12/18 10:44:48 $
+ * $Date: 2009-12-18 10:44:48 $
* $Revision: 1.10 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_match_cats.h b/irplib/irplib_match_cats.h
index 797f6ea..40f587d 100644
--- a/irplib/irplib_match_cats.h
+++ b/irplib/irplib_match_cats.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_match_cats.h,v 1.5 2009/12/18 10:44:48 cgarcia Exp $
+/* $Id: irplib_match_cats.h,v 1.5 2009-12-18 10:44:48 cgarcia Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: cgarcia $
- * $Date: 2009/12/18 10:44:48 $
+ * $Date: 2009-12-18 10:44:48 $
* $Revision: 1.5 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_MATCH_CATS_H
diff --git a/irplib/irplib_mkmaster.c b/irplib/irplib_mkmaster.c
index c949817..237bb46 100644
--- a/irplib/irplib_mkmaster.c
+++ b/irplib/irplib_mkmaster.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_mkmaster.c,v 1.6 2013/02/27 16:00:51 jtaylor Exp $
+/* $Id: irplib_mkmaster.c,v 1.6 2013-02-27 16:00:51 jtaylor Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: jtaylor $
- * $Date: 2013/02/27 16:00:51 $
+ * $Date: 2013-02-27 16:00:51 $
* $Revision: 1.6 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_mkmaster.h b/irplib/irplib_mkmaster.h
index ae92aac..edc8743 100644
--- a/irplib/irplib_mkmaster.h
+++ b/irplib/irplib_mkmaster.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_mkmaster.h,v 1.3 2011/11/02 13:17:25 amodigli Exp $
+/* $Id: irplib_mkmaster.h,v 1.3 2011-11-02 13:17:25 amodigli Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: amodigli $
- * $Date: 2011/11/02 13:17:25 $
+ * $Date: 2011-11-02 13:17:25 $
* $Revision: 1.3 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_MKMASTER_H
diff --git a/irplib/irplib_oddeven.c b/irplib/irplib_oddeven.c
index 6a031de..82933d2 100644
--- a/irplib/irplib_oddeven.c
+++ b/irplib/irplib_oddeven.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_oddeven.c,v 1.9 2012/01/12 11:50:41 llundin Exp $
+/* $Id: irplib_oddeven.c,v 1.9 2012-01-12 11:50:41 llundin Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: llundin $
- * $Date: 2012/01/12 11:50:41 $
+ * $Date: 2012-01-12 11:50:41 $
* $Revision: 1.9 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_oddeven.h b/irplib/irplib_oddeven.h
index 734a5ec..4dc1b51 100644
--- a/irplib/irplib_oddeven.h
+++ b/irplib/irplib_oddeven.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_oddeven.h,v 1.4 2006/10/06 20:46:04 yjung Exp $
+/* $Id: irplib_oddeven.h,v 1.4 2006-10-06 20:46:04 yjung Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: yjung $
- * $Date: 2006/10/06 20:46:04 $
+ * $Date: 2006-10-06 20:46:04 $
* $Revision: 1.4 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_ODDEVEN_H
diff --git a/irplib/irplib_plugin.c b/irplib/irplib_plugin.c
index 4ae724e..023b932 100644
--- a/irplib/irplib_plugin.c
+++ b/irplib/irplib_plugin.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_plugin.c,v 1.39 2012/02/03 14:19:06 llundin Exp $
+/* $Id: irplib_plugin.c,v 1.40 2013-08-22 17:44:56 cgarcia Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -19,10 +19,10 @@
*/
/*
- * $Author: llundin $
- * $Date: 2012/02/03 14:19:06 $
- * $Revision: 1.39 $
- * $Name: iiinstrument-0_0_3 $
+ * $Author: cgarcia $
+ * $Date: 2013-08-22 17:44:56 $
+ * $Revision: 1.40 $
+ * $Name: not supported by cvs2svn $
*/
/*-----------------------------------------------------------------------------
@@ -765,7 +765,9 @@ static void recipe_sof_test_image_empty(cpl_plugin * plugin, size_t nstr,
for (i = 0; i < nstr; i++) {
cpl_frame * f = cpl_frame_new();
- char * rawname = cpl_sprintf("raw%05u.fits", (unsigned)(i+1));
+ char * rawname = cpl_sprintf("%s-raw%05u.fits",
+ cpl_plugin_get_name(plugin),
+ (unsigned)(i+1));
error = cpl_image_save(iempty, rawname,CPL_BPP_IEEE_FLOAT, NULL,
CPL_IO_DEFAULT);
@@ -1023,13 +1025,16 @@ static void recipe_frameset_load(cpl_frameset * set, const char *name)
/* Loop over all the lines in the set-of-frames file */
for (line_number = 0; fgets(line, LINE_LEN_MAX - 1, fp); line_number++) {
+ char scan_fmt[50];
cpl_frame_group grp;
cpl_frame * frame;
int n;
if (line[0] == '#') continue;
- n = sscanf(line, "%s %s %s", path, tag, group);
+ snprintf(scan_fmt, 49, "%%%ds %%%ds %%%ds", LINE_LEN_MAX - 1,
+ LINE_LEN_MAX - 1, LINE_LEN_MAX - 1);
+ n = sscanf(line, scan_fmt, path, tag, group);
if (n < 1) {
cpl_msg_warning(cpl_func, "Spurious line no. %d in %s: %s",
diff --git a/irplib/irplib_plugin.h b/irplib/irplib_plugin.h
index 8b9feed..f99cc01 100644
--- a/irplib/irplib_plugin.h
+++ b/irplib/irplib_plugin.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_plugin.h,v 1.23 2012/01/11 08:03:37 llundin Exp $
+/* $Id: irplib_plugin.h,v 1.23 2012-01-11 08:03:37 llundin Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: llundin $
- * $Date: 2012/01/11 08:03:37 $
+ * $Date: 2012-01-11 08:03:37 $
* $Revision: 1.23 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_PLUGIN_H
diff --git a/irplib/irplib_polynomial.c b/irplib/irplib_polynomial.c
index 95000bb..1bd1ace 100644
--- a/irplib/irplib_polynomial.c
+++ b/irplib/irplib_polynomial.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_polynomial.c,v 1.35 2013/01/29 08:43:33 jtaylor Exp $
+/* $Id: irplib_polynomial.c,v 1.35 2013-01-29 08:43:33 jtaylor Exp $
*
* This file is part of the ESO Common Pipeline Library
* Copyright (C) 2001-2004 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: jtaylor $
- * $Date: 2013/01/29 08:43:33 $
+ * $Date: 2013-01-29 08:43:33 $
* $Revision: 1.35 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_polynomial.h b/irplib/irplib_polynomial.h
index d8728a5..fa0c16d 100644
--- a/irplib/irplib_polynomial.h
+++ b/irplib/irplib_polynomial.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_polynomial.h,v 1.10 2013/01/29 08:43:33 jtaylor Exp $
+/* $Id: irplib_polynomial.h,v 1.10 2013-01-29 08:43:33 jtaylor Exp $
*
* This file is part of the ESO Common Pipeline Library
* Copyright (C) 2007 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: jtaylor $
- * $Date: 2013/01/29 08:43:33 $
+ * $Date: 2013-01-29 08:43:33 $
* $Revision: 1.10 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_POLYNOMIAL_H
diff --git a/irplib/irplib_ppm.c b/irplib/irplib_ppm.c
index ca4334c..74e9fd6 100644
--- a/irplib/irplib_ppm.c
+++ b/irplib/irplib_ppm.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_ppm.c,v 1.31 2012/06/11 07:24:09 llundin Exp $
+/* $Id: irplib_ppm.c,v 1.31 2012-06-11 07:24:09 llundin Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: llundin $
- * $Date: 2012/06/11 07:24:09 $
+ * $Date: 2012-06-11 07:24:09 $
* $Revision: 1.31 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_ppm.h b/irplib/irplib_ppm.h
index 24966c0..5639665 100644
--- a/irplib/irplib_ppm.h
+++ b/irplib/irplib_ppm.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_ppm.h,v 1.5 2007/07/23 09:27:07 yjung Exp $
+/* $Id: irplib_ppm.h,v 1.5 2007-07-23 09:27:07 yjung Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: yjung $
- * $Date: 2007/07/23 09:27:07 $
+ * $Date: 2007-07-23 09:27:07 $
* $Revision: 1.5 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_PPM_H
diff --git a/irplib/irplib_slitpos.c b/irplib/irplib_slitpos.c
index da223f1..346a02a 100644
--- a/irplib/irplib_slitpos.c
+++ b/irplib/irplib_slitpos.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_slitpos.c,v 1.30 2011/11/23 13:58:45 yjung Exp $
+/* $Id: irplib_slitpos.c,v 1.31 2013-07-04 12:10:12 jtaylor Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -19,10 +19,10 @@
*/
/*
- * $Author: yjung $
- * $Date: 2011/11/23 13:58:45 $
- * $Revision: 1.30 $
- * $Name: iiinstrument-0_0_3 $
+ * $Author: jtaylor $
+ * $Date: 2013-07-04 12:10:12 $
+ * $Revision: 1.31 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
@@ -456,7 +456,7 @@ cpl_error_code irplib_slitpos_find_vert_slit_ends(const cpl_image * self,
#else
itop = npix - 1;
- while (itop > ibot && pbinary[itop] != CPL_BINARY_1) itop--;
+ while (itop > ibot && pbinary[itop] == CPL_BINARY_0) itop--;
#endif
diff --git a/irplib/irplib_slitpos.h b/irplib/irplib_slitpos.h
index 963573e..5b124fe 100644
--- a/irplib/irplib_slitpos.h
+++ b/irplib/irplib_slitpos.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_slitpos.h,v 1.6 2006/11/29 13:22:59 yjung Exp $
+/* $Id: irplib_slitpos.h,v 1.6 2006-11-29 13:22:59 yjung Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: yjung $
- * $Date: 2006/11/29 13:22:59 $
+ * $Date: 2006-11-29 13:22:59 $
* $Revision: 1.6 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_SLITPOS_H
diff --git a/irplib/irplib_spectrum.c b/irplib/irplib_spectrum.c
index 253de13..1174ddd 100644
--- a/irplib/irplib_spectrum.c
+++ b/irplib/irplib_spectrum.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_spectrum.c,v 1.29 2012/01/12 11:50:41 llundin Exp $
+/* $Id: irplib_spectrum.c,v 1.29 2012-01-12 11:50:41 llundin Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: llundin $
- * $Date: 2012/01/12 11:50:41 $
+ * $Date: 2012-01-12 11:50:41 $
* $Revision: 1.29 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_spectrum.h b/irplib/irplib_spectrum.h
index 1b4eb20..00fca96 100644
--- a/irplib/irplib_spectrum.h
+++ b/irplib/irplib_spectrum.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_spectrum.h,v 1.7 2009/07/30 12:38:37 yjung Exp $
+/* $Id: irplib_spectrum.h,v 1.7 2009-07-30 12:38:37 yjung Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: yjung $
- * $Date: 2009/07/30 12:38:37 $
+ * $Date: 2009-07-30 12:38:37 $
* $Revision: 1.7 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_SPECTRUM_H
diff --git a/irplib/irplib_stdstar.c b/irplib/irplib_stdstar.c
index 72dec0a..71b1fa9 100644
--- a/irplib/irplib_stdstar.c
+++ b/irplib/irplib_stdstar.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_stdstar.c,v 1.45 2013/03/01 10:27:07 llundin Exp $
+/* $Id: irplib_stdstar.c,v 1.45 2013-03-01 10:27:07 llundin Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: llundin $
- * $Date: 2013/03/01 10:27:07 $
+ * $Date: 2013-03-01 10:27:07 $
* $Revision: 1.45 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_stdstar.h b/irplib/irplib_stdstar.h
index a9673a5..9657d34 100644
--- a/irplib/irplib_stdstar.h
+++ b/irplib/irplib_stdstar.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_stdstar.h,v 1.16 2013/02/27 10:37:52 llundin Exp $
+/* $Id: irplib_stdstar.h,v 1.16 2013-02-27 10:37:52 llundin Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: llundin $
- * $Date: 2013/02/27 10:37:52 $
+ * $Date: 2013-02-27 10:37:52 $
* $Revision: 1.16 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_STDSTAR_H
diff --git a/irplib/irplib_strehl.c b/irplib/irplib_strehl.c
index d9b16b5..4e58397 100644
--- a/irplib/irplib_strehl.c
+++ b/irplib/irplib_strehl.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_strehl.c,v 1.43 2009/11/18 21:37:48 llundin Exp $
+/* $Id: irplib_strehl.c,v 1.43 2009-11-18 21:37:48 llundin Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: llundin $
- * $Date: 2009/11/18 21:37:48 $
+ * $Date: 2009-11-18 21:37:48 $
* $Revision: 1.43 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_strehl.h b/irplib/irplib_strehl.h
index 1c75b3b..4acce38 100644
--- a/irplib/irplib_strehl.h
+++ b/irplib/irplib_strehl.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_strehl.h,v 1.12 2009/06/29 14:32:53 kmirny Exp $
+/* $Id: irplib_strehl.h,v 1.12 2009-06-29 14:32:53 kmirny Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: kmirny $
- * $Date: 2009/06/29 14:32:53 $
+ * $Date: 2009-06-29 14:32:53 $
* $Revision: 1.12 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_STREHL_H
diff --git a/irplib/irplib_utils.c b/irplib/irplib_utils.c
index 0f5b3d2..2b13ab7 100644
--- a/irplib/irplib_utils.c
+++ b/irplib/irplib_utils.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_utils.c,v 1.84 2013/03/15 09:06:06 jtaylor Exp $
+/* $Id: irplib_utils.c,v 1.85 2013-07-04 12:10:55 jtaylor Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: jtaylor $
- * $Date: 2013/03/15 09:06:06 $
- * $Revision: 1.84 $
- * $Name: iiinstrument-0_0_3 $
+ * $Date: 2013-07-04 12:10:55 $
+ * $Revision: 1.85 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
@@ -1553,23 +1553,20 @@ cpl_error_code irplib_frameset_sort(const cpl_frameset * self, int* iindex, dou
static double frame_get_exptime(const cpl_frame * pframe)
{
- cpl_propertylist *plist = 0;
- double dval = 0;
-
- plist = cpl_propertylist_load(cpl_frame_get_filename(pframe),0);
- if(plist)
- {
- cpl_error_code err = CPL_ERROR_NONE;
- dval = cpl_propertylist_get_double(plist, "EXPTIME");
- err = cpl_error_get_code();
- if (err != CPL_ERROR_NONE)
- {
- cpl_msg_error(cpl_func, "error during reading EXPTIME key from the frame [%s]", cpl_frame_get_filename(pframe));
- }
- }
- /* Free and return */
- cpl_propertylist_delete(plist);
- return dval;
+ double dval = 0;
+ cpl_propertylist * plist =
+ cpl_propertylist_load_regexp(cpl_frame_get_filename(pframe), 0,
+ "EXPTIME", CPL_FALSE);
+ if(plist) {
+ dval = cpl_propertylist_get_double(plist, "EXPTIME");
+ if (cpl_error_get_code() != CPL_ERROR_NONE) {
+ cpl_msg_error(cpl_func, "error during reading EXPTIME key from "
+ "the frame [%s]", cpl_frame_get_filename(pframe));
+ }
+ }
+ /* Free and return */
+ cpl_propertylist_delete(plist);
+ return dval;
}
diff --git a/irplib/irplib_utils.h b/irplib/irplib_utils.h
index 0e1b373..7f7caa8 100644
--- a/irplib/irplib_utils.h
+++ b/irplib/irplib_utils.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_utils.h,v 1.59 2013/03/15 09:06:06 jtaylor Exp $
+/* $Id: irplib_utils.h,v 1.60 2013-08-21 14:55:14 cgarcia Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -19,11 +19,11 @@
*/
/*
- * $Author: jtaylor $
- * $Date: 2013/03/15 09:06:06 $
- * $Revision: 1.59 $
- * $Name: iiinstrument-0_0_3 $
- * $Log: irplib_utils.h,v $
+ * $Author: cgarcia $
+ * $Date: 2013-08-21 14:55:14 $
+ * $Revision: 1.60 $
+ * $Name: not supported by cvs2svn $
+ * $Log: not supported by cvs2svn $
* Revision 1.59 2013/03/15 09:06:06 jtaylor
* add irplib_aligned_{[mc]alloc,free}
*
@@ -67,7 +67,7 @@
-----------------------------------------------------------------------------*/
#include <cpl.h>
-
+#include <math.h>
#include <stdarg.h>
/*-----------------------------------------------------------------------------
diff --git a/irplib/irplib_wavecal.c b/irplib/irplib_wavecal.c
index 1adf5f2..fe4b5b6 100644
--- a/irplib/irplib_wavecal.c
+++ b/irplib/irplib_wavecal.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_wavecal.c,v 1.52 2012/08/03 21:05:32 llundin Exp $
+/* $Id: irplib_wavecal.c,v 1.52 2012-08-03 21:05:32 llundin Exp $
*
* This file is part of the IRPLIB Pipeline
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: llundin $
- * $Date: 2012/08/03 21:05:32 $
+ * $Date: 2012-08-03 21:05:32 $
* $Revision: 1.52 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_wavecal.h b/irplib/irplib_wavecal.h
index 48e4f4d..9ec1ed5 100644
--- a/irplib/irplib_wavecal.h
+++ b/irplib/irplib_wavecal.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_wavecal.h,v 1.18 2012/08/03 21:05:33 llundin Exp $
+/* $Id: irplib_wavecal.h,v 1.18 2012-08-03 21:05:33 llundin Exp $
*
* This file is part of the IRPLIB Pipeline
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: llundin $
- * $Date: 2012/08/03 21:05:33 $
+ * $Date: 2012-08-03 21:05:33 $
* $Revision: 1.18 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_WAVECAL_H
diff --git a/irplib/irplib_wavecal_impl.h b/irplib/irplib_wavecal_impl.h
index 583b523..ee99093 100644
--- a/irplib/irplib_wavecal_impl.h
+++ b/irplib/irplib_wavecal_impl.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_wavecal_impl.h,v 1.7 2012/08/03 21:05:34 llundin Exp $
+/* $Id: irplib_wavecal_impl.h,v 1.7 2012-08-03 21:05:34 llundin Exp $
*
* This file is part of the IRPLIB Pipeline
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: llundin $
- * $Date: 2012/08/03 21:05:34 $
+ * $Date: 2012-08-03 21:05:34 $
* $Revision: 1.7 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_WAVECAL_IMPL_H
diff --git a/irplib/irplib_wcs.c b/irplib/irplib_wcs.c
index 4ecbffa..51ae836 100644
--- a/irplib/irplib_wcs.c
+++ b/irplib/irplib_wcs.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_wcs.c,v 1.8 2010/10/07 14:10:55 llundin Exp $
+/* $Id: irplib_wcs.c,v 1.8 2010-10-07 14:10:55 llundin Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: llundin $
- * $Date: 2010/10/07 14:10:55 $
+ * $Date: 2010-10-07 14:10:55 $
* $Revision: 1.8 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_wcs.h b/irplib/irplib_wcs.h
index 2c87304..cc5c45c 100644
--- a/irplib/irplib_wcs.h
+++ b/irplib/irplib_wcs.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_wcs.h,v 1.7 2010/10/07 14:10:55 llundin Exp $
+/* $Id: irplib_wcs.h,v 1.7 2010-10-07 14:10:55 llundin Exp $
*
* This file is part of the irplib package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: llundin $
- * $Date: 2010/10/07 14:10:55 $
+ * $Date: 2010-10-07 14:10:55 $
* $Revision: 1.7 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_WCS_H
diff --git a/irplib/irplib_wlxcorr.c b/irplib/irplib_wlxcorr.c
index 33c7100..eeb5ea1 100644
--- a/irplib/irplib_wlxcorr.c
+++ b/irplib/irplib_wlxcorr.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_wlxcorr.c,v 1.58 2013/01/29 08:43:33 jtaylor Exp $
+/* $Id: irplib_wlxcorr.c,v 1.58 2013-01-29 08:43:33 jtaylor Exp $
*
* This file is part of the IRPLIB package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: jtaylor $
- * $Date: 2013/01/29 08:43:33 $
+ * $Date: 2013-01-29 08:43:33 $
* $Revision: 1.58 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/irplib/irplib_wlxcorr.h b/irplib/irplib_wlxcorr.h
index 4f23b51..467f599 100644
--- a/irplib/irplib_wlxcorr.h
+++ b/irplib/irplib_wlxcorr.h
@@ -1,4 +1,4 @@
-/* $Id: irplib_wlxcorr.h,v 1.22 2013/01/29 08:43:33 jtaylor Exp $
+/* $Id: irplib_wlxcorr.h,v 1.22 2013-01-29 08:43:33 jtaylor Exp $
*
* This file is part of the IRPLIB package
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: jtaylor $
- * $Date: 2013/01/29 08:43:33 $
+ * $Date: 2013-01-29 08:43:33 $
* $Revision: 1.22 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifndef IRPLIB_WLXCORR_H
diff --git a/irplib/tests/irplib_cat-test.c b/irplib/tests/irplib_cat-test.c
index bef07e9..dba945b 100644
--- a/irplib/tests/irplib_cat-test.c
+++ b/irplib/tests/irplib_cat-test.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_cat-test.c,v 1.10 2013/01/29 08:43:33 jtaylor Exp $
+/* $Id: irplib_cat-test.c,v 1.10 2013-01-29 08:43:33 jtaylor Exp $
*
* This file is part of the ESO Common Pipeline Library
* Copyright (C) 2001-2008 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: jtaylor $
- * $Date: 2013/01/29 08:43:33 $
+ * $Date: 2013-01-29 08:43:33 $
* $Revision: 1.10 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
/*-----------------------------------------------------------------------------
diff --git a/irplib/tests/irplib_polynomial-test.c b/irplib/tests/irplib_polynomial-test.c
index de1478a..33a50c9 100644
--- a/irplib/tests/irplib_polynomial-test.c
+++ b/irplib/tests/irplib_polynomial-test.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_polynomial-test.c,v 1.37 2013/01/29 08:43:33 jtaylor Exp $
+/* $Id: irplib_polynomial-test.c,v 1.37 2013-01-29 08:43:33 jtaylor Exp $
*
* This file is part of the ESO Common Pipeline Library
* Copyright (C) 2001-2004 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: jtaylor $
- * $Date: 2013/01/29 08:43:33 $
+ * $Date: 2013-01-29 08:43:33 $
* $Revision: 1.37 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
/*-----------------------------------------------------------------------------
diff --git a/irplib/tests/irplib_wcs-test.c b/irplib/tests/irplib_wcs-test.c
index 8db6236..2b6e19b 100644
--- a/irplib/tests/irplib_wcs-test.c
+++ b/irplib/tests/irplib_wcs-test.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_wcs-test.c,v 1.9 2013/01/29 08:43:33 jtaylor Exp $
+/* $Id: irplib_wcs-test.c,v 1.9 2013-01-29 08:43:33 jtaylor Exp $
*
* This file is part of the ESO Common Pipeline Library
* Copyright (C) 2001-2008 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: jtaylor $
- * $Date: 2013/01/29 08:43:33 $
+ * $Date: 2013-01-29 08:43:33 $
* $Revision: 1.9 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
/*-----------------------------------------------------------------------------
diff --git a/irplib/tests/irplib_wlxcorr-test.c b/irplib/tests/irplib_wlxcorr-test.c
index 7fbf2d5..767121a 100644
--- a/irplib/tests/irplib_wlxcorr-test.c
+++ b/irplib/tests/irplib_wlxcorr-test.c
@@ -1,4 +1,4 @@
-/* $Id: irplib_wlxcorr-test.c,v 1.16 2013/01/29 08:43:33 jtaylor Exp $
+/* $Id: irplib_wlxcorr-test.c,v 1.16 2013-01-29 08:43:33 jtaylor Exp $
*
* This file is part of the ESO Common Pipeline Library
* Copyright (C) 2001-2004 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: jtaylor $
- * $Date: 2013/01/29 08:43:33 $
+ * $Date: 2013-01-29 08:43:33 $
* $Revision: 1.16 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
/*-----------------------------------------------------------------------------
diff --git a/recipes/rrrecipe.c b/recipes/rrrecipe.c
index f0226ef..5b8f492 100644
--- a/recipes/rrrecipe.c
+++ b/recipes/rrrecipe.c
@@ -1,4 +1,4 @@
-/* $Id: rrrecipe.c,v 1.33 2013/03/26 17:00:45 jtaylor Exp $
+/* $Id: rrrecipe.c,v 1.33 2013-03-26 17:00:45 jtaylor Exp $
*
* This file is part of the IIINSTRUMENT Pipeline
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: jtaylor $
- * $Date: 2013/03/26 17:00:45 $
+ * $Date: 2013-03-26 17:00:45 $
* $Revision: 1.33 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/recipes/rrrecipe_calib.c b/recipes/rrrecipe_calib.c
index eef2714..b30c9c6 100644
--- a/recipes/rrrecipe_calib.c
+++ b/recipes/rrrecipe_calib.c
@@ -1,4 +1,4 @@
-/* $Id: rrrecipe_calib.c,v 1.6 2013/03/26 17:17:32 jtaylor Exp $
+/* $Id: rrrecipe_calib.c,v 1.6 2013-03-26 17:17:32 jtaylor Exp $
*
* This file is part of the IIINSTRUMENT Pipeline
* Copyright (C) 2002,2003 European Southern Observatory
@@ -20,9 +20,9 @@
/*
* $Author: jtaylor $
- * $Date: 2013/03/26 17:17:32 $
+ * $Date: 2013-03-26 17:17:32 $
* $Revision: 1.6 $
- * $Name: iiinstrument-0_0_3 $
+ * $Name: not supported by cvs2svn $
*/
#ifdef HAVE_CONFIG_H
diff --git a/reflex/Makefile.am b/reflex/Makefile.am
index 86572f2..72a8582 100644
--- a/reflex/Makefile.am
+++ b/reflex/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign
#Put here all the workflows. They must end with extension .in. They should
#be like a normal workflow but using @prefix@ for paths
#to the OCA rules (grep for OCA in the xml file) or Python scripts
-WORKFLOWS = Iiinstrument.xml
+WORKFLOWS = iiinstrument.xml
#Put here the OCA rules used by the workflow
OCAWKF = iiinstrument_wkf.oca
#Put Python scripts used by the workflows
diff --git a/reflex/Makefile.in b/reflex/Makefile.in
index d3dca42..c613713 100644
--- a/reflex/Makefile.in
+++ b/reflex/Makefile.in
@@ -52,8 +52,8 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = reflex
-DIST_COMMON = $(srcdir)/Iiinstrument.xml.in $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/iiinstrument.xml.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4macros/cpl.m4 \
$(top_srcdir)/m4macros/eso.m4 \
@@ -68,7 +68,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = Iiinstrument.xml
+CONFIG_CLEAN_FILES = iiinstrument.xml
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
@@ -267,7 +267,7 @@ AUTOMAKE_OPTIONS = foreign
#Put here all the workflows. They must end with extension .in. They should
#be like a normal workflow but using @prefix@ for paths
#to the OCA rules (grep for OCA in the xml file) or Python scripts
-WORKFLOWS = Iiinstrument.xml
+WORKFLOWS = iiinstrument.xml
#Put here the OCA rules used by the workflow
OCAWKF = iiinstrument_wkf.oca
#Put Python scripts used by the workflows
@@ -314,7 +314,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-Iiinstrument.xml: $(top_builddir)/config.status $(srcdir)/Iiinstrument.xml.in
+iiinstrument.xml: $(top_builddir)/config.status $(srcdir)/iiinstrument.xml.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
mostlyclean-libtool:
diff --git a/reflex/Iiinstrument.xml.in b/reflex/iiinstrument.xml.in
similarity index 88%
rename from reflex/Iiinstrument.xml.in
rename to reflex/iiinstrument.xml.in
index 543ec87..18b17c9 100644
--- a/reflex/Iiinstrument.xml.in
+++ b/reflex/iiinstrument.xml.in
@@ -1,18 +1,18 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE entity PUBLIC "-//UC Berkeley//DTD MoML 1//EN"
"http://ptolemy.eecs.berkeley.edu/xml/dtd/MoML_1.dtd">
-<entity name="Iiinstrument" class="ptolemy.actor.TypedCompositeActor">
- <property name="_createdBy" class="ptolemy.kernel.attributes.VersionAttribute" value="8.1.devel">
+<entity name="iiinstrument" class="ptolemy.actor.TypedCompositeActor">
+ <property name="_createdBy" class="ptolemy.kernel.attributes.VersionAttribute" value="9.1.devel">
</property>
- <property name="_windowProperties" class="ptolemy.actor.gui.WindowPropertiesAttribute" value="{bounds={406, 85, 1498, 1084}, maximized=false}">
+ <property name="_windowProperties" class="ptolemy.actor.gui.WindowPropertiesAttribute" value="{bounds={11, 81, 1497, 1063}, maximized=false}">
</property>
<property name="_vergilSize" class="ptolemy.actor.gui.SizeAttribute" value="[1181, 910]">
</property>
- <property name="_vergilZoomFactor" class="ptolemy.data.expr.ExpertParameter" value="0.7025525059202">
+ <property name="_vergilZoomFactor" class="ptolemy.data.expr.ExpertParameter" value="0.6816989329473592">
</property>
- <property name="_vergilCenter" class="ptolemy.data.expr.ExpertParameter" value="{830.5065742759907, 522.6384272575378}">
+ <property name="_vergilCenter" class="ptolemy.data.expr.ExpertParameter" value="{837.2181667894711, 523.4500692450623}">
</property>
- <property name="RAWDATA_DIR" class="ptolemy.data.expr.FileParameter" value="$ROOT_DATA_DIR/reflex_input/Iiinstrument">
+ <property name="RAWDATA_DIR" class="ptolemy.data.expr.FileParameter" value="$ROOT_DATA_DIR/reflex_input/iiinstrument">
<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>
@@ -87,7 +87,7 @@
<property name="_location" class="ptolemy.kernel.util.Location" value="[70.0, -115.0]">
</property>
</property>
- <property name="TMP_PRODUCTS_DIR" class="ptolemy.data.expr.FileParameter" value="$ROOT_DATA_DIR/reflex_tmp_products/Iiinstrument">
+ <property name="TMP_PRODUCTS_DIR" class="ptolemy.data.expr.FileParameter" value="$ROOT_DATA_DIR/reflex_tmp_products/iiinstrument">
<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>
@@ -134,7 +134,7 @@
<property name="allowDirectories" class="ptolemy.data.expr.Parameter" value="true">
</property>
</property>
- <property name="BOOKKEEPING_DIR" class="ptolemy.data.expr.FileParameter" value="$ROOT_DATA_DIR/reflex_book_keeping/Iiinstrument">
+ <property name="BOOKKEEPING_DIR" class="ptolemy.data.expr.FileParameter" value="$ROOT_DATA_DIR/reflex_book_keeping/iiinstrument">
<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>
@@ -181,7 +181,7 @@
<property name="allowDirectories" class="ptolemy.data.expr.Parameter" value="true">
</property>
</property>
- <property name="LOGS_DIR" class="ptolemy.data.expr.FileParameter" value="$ROOT_DATA_DIR/reflex_logs/Iiinstrument">
+ <property name="LOGS_DIR" class="ptolemy.data.expr.FileParameter" value="$ROOT_DATA_DIR/reflex_logs/iiinstrument">
<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>
@@ -369,7 +369,7 @@
</property>
<property name="_editorFactory" class="ptolemy.vergil.toolbox.VisibleParameterEditorFactory">
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="[1040.0, 240.0]">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[1040.0, 230.0]">
</property>
</property>
<property name="ESORexArgs" class="ptolemy.data.expr.StringParameter" value="--suppress-prefix=TRUE">
@@ -406,7 +406,7 @@
<property name="_location" class="ptolemy.kernel.util.Location" value="[675.0, 1155.0]">
</property>
</property>
- <property name="END_PRODUCT_SUBDIR" class="ptolemy.data.expr.StringParameter" value="2013-03-26T17:28:18/obsdata_tpl">
+ <property name="END_PRODUCTS_SUBDIR" class="ptolemy.data.expr.StringParameter" value="2013-09-24T10:31:32/obsdata_tpl">
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward A. Lee</configure></property>
@@ -474,7 +474,7 @@
<property name="_location" class="ptolemy.kernel.util.Location" value="[1040.0, 175.0]">
</property>
</property>
- <property name="GLOBAL_TIMESTAMP" class="ptolemy.data.expr.StringParameter" value="2013-03-26T17:28:18">
+ <property name="GLOBAL_TIMESTAMP" class="ptolemy.data.expr.StringParameter" value="2013-09-24T10:31:32">
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward A. Lee</configure></property>
@@ -508,7 +508,7 @@
<property name="_location" class="ptolemy.kernel.util.Location" value="[375.0, 1155.0]">
</property>
</property>
- <property name="ROOT_DATA_DIR" class="ptolemy.data.expr.FileParameter" value="ROOT_DATA_PATH_TO_REPLACE">
+ <property name="ROOT_DATA_DIR" class="ptolemy.data.expr.FileParameter" value="ROOT_DATA_PATH_TO_REPLACE/">
<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>
@@ -1067,7 +1067,7 @@
</property>
<property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#WorkflowDocumentation">
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="[1200.0, 215.0]">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[1200.0, 205.0]">
</property>
</property>
<property name="Annotation12" class="ptolemy.vergil.kernel.attributes.TextAttribute">
@@ -1597,7 +1597,7 @@
</property>
</property>
</property>
- <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:38254:5:24">
+ <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:44576:51:80">
</property>
<property name="Annotation20" class="ptolemy.vergil.kernel.attributes.TextAttribute">
<property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="true">
@@ -1666,7 +1666,7 @@
</property>
</property>
</property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org/ns/:2479:15:19:urn:lsid:kepler-project.org/ns/:25158:87:133:urn:lsid:kepler-project.org/ns/:26405:3:18:urn:lsid:kepler-project.org/ns/:31989:42:154:urn:lsid:kepler-project.org/ns/:37190:12:69:urn:lsid:kepler-project.org/ns/:37190:30:36:urn:lsid:kepler-project.org/ns/:37190:34:1:urn:lsid:kepler-project.org/ns/:37281:9:14:urn:lsid:kepler-project.org/ns/:37281:14:20:urn:lsid:ke [...]
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org/ns/:2479:15:19:urn:lsid:kepler-project.org/ns/:25158:87:133:urn:lsid:kepler-project.org/ns/:26405:3:18:urn:lsid:kepler-project.org/ns/:31989:42:154:urn:lsid:kepler-project.org/ns/:37190:12:69:urn:lsid:kepler-project.org/ns/:37190:30:36:urn:lsid:kepler-project.org/ns/:37190:34:1:urn:lsid:kepler-project.org/ns/:37281:9:14:urn:lsid:kepler-project.org/ns/:37281:14:20:urn:lsid:ke [...]
</property>
<property name="Setup Directory" class="ptolemy.vergil.kernel.attributes.RectangleAttribute">
<property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="true">
@@ -1885,7 +1885,7 @@
<property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:421:1">
</property>
</property>
- <property name="CALIB_DATA_DIR" class="ptolemy.data.expr.FileParameter" value="CALIB_DATA_PATH_TO_REPLACE">
+ <property name="CALIB_DATA_DIR" class="ptolemy.data.expr.FileParameter" value="CALIB_DATA_PATH_TO_REPLACE/iiinstrument- at VERSION@/">
<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>
@@ -2032,13 +2032,13 @@
<property name="_renderFirst" class="ptolemy.kernel.util.SingletonAttribute">
</property>
</property>
- <property name="EnableInteractivity" class="ptolemy.data.expr.StringParameter" value="true">
+ <property name="GlobalPlotInteractivity" class="ptolemy.data.expr.StringParameter" value="true">
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward A. Lee</configure></property>
<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>StringParameter specifies a persistent string. </p>
<p>Change the name of the StringParameter to better identify the specified value (right-click the parameter and select "Customize Name" from the menu). Other actors may refer to the StringParameter using the $NAME syntax (e.g. $Parameter).
</p></configure></property>
-</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:38254:6:1">
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:44576:56:1">
</property>
<property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.data.expr.StringParameter">
<property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1185:1">
@@ -2063,9 +2063,9 @@
</property>
<property name="_editorFactory" class="ptolemy.vergil.toolbox.VisibleParameterEditorFactory">
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="[1040.0, 305.0]">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[1040.0, 290.0]">
</property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:421:1">
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:421:1:urn:lsid:kepler-project.org/ns/:38254:6:1">
</property>
</property>
<property name="Annotation17" class="ptolemy.vergil.kernel.attributes.TextAttribute">
@@ -2112,63 +2112,299 @@
</property>
<property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#WorkflowDocumentation">
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="[1200.0, 280.0]">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[1230.0, 265.0]">
</property>
<property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:436:1">
</property>
</property>
- <entity name="Data Filter" class="org.eso.DataFilter">
- <property name="Mode" class="ptolemy.data.expr.StringParameter" value="Skip">
+ <property name="DataSelectionMethod" class="ptolemy.data.expr.StringParameter" value="Interactive">
+<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
+<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward A. Lee</configure></property>
+<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>StringParameter specifies a persistent string. </p>
<p>Change the name of the StringParameter to better identify the specified value (right-click the parameter and select "Customize Name" from the menu). Other actors may refer to the StringParameter using the $NAME syntax (e.g. $Parameter).
</p></configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:43955:86:1">
</property>
- <property name="FITS Viewer" class="ptolemy.data.expr.StringParameter" value="$FITS_VIEWER">
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.data.expr.StringParameter">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1185:1">
+ </property>
</property>
- <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:31989:43:2">
+ <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#Parameter">
</property>
- <property name="class" class="ptolemy.kernel.util.StringAttribute" value="org.eso.DataFilter">
- <property name="id" class="ptolemy.kernel.util.StringAttribute" value="null">
- </property>
+ <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#Parameter">
</property>
- <property name="semanticType41" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:4:1#ESO">
+ <property name="_hideName" class="ptolemy.kernel.util.SingletonAttribute">
</property>
- <property name="" class="ptolemy.vergil.basic.DocAttribute">
- <property name="author" class="ptolemy.kernel.util.StringAttribute" value="ESO">
+ <property name="_icon" class="ptolemy.vergil.icon.ValueIcon">
+ <property name="_color" class="ptolemy.actor.gui.ColorAttribute" value="{1.0, 0.0, 0.0, 1.0}">
</property>
- <property name="version" class="ptolemy.kernel.util.StringAttribute" value="1.0">
+ </property>
+ <property name="_smallIconDescription" class="ptolemy.kernel.util.SingletonConfigurableAttribute">
+ <configure>
+ <svg>
+ <text x="20" style="font-size:14; font-family:SansSerif; fill:red" y="20">-S-</text>
+ </svg>
+ </configure>
+ </property>
+ <property name="_editorFactory" class="ptolemy.vergil.toolbox.VisibleParameterEditorFactory">
+ </property>
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[1040.0, 325.0]">
+ </property>
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:421:1">
+ </property>
+ </property>
+ <property name="Annotation18" class="ptolemy.vergil.kernel.attributes.TextAttribute">
+ <property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="true">
+ </property>
+ <property name="_hideAllParameters" class="ptolemy.data.expr.Parameter" value="true">
+ </property>
+ <property name="textSize" class="ptolemy.data.expr.Parameter" value="14">
+ </property>
+ <property name="textColor" class="ptolemy.actor.gui.ColorAttribute" value="{0.4,0.4,0.0,1.0}">
+ </property>
+ <property name="fontFamily" class="ptolemy.data.expr.StringParameter" value="SansSerif">
+ </property>
+ <property name="bold" class="ptolemy.data.expr.Parameter" value="false">
+ </property>
+ <property name="italic" class="ptolemy.data.expr.Parameter" value="false">
+ </property>
+ <property name="text" class="ptolemy.kernel.util.StringAttribute" value="Selection method for the Data Set Chooser">
+ <property name="_style" class="ptolemy.actor.gui.style.TextStyle">
+ <property name="height" class="ptolemy.data.expr.Parameter" value="20">
+ </property>
+ <property name="width" class="ptolemy.data.expr.Parameter" value="80">
+ </property>
</property>
- <property name="Mode (parameter)" class="ptolemy.data.expr.StringParameter" value="<p>Skip: automatically select all files and don't show any window;</p><p>Display: select all the files and allow the user only to view them;</p><p>Select: standard mode.</p>">
+ </property>
+<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
+<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward A. Lee</configure></property>
+<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Use the Annotation attribute to annotate a workflow. Double-click the attribute to customize the content, font size, color, and basic formatting (bold and italics).</configure></property>
+<property name="prop:fontFamily" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The font face. Select a font from the drop-down menu. The default is "SansSerif".</configure></property>
+<property name="prop:italic" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Select to indicate that the type should be italics. By default, type will not be italicized.</configure></property>
+<property name="prop:bold" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Select to indicate that the type should be bold. By default, type will not be bold.</configure></property>
+<property name="prop:textColor" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The font color. Specify a string representing an array of four elements: red, green, blue, and alpha, where alpha is transparency. The default is an opaque black, {0.0, 0.0, 0.0, 1.0}</configure></property>
+<property name="prop:textSize" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The font size. Select an integer from the drop-down menu or specify a new size by typing it directly into the value field. The default is 14.</configure></property>
+<property name="prop:text" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The text of the annotation.</configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:43955:85:3">
+ </property>
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.vergil.kernel.attributes.TextAttribute">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1199:1">
</property>
- <property name="FITS Viewer (parameter)" class="ptolemy.data.expr.StringParameter" value="The application used to inspect FITS files">
+ </property>
+ <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#DocumentationActor">
+ </property>
+ <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#WorkflowDocumentation">
+ </property>
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[1280.0, 315.0]">
+ </property>
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:436:1">
+ </property>
+ </property>
+ <property name="ProvenanceExplorerEnabled" class="ptolemy.data.expr.StringParameter" value="true">
+<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
+<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward A. Lee</configure></property>
+<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>StringParameter specifies a persistent string. </p>
<p>Change the name of the StringParameter to better identify the specified value (right-click the parameter and select "Customize Name" from the menu). Other actors may refer to the StringParameter using the $NAME syntax (e.g. $Parameter).
</p></configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:44576:60:1">
+ </property>
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.data.expr.StringParameter">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1185:1">
</property>
- <property name="class (parameter)" class="ptolemy.data.expr.StringParameter" value="">
+ </property>
+ <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#Parameter">
+ </property>
+ <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#Parameter">
+ </property>
+ <property name="_hideName" class="ptolemy.kernel.util.SingletonAttribute">
+ </property>
+ <property name="_icon" class="ptolemy.vergil.icon.ValueIcon">
+ <property name="_color" class="ptolemy.actor.gui.ColorAttribute" value="{1.0, 0.0, 0.0, 1.0}">
</property>
- <property name="semanticType41 (parameter)" class="ptolemy.data.expr.StringParameter" value="">
+ </property>
+ <property name="_smallIconDescription" class="ptolemy.kernel.util.SingletonConfigurableAttribute">
+ <configure>
+ <svg>
+ <text x="20" style="font-size:14; font-family:SansSerif; fill:red" y="20">-S-</text>
+ </svg>
+ </configure>
+ </property>
+ <property name="_editorFactory" class="ptolemy.vergil.toolbox.VisibleParameterEditorFactory">
+ </property>
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{1040.0, 360.0}">
+ </property>
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:421:1:urn:lsid:kepler-project.org/ns/:43955:86:1">
+ </property>
+ </property>
+ <property name="Annotation19" class="ptolemy.vergil.kernel.attributes.TextAttribute">
+ <property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="true">
+ </property>
+ <property name="_hideAllParameters" class="ptolemy.data.expr.Parameter" value="true">
+ </property>
+ <property name="textSize" class="ptolemy.data.expr.Parameter" value="14">
+ </property>
+ <property name="textColor" class="ptolemy.actor.gui.ColorAttribute" value="{0.4,0.4,0.0,1.0}">
+ </property>
+ <property name="fontFamily" class="ptolemy.data.expr.StringParameter" value="SansSerif">
+ </property>
+ <property name="bold" class="ptolemy.data.expr.Parameter" value="false">
+ </property>
+ <property name="italic" class="ptolemy.data.expr.Parameter" value="false">
+ </property>
+ <property name="text" class="ptolemy.kernel.util.StringAttribute" value="Show Provenance Explorer window">
+ <property name="_style" class="ptolemy.actor.gui.style.TextStyle">
+ <property name="height" class="ptolemy.data.expr.Parameter" value="20">
+ </property>
+ <property name="width" class="ptolemy.data.expr.Parameter" value="80">
+ </property>
</property>
- <property name="in (port)" class="ptolemy.kernel.util.StringAttribute" value="The input SoF">
+ </property>
+<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
+<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward A. Lee</configure></property>
+<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Use the Annotation attribute to annotate a workflow. Double-click the attribute to customize the content, font size, color, and basic formatting (bold and italics).</configure></property>
+<property name="prop:fontFamily" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The font face. Select a font from the drop-down menu. The default is "SansSerif".</configure></property>
+<property name="prop:italic" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Select to indicate that the type should be italics. By default, type will not be italicized.</configure></property>
+<property name="prop:bold" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Select to indicate that the type should be bold. By default, type will not be bold.</configure></property>
+<property name="prop:textColor" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The font color. Specify a string representing an array of four elements: red, green, blue, and alpha, where alpha is transparency. The default is an opaque black, {0.0, 0.0, 0.0, 1.0}</configure></property>
+<property name="prop:textSize" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The font size. Select an integer from the drop-down menu or specify a new size by typing it directly into the value field. The default is 14.</configure></property>
+<property name="prop:text" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The text of the annotation.</configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:44576:61:1">
+ </property>
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.vergil.kernel.attributes.TextAttribute">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1199:1">
</property>
- <property name="out (port)" class="ptolemy.kernel.util.StringAttribute" value="The selected SoF">
+ </property>
+ <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#DocumentationActor">
+ </property>
+ <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#WorkflowDocumentation">
+ </property>
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[1310.0, 350.0]">
+ </property>
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:436:1:urn:lsid:kepler-project.org/ns/:43955:85:3">
+ </property>
+ </property>
+ <property name="Annotation21" class="ptolemy.vergil.kernel.attributes.TextAttribute">
+ <property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="true">
+ </property>
+ <property name="_hideAllParameters" class="ptolemy.data.expr.Parameter" value="true">
+ </property>
+ <property name="textSize" class="ptolemy.data.expr.Parameter" value="14">
+ <property name="_editorFactory" class="ptolemy.vergil.toolbox.VisibleParameterEditorFactory">
</property>
- <property name="rejected (port)" class="ptolemy.kernel.util.StringAttribute" value="The rejected SoF">
+ </property>
+ <property name="textColor" class="ptolemy.actor.gui.ColorAttribute" value="{1.0,0.0,0.0,1.0}">
+ </property>
+ <property name="fontFamily" class="ptolemy.data.expr.StringParameter" value="SansSerif">
+ </property>
+ <property name="bold" class="ptolemy.data.expr.Parameter" value="true">
+ </property>
+ <property name="italic" class="ptolemy.data.expr.Parameter" value="false">
+ </property>
+ <property name="text" class="ptolemy.kernel.util.StringAttribute" value="This is a basic workflow to help with data
organisation and execution of the pipeline.
The workflow was generated without a
review of the quality of the science products.">
+ <property name="_style" class="ptolemy.actor.gui.style.TextStyle">
+ <property name="height" class="ptolemy.data.expr.Parameter" value="20">
+ </property>
+ <property name="width" class="ptolemy.data.expr.Parameter" value="80">
+ </property>
</property>
- <property name="entityId (parameter)" class="ptolemy.data.expr.StringParameter" value="">
+ </property>
+<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
+<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward A. Lee</configure></property>
+<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Use the Annotation attribute to annotate a workflow. Double-click the attribute to customize the content, font size, color, and basic formatting (bold and italics).</configure></property>
+<property name="prop:fontFamily" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The font face. Select a font from the drop-down menu. The default is "SansSerif".</configure></property>
+<property name="prop:italic" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Select to indicate that the type should be italics. By default, type will not be italicized.</configure></property>
+<property name="prop:bold" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Select to indicate that the type should be bold. By default, type will not be bold.</configure></property>
+<property name="prop:textColor" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The font color. Specify a string representing an array of four elements: red, green, blue, and alpha, where alpha is transparency. The default is an opaque black, {0.0, 0.0, 0.0, 1.0}</configure></property>
+<property name="prop:textSize" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The font size. Select an integer from the drop-down menu or specify a new size by typing it directly into the value field. The default is 14.</configure></property>
+<property name="prop:text" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The text of the annotation.</configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:31617:223:8">
+ </property>
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.vergil.kernel.attributes.TextAttribute">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1199:1">
</property>
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="[1470.0, 670.0]">
+ <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#DocumentationActor">
+ </property>
+ <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#WorkflowDocumentation">
</property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:workflow:4:1">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[1265.0, -125.0]">
</property>
- <port name="sof in" class="ptolemy.actor.TypedIOPort">
- <property name="input"/>
- <property name="multiport"/>
- <property name="_cardinal" class="ptolemy.kernel.util.StringAttribute" value="WEST">
+ <property name="" class="ptolemy.vergil.basic.DocAttribute">
+ <property name="author" class="ptolemy.kernel.util.StringAttribute" value="Edward A. Lee">
</property>
- </port>
- <port name="sof out" class="ptolemy.actor.TypedIOPort">
- <property name="output"/>
- <property name="multiport"/>
- <property name="_cardinal" class="ptolemy.kernel.util.StringAttribute" value="SOUTH">
+ <property name="version" class="ptolemy.kernel.util.StringAttribute" value="null">
</property>
- </port>
- </entity>
+ <property name="textSize (parameter)" class="ptolemy.data.expr.StringParameter" value="The font size. Select an integer from the drop-down menu or specify a new size by typing it directly into the value field. The default is 14.">
+ </property>
+ <property name="textColor (parameter)" class="ptolemy.data.expr.StringParameter" value="The font color. Specify a string representing an array of four elements: red, green, blue, and alpha, where alpha is transparency. The default is an opaque black, {0.0, 0.0, 0.0, 1.0}">
+ </property>
+ <property name="fontFamily (parameter)" class="ptolemy.data.expr.StringParameter" value="The font face. Select a font from the drop-down menu. The default is "SansSerif".">
+ </property>
+ <property name="bold (parameter)" class="ptolemy.data.expr.StringParameter" value="Select to indicate that the type should be bold. By default, type will not be bold.">
+ </property>
+ <property name="italic (parameter)" class="ptolemy.data.expr.StringParameter" value="Select to indicate that the type should be italics. By default, type will not be italicized.">
+ </property>
+ <property name="text (parameter)" class="ptolemy.data.expr.StringParameter" value="The text of the annotation.">
+ </property>
+ </property>
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:436:1">
+ </property>
+ <property name="_renderLast" class="ptolemy.kernel.util.SingletonAttribute">
+ </property>
+ </property>
+ <property name="Setup Directory2" class="ptolemy.vergil.kernel.attributes.RectangleAttribute">
+ <property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="true">
+ </property>
+ <property name="_hideAllParameters" class="ptolemy.data.expr.Parameter" value="true">
+ </property>
+ <property name="_location" class="ptolemy.kernel.util.Location" value="1260.0, -130.0">
+ </property>
+ <property name="lineWidth" class="ptolemy.data.expr.Parameter" value="5">
+ </property>
+ <property name="lineColor" class="ptolemy.actor.gui.ColorAttribute" value="{1.0,0.0,0.0,1.0}">
+ </property>
+ <property name="width" class="ptolemy.data.expr.Parameter" value="375.0">
+ </property>
+ <property name="height" class="ptolemy.data.expr.Parameter" value="80.0">
+ </property>
+ <property name="centered" class="ptolemy.data.expr.Parameter" value="false">
+ </property>
+ <property name="fillColor" class="ptolemy.actor.gui.ColorAttribute" value="{0.99607843,0.9490196,0.7254902,1.0}">
+ </property>
+ <property name="rounding" class="ptolemy.data.expr.Parameter" value="20">
+ </property>
+<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
+<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward A. Lee</configure></property>
+<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>The Rectangle attribute renders a rectangle on the Workflow canvas. Single-click the rectangle to drag the resize handles and adjust the shape's size, or double-click the rectangle to customize its height, width, line width, color, and fill color.</p></configure></property>
+<property name="prop:height" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The vertical extent. The value is a double that defaults to 100.0.</configure></property>
+<property name="prop:lineWidth" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The line width. The value is a double that defaults to 1.0.</configure></property>
+<property name="prop:rounding" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The amount of rounding of the corners. The value is a double that defaults to 0.0, which indicates no rounding.</configure></property>
+<property name="prop:centered" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Indicate whether the shape should be centered on its origin. By default, the location is the upper-left corner.</configure></property>
+<property name="prop:dashArray" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Specify a dash-pattern for dashed or dotted lines. The value consists of an array of doubles that specify the length of the alternating solid and transparent segments. An empty value indicates that the line should not be dashed (the default).</configure></property>
+<property name="prop:width" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The horizontal extent. The value is a double that defaults to 100.0.</configure></property>
+<property name="prop:lineColor" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The line color. Specify a string representing an array of four elements: red, green, blue, and alpha, where alpha is transparency. The default is an opaque black, {0.0, 0.0, 0.0, 1.0}</configure></property>
+<property name="prop:fillColor" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The fill color. Specify a string representing an array of four elements: red, green, blue, and alpha, where alpha is transparency. By default, the value is "none."</configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:44576:62:1">
+ </property>
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.vergil.kernel.attributes.RectangleAttribute">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1197:1">
+ </property>
+ </property>
+ <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#DecorativeActor">
+ </property>
+ <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#WorkflowDocumentation">
+ </property>
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:434:1:urn:lsid:kepler-project.org/ns/:25158:26:1:urn:lsid:kepler-project.org/ns/:31617:222:11">
+ </property>
+ </property>
<entity name="Calibration" class="ptolemy.actor.TypedCompositeActor">
<property name="_createdBy" class="ptolemy.kernel.attributes.VersionAttribute" value="7.0.2">
</property>
@@ -2295,11 +2531,15 @@
<property name="multiport"/>
<property name="_showName" class="ptolemy.data.expr.Parameter" value="true">
</property>
+ <property name="tokenConsumptionRate" class="ptolemy.data.expr.Parameter" value="0">
+ </property>
</port>
<port name="#groups" class="ptolemy.actor.TypedIOPort">
<property name="input"/>
<property name="_showName" class="ptolemy.data.expr.Parameter" value="true">
</property>
+ <property name="tokenConsumptionRate" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
</port>
<port name="sof out" class="ptolemy.actor.TypedIOPort">
<property name="output"/>
@@ -2311,6 +2551,17 @@
<entity name="rrrecipe_calib_1" class="org.eso.RecipeExecuter">
<property name="_location" class="ptolemy.kernel.util.Location" value="[280.0, 265.0]">
</property>
+ <port name="sof in" class="ptolemy.actor.TypedIOPort">
+ <property name="input"/>
+ <property name="multiport"/>
+ <property name="tokenConsumptionRate" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
+ </port>
+ <port name="sop in" class="ptolemy.actor.TypedIOPort">
+ <property name="input"/>
+ <property name="tokenConsumptionRate" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
+ </port>
</entity>
<relation name="relation3" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
@@ -2346,7 +2597,7 @@
<entity name="Science" class="ptolemy.actor.TypedCompositeActor">
<property name="_createdBy" class="ptolemy.kernel.attributes.VersionAttribute" value="7.0.2">
</property>
- <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:38254:4:10">
+ <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:44576:55:2">
</property>
<property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.TypedCompositeActor">
<property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:449:1">
@@ -2373,9 +2624,9 @@
</property>
<property name="_vergilCenter" class="ptolemy.data.expr.ExpertParameter" value="{251.4029998779221, -75.9448589055753}">
</property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:449:1:urn:lsid:kepler-project.org/ns/:25158:102:35:urn:lsid:kepler-project.org/ns/:37190:15:85:urn:lsid:kepler-project.org/ns/:37281:12:31:urn:lsid:kepler-project.org/ns/:38242:12:15">
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:449:1:urn:lsid:kepler-project.org/ns/:25158:102:35:urn:lsid:kepler-project.org/ns/:37190:15:85:urn:lsid:kepler-project.org/ns/:37281:12:31:urn:lsid:kepler-project.org/ns/:38242:12:15:urn:lsid:kepler-project.org/ns/:38254:4:10">
</property>
- <property name="EnableInteractivity" class="ptolemy.data.expr.StringParameter" value="$EnableInteractivity">
+ <property name="EnableInteractivity" class="ptolemy.data.expr.StringParameter" value="$GlobalPlotInteractivity">
</property>
<port name="sof_in" class="ptolemy.actor.TypedIOPort">
<property name="input"/>
@@ -2459,11 +2710,15 @@
<property name="multiport"/>
<property name="_showName" class="ptolemy.data.expr.Parameter" value="true">
</property>
+ <property name="tokenConsumptionRate" class="ptolemy.data.expr.Parameter" value="0">
+ </property>
</port>
<port name="#groups" class="ptolemy.actor.TypedIOPort">
<property name="input"/>
<property name="_showName" class="ptolemy.data.expr.Parameter" value="true">
</property>
+ <property name="tokenConsumptionRate" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
</port>
<port name="sof out" class="ptolemy.actor.TypedIOPort">
<property name="output"/>
@@ -2503,11 +2758,15 @@
<port name="sof in" class="ptolemy.actor.TypedIOPort">
<property name="input"/>
<property name="multiport"/>
+ <property name="tokenConsumptionRate" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
<property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="true">
</property>
</port>
<port name="sop in" class="ptolemy.actor.TypedIOPort">
<property name="input"/>
+ <property name="tokenConsumptionRate" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
<property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="true">
</property>
</port>
@@ -2515,6 +2774,8 @@
<property name="input"/>
<property name="_cardinal" class="ptolemy.kernel.util.StringAttribute" value="SOUTH">
</property>
+ <property name="tokenConsumptionRate" class="ptolemy.data.expr.Parameter" value="0">
+ </property>
<property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="true">
</property>
</port>
@@ -2522,6 +2783,8 @@
<property name="input"/>
<property name="_cardinal" class="ptolemy.kernel.util.StringAttribute" value="SOUTH">
</property>
+ <property name="tokenConsumptionRate" class="ptolemy.data.expr.Parameter" value="0">
+ </property>
<property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="true">
</property>
</port>
@@ -2529,6 +2792,8 @@
<property name="input"/>
<property name="_cardinal" class="ptolemy.kernel.util.StringAttribute" value="SOUTH">
</property>
+ <property name="tokenConsumptionRate" class="ptolemy.data.expr.Parameter" value="0">
+ </property>
<property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="true">
</property>
</port>
@@ -2555,12 +2820,6 @@
</property>
<property name="Disable logging" class="ptolemy.data.expr.Parameter" value="false">
</property>
- <property name="Clear Products Dir" class="ptolemy.data.expr.StringParameter" value="Never">
- </property>
- <property name="Clear Logs Dir" class="ptolemy.data.expr.StringParameter" value="Never">
- </property>
- <property name="Clear Bookkeeping Dir" class="ptolemy.data.expr.StringParameter" value="Never">
- </property>
<property name="Products Dir" class="ptolemy.data.expr.FileParameter" value="$TMP_PRODUCTS_DIR">
<property name="allowFiles" class="ptolemy.data.expr.Parameter" value="false">
</property>
@@ -2579,6 +2838,12 @@
<property name="allowDirectories" class="ptolemy.data.expr.Parameter" value="true">
</property>
</property>
+ <property name="Clear Products Dir" class="ptolemy.data.expr.StringParameter" value="Never">
+ </property>
+ <property name="Clear Logs Dir" class="ptolemy.data.expr.StringParameter" value="Never">
+ </property>
+ <property name="Clear Bookkeeping Dir" class="ptolemy.data.expr.StringParameter" value="Never">
+ </property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>This actor executes a Python script</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>ESO</configure></property>
@@ -2713,10 +2978,6 @@
</port>
</entity>
<entity name="String Constant" class="ptolemy.actor.lib.StringConst">
- <property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
- </property>
- <property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
- </property>
<property name="value" class="ptolemy.data.expr.Parameter" value="rrrecipe:stropt=NONE
rrrecipe:fileopt=NONE
rrrecipe:boolopt=TRUE
rrrecipe:intopt=5
rrrecipe:rangeopt=0.5
rrrecipe:enumopt=second">
<property name="style" class="ptolemy.actor.gui.style.TextStyle">
<property name="height" class="ptolemy.data.expr.Parameter" value="10">
@@ -2725,6 +2986,10 @@
</property>
</property>
</property>
+ <property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
+ </property>
+ <property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
+ </property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
@@ -2794,12 +3059,12 @@
</property>
</entity>
<entity name="String Constant2" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value="$EnableInteractivity">
+ </property>
<property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
</property>
<property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
</property>
- <property name="value" class="ptolemy.data.expr.Parameter" value="$EnableInteractivity">
- </property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
@@ -2858,6 +3123,17 @@
</property>
<property name="_location" class="ptolemy.kernel.util.Location" value="[70.0, -110.0]">
</property>
+ <port name="sof in" class="ptolemy.actor.TypedIOPort">
+ <property name="input"/>
+ <property name="multiport"/>
+ <property name="tokenConsumptionRate" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
+ </port>
+ <port name="sop in" class="ptolemy.actor.TypedIOPort">
+ <property name="input"/>
+ <property name="tokenConsumptionRate" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
+ </port>
</entity>
<relation name="relation" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
@@ -3049,8 +3325,6 @@
</property>
</property>
<property name="DDF Director" class="ptolemy.domains.ddf.kernel.DDFDirector">
- <property name="timeResolution" class="ptolemy.actor.parameters.SharedParameter" value="1E-10">
- </property>
<property name="iterations" class="ptolemy.data.expr.Parameter" value="0">
</property>
<property name="maximumReceiverCapacity" class="ptolemy.data.expr.Parameter" value="0">
@@ -3179,12 +3453,12 @@
</property>
</entity>
<entity name="String Constant" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value="if [ "x$EraseDirs" = "xtrue" ]; then echo "Deleting files"; rm -rf $BOOKKEEPING_DIR/*; rm -rf $LOGS_DIR/*; rm -rf $TMP_PRODUCTS_DIR/* ; else echo "Will not delete files"; fi">
+ </property>
<property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="1">
</property>
<property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
</property>
- <property name="value" class="ptolemy.data.expr.Parameter" value="if [ "x$EraseDirs" = "xtrue" ]; then echo "Deleting files"; rm -rf $BOOKKEEPING_DIR/*; rm -rf $LOGS_DIR/*; rm -rf $TMP_PRODUCTS_DIR/* ; else echo "Will not delete files"; fi">
- </property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
@@ -3214,12 +3488,12 @@
</property>
</entity>
<entity name="String Constant2" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value="$RAWDATA_DIR">
+ </property>
<property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="1">
</property>
<property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
</property>
- <property name="value" class="ptolemy.data.expr.Parameter" value="$RAWDATA_DIR">
- </property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
@@ -3249,8 +3523,6 @@
</property>
</entity>
<entity name="DirectoryEraser" class="ptolemy.actor.lib.Exec">
- <property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="1">
- </property>
<property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
</property>
<property name="command" class="ptolemy.actor.parameters.PortParameter" value="sh">
@@ -3265,6 +3537,8 @@
</property>
<property name="waitForProcess" class="ptolemy.data.expr.Parameter" value="true">
</property>
+ <property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Xiaojun Liu, Edward A. Lee, Steve Neuendorffer</configure></property>
@@ -3299,8 +3573,6 @@
</property>
<property name="version" class="ptolemy.kernel.util.StringAttribute" value="null">
</property>
- <property name="firingCountLimit (parameter)" class="ptolemy.data.expr.StringParameter" value="If a positive integer, then it is the maximum number of times to execute the actor.">
- </property>
<property name="directory (parameter)" class="ptolemy.data.expr.StringParameter" value="The directory in which to execute the command. The default value of this parameter $CWD, which represents the user's current working or home directory. ">
</property>
<property name="environment (parameter)" class="ptolemy.data.expr.StringParameter" value="An array of records that name an environment variable and a value:
{{name = "NAME1", value = "value1"}...}
Where NAME1 is the name of the environment variable, and value1 is the value.
For example, {{name = "PTII", value = "c:/ptII"}} would set the value of the PTII to c:/ptII.
If the parameter is set to {{name= [...]
@@ -3311,6 +3583,8 @@
</property>
<property name="waitForProcess (parameter)" class="ptolemy.data.expr.StringParameter" value="If true, then actor will wait until subprocess completes.">
</property>
+ <property name="firingCountLimit (parameter)" class="ptolemy.data.expr.StringParameter" value="If a positive integer, then it is the maximum number of times to execute the actor.">
+ </property>
<property name="output (port)" class="ptolemy.kernel.util.StringAttribute" value="An output port that broadcasts data generated by the executed command, output as a string after the command has finished executing. If the command generates no data on standard out, then the empty string (a string of length zero) is generated. ">
</property>
<property name="trigger (port)" class="ptolemy.kernel.util.StringAttribute" value="If connected, a token must be available on this port before actor will execute.">
@@ -3351,12 +3625,12 @@
</port>
</entity>
<entity name="String Constant3" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value="$CALIB_DATA_DIR">
+ </property>
<property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="1">
</property>
<property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
</property>
- <property name="value" class="ptolemy.data.expr.Parameter" value="$CALIB_DATA_DIR">
- </property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
@@ -3436,7 +3710,7 @@
<entity name="Close DataSet" class="ptolemy.actor.TypedCompositeActor">
<property name="_createdBy" class="ptolemy.kernel.attributes.VersionAttribute" value="7.0.2">
</property>
- <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:31989:45:2">
+ <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:44576:50:16">
</property>
<property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.TypedCompositeActor">
<property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:449:1">
@@ -3453,9 +3727,9 @@
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Yuhong Xiong</configure></property>
<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>A Composite actor is an aggregation of actors. It may have a local director that is responsible for executing the contained actors. A Composite actor with a local director is called an opaque actor. Composite actors do not require a local director. Composite actors with no local director "inherit" the director from the containing workflow and are called non-opaque.</ [...]
-</property> <property name="_location" class="ptolemy.kernel.util.Location" value="[1470.0, 1080.0]">
+</property> <property name="_location" class="ptolemy.kernel.util.Location" value="[1455.0, 1085.0]">
</property>
- <property name="_windowProperties" class="ptolemy.actor.gui.WindowPropertiesAttribute" value="{bounds={526, 57, 1305, 832}, maximized=false}">
+ <property name="_windowProperties" class="ptolemy.actor.gui.WindowPropertiesAttribute" value="{bounds={616, 37, 1304, 811}, maximized=false}">
</property>
<property name="_vergilSize" class="ptolemy.actor.gui.SizeAttribute" value="[988, 658]">
</property>
@@ -3463,9 +3737,9 @@
</property>
<property name="_vergilCenter" class="ptolemy.data.expr.ExpertParameter" value="{1284.5625, 895.4900050607288}">
</property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:449:1">
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:449:1:urn:lsid:kepler-project.org/ns/:31989:45:2:urn:lsid:kepler-project.org/ns/:43955:74:3:urn:lsid:kepler-project.org/ns/:44497:3:4">
</property>
- <property name="Annotation2" class="ptolemy.vergil.kernel.attributes.TextAttribute">
+ <property name="Annotation" class="ptolemy.vergil.kernel.attributes.TextAttribute">
<property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="true">
</property>
<property name="_hideAllParameters" class="ptolemy.data.expr.Parameter" value="true">
@@ -3480,7 +3754,7 @@
</property>
<property name="italic" class="ptolemy.data.expr.Parameter" value="false">
</property>
- <property name="text" class="ptolemy.kernel.util.StringAttribute" value="This subworkflow modifies the END_PRODUCT_SUBDIR variable,
increasing one number each a data set is run">
+ <property name="text" class="ptolemy.kernel.util.StringAttribute" value="This subworkflow modifies takes care of the final tasks:
-Creating a README file with the list of files
-Displaying a window with the finished datasets
-Creating input for ProvenanceExplorer">
<property name="_style" class="ptolemy.actor.gui.style.TextStyle">
<property name="height" class="ptolemy.data.expr.Parameter" value="20">
</property>
@@ -3499,7 +3773,7 @@
<property name="prop:textColor" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The font color. Specify a string representing an array of four elements: red, green, blue, and alpha, where alpha is transparency. The default is an opaque black, {0.0, 0.0, 0.0, 1.0}</configure></property>
<property name="prop:textSize" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The font size. Select an integer from the drop-down menu or specify a new size by typing it directly into the value field. The default is 14.</configure></property>
<property name="prop:text" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The text of the annotation.</configure></property>
-</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org:actor:436:1">
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:44576:49:1">
</property>
<property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.vergil.kernel.attributes.TextAttribute">
<property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1199:1">
@@ -3509,30 +3783,42 @@
</property>
<property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#WorkflowDocumentation">
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="{155.0, 580.0}">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[280.0, 680.0]">
+ </property>
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:436:1">
</property>
</property>
- <port name="final_files2" class="ptolemy.actor.TypedIOPort">
+ <port name="current_dataset" class="ptolemy.actor.TypedIOPort">
<property name="input"/>
- <property name="_location" class="ptolemy.kernel.util.Location" value="{60.0, 410.0}">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{431.6612027096115, 167.69104677914112}">
</property>
- <property name="_cardinal" class="ptolemy.kernel.util.StringAttribute" value="NORTH">
+ <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="true">
</property>
</port>
- <port name="current_dataset" class="ptolemy.actor.TypedIOPort">
+ <port name="final_files" class="ptolemy.actor.TypedIOPort">
<property name="input"/>
- <property name="_location" class="ptolemy.kernel.util.Location" value="{185.0, 205.0}">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{66.66120270961146, 397.6910467791411}">
</property>
- <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="true">
+ <property name="_cardinal" class="ptolemy.kernel.util.StringAttribute" value="NORTH">
</property>
</port>
- <entity name="String Constant2" class="ptolemy.actor.lib.StringConst">
+ <port name="bookkeeping_db" class="ptolemy.actor.TypedIOPort">
+ <property name="output"/>
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[480.0, 575.0]">
+ </property>
+ </port>
+ <port name="global_timestamp" class="ptolemy.actor.TypedIOPort">
+ <property name="output"/>
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[485.0, 640.0]">
+ </property>
+ </port>
+ <entity name="String Constant" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value="README">
+ </property>
<property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
</property>
<property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
</property>
- <property name="value" class="ptolemy.data.expr.Parameter" value=" Dataset has been reduced and saved in ">
- </property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
@@ -3542,7 +3828,7 @@
<property name="port:trigger" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that has no declared type (in other words, the port can accept any data type: double, int, array, etc.) If the port is connected, the actor will not fire until the trigger port receives an input token. Connecting the port is optional, but useful when scheduling the actor to perform at a certain time. </configure></property>
<property name="prop:firingCountLimit" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The limit on the number of times the actor will fire. The default value is 'NONE', meaning there is no limit on the number of time the constant will be provided to the output port. Any integer can be provided as a value for this parameter.</configure></property>
<property name="prop:value" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The value produced by the actor. Specified strings do not require enclosing quotes. (To include a '$' sign in the string, enter '$$'.)</configure></property>
-</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:17547:19:3">
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:15314:123:3">
</property>
<property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.lib.StringConst">
<property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1052:1">
@@ -3558,92 +3844,82 @@
<property name="displayWidth" class="ptolemy.data.expr.Parameter" value="60">
</property>
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="{255.0, 355.0}">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{731.6612027096114, 477.6910467791411}">
</property>
<property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="true">
</property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:204:1:urn:lsid:kepler-project.org/ns/:13643:21:2">
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:204:1">
</property>
<port name="trigger" class="ptolemy.actor.TypedIOPort">
<property name="input"/>
<property name="multiport"/>
- <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="true">
+ <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="false">
</property>
</port>
</entity>
- <entity name="Final directory path" class="org.resurgence.actor.StringAccumulator">
- <property name="Substring separator" class="ptolemy.data.expr.Parameter" value=""/"">
- </property>
-<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
-<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
-<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Wibke Sudholt</configure></property>
-<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
-<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>
The StringAccumulator actor reads multiple strings via its input port and outputs a string containing all of the input values. The characters separating the substrings in the output string can be specified with the substringSeparator parameter.</p></configure></property>
-<property name="port:whole" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An output port that broadcasts the full string.</configure></property>
-<property name="port:parts" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that accepts substrings.</configure></property>
-<property name="prop:Substring separator" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The characters used to separate the elements in the output string. By default, the value is "".</configure></property>
-</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:17547:25:2">
- </property>
- <property name="class" class="ptolemy.kernel.util.StringAttribute" value="org.resurgence.actor.StringAccumulator">
- <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1117:1">
- </property>
+ <entity name="Finished Datasets" class="ptolemy.actor.lib.gui.Display">
+ <property name="_windowProperties" class="ptolemy.actor.gui.WindowPropertiesAttribute" value="{bounds={33, 726, 1331, 202}, maximized=false}">
</property>
- <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#StringFunctionActor">
+ <property name="_paneSize" class="ptolemy.actor.gui.SizeAttribute" value="[1323, 153]">
</property>
- <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#IterativeOperation">
+ <property name="rowsDisplayed" class="ptolemy.data.expr.Parameter" value="10">
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="{370.0, 445.0}">
+ <property name="columnsDisplayed" class="ptolemy.data.expr.Parameter" value="120">
</property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:292:1">
+ <property name="suppressBlankLines" class="ptolemy.data.expr.Parameter" value="false">
</property>
- </entity>
- <entity name="Final message" class="org.resurgence.actor.StringAccumulator">
- <property name="Substring separator" class="ptolemy.data.expr.Parameter" value="""">
+ <property name="title" class="ptolemy.data.expr.StringParameter" value="Current Dataset">
</property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
-<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Wibke Sudholt</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Yuhong Xiong, Edward A. Lee</configure></property>
<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
-<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>
The StringAccumulator actor reads multiple strings via its input port and outputs a string containing all of the input values. The characters separating the substrings in the output string can be specified with the substringSeparator parameter.</p></configure></property>
-<property name="port:whole" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An output port that broadcasts the full string.</configure></property>
-<property name="port:parts" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that accepts substrings.</configure></property>
-<property name="prop:Substring separator" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The characters used to separate the elements in the output string. By default, the value is "".</configure></property>
-</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:17547:26:1">
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>The Display actor reads tokens of any type via its input multiport, and displays each token on a separate line in a text display window.</p>
<p>Specify the size of the text display window with the rowsDisplayed and columnsDisplayed parameters. Simply resizing the window onscreen does not persistently change the size when the workflow is saved, closed, and the [...]
+<property name="port:input" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that accepts tokens of any type.</configure></property>
+<property name="prop:suppressBlankLines" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Specify whether the actor should display blank lines (the default) or suppress them.</configure></property>
+<property name="prop:rowsDisplayed" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The vertical size of the display, in rows. The value is an integer that defaults to 10.</configure></property>
+<property name="prop:columnsDisplayed" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The horizontal size of the display, in columns. The value is an integer that defaults to 40.</configure></property>
+<property name="prop:title" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The title of the text display window. If specified, the value will appear in the title bar of the text display window.</configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:44576:53:1">
</property>
- <property name="class" class="ptolemy.kernel.util.StringAttribute" value="org.resurgence.actor.StringAccumulator">
- <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1117:1">
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.lib.gui.Display">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:883:1">
</property>
</property>
- <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#StringFunctionActor">
+ <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#TextualOutputActor">
</property>
- <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#IterativeOperation">
+ <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#TextualOutput">
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="{470.0, 325.0}">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{801.6612027096114, 157.69104677914112}">
+ </property>
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:7:1:urn:lsid:kepler-project.org/ns/:13643:22:2:urn:lsid:kepler-project.org/ns/:17547:3:12">
</property>
<property name="" class="ptolemy.vergil.basic.DocAttribute">
- <property name="description" class="ptolemy.kernel.util.StringAttribute" value="<p>
The StringAccumulator actor reads multiple strings via its input port and outputs a string containing all of the input values. The characters separating the substrings in the output string can be specified with the substringSeparator parameter.</p>">
+ <property name="description" class="ptolemy.kernel.util.StringAttribute" value="<p>The Display actor reads tokens of any type via its input multiport, and displays each token on a separate line in a text display window.</p>
<p>Specify the size of the text display window with the rowsDisplayed and columnsDisplayed parameters. Simply resizing the window onscreen does not persistently change the size when the workflow is saved, closed, and then re- [...]
</property>
- <property name="author" class="ptolemy.kernel.util.StringAttribute" value="Wibke Sudholt">
+ <property name="author" class="ptolemy.kernel.util.StringAttribute" value="Yuhong Xiong, Edward A. Lee">
</property>
<property name="version" class="ptolemy.kernel.util.StringAttribute" value="null">
</property>
- <property name="Substring separator (parameter)" class="ptolemy.data.expr.StringParameter" value="The characters used to separate the elements in the output string. By default, the value is "".">
+ <property name="rowsDisplayed (parameter)" class="ptolemy.data.expr.StringParameter" value="The vertical size of the display, in rows. The value is an integer that defaults to 10.">
</property>
- <property name="parts (port)" class="ptolemy.kernel.util.StringAttribute" value="A multiport that accepts substrings.">
+ <property name="columnsDisplayed (parameter)" class="ptolemy.data.expr.StringParameter" value="The horizontal size of the display, in columns. The value is an integer that defaults to 40.">
</property>
- <property name="whole (port)" class="ptolemy.kernel.util.StringAttribute" value="An output port that broadcasts the full string.">
+ <property name="suppressBlankLines (parameter)" class="ptolemy.data.expr.StringParameter" value="Specify whether the actor should display blank lines (the default) or suppress them.">
+ </property>
+ <property name="title (parameter)" class="ptolemy.data.expr.StringParameter" value="The title of the text display window. If specified, the value will appear in the title bar of the text display window.">
+ </property>
+ <property name="input (port)" class="ptolemy.kernel.util.StringAttribute" value="A multiport that accepts tokens of any type.">
</property>
- </property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:292:1">
</property>
</entity>
- <entity name="String Constant3" class="ptolemy.actor.lib.StringConst">
+ <entity name="String Constant2" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value="$END_PRODUCTS_DIR">
+ </property>
<property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
</property>
<property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
</property>
- <property name="value" class="ptolemy.data.expr.Parameter" value="$END_PRODUCT_SUBDIR">
- </property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
@@ -3653,7 +3929,7 @@
<property name="port:trigger" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that has no declared type (in other words, the port can accept any data type: double, int, array, etc.) If the port is connected, the actor will not fire until the trigger port receives an input token. Connecting the port is optional, but useful when scheduling the actor to perform at a certain time. </configure></property>
<property name="prop:firingCountLimit" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The limit on the number of times the actor will fire. The default value is 'NONE', meaning there is no limit on the number of time the constant will be provided to the output port. Any integer can be provided as a value for this parameter.</configure></property>
<property name="prop:value" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The value produced by the actor. Specified strings do not require enclosing quotes. (To include a '$' sign in the string, enter '$$'.)</configure></property>
-</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:17547:23:2">
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:15314:121:3">
</property>
<property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.lib.StringConst">
<property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1052:1">
@@ -3669,24 +3945,26 @@
<property name="displayWidth" class="ptolemy.data.expr.Parameter" value="60">
</property>
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="{265.0, 530.0}">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{731.6612027096114, 402.6910467791411}">
</property>
<property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:204:1">
</property>
+ <property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="true">
+ </property>
<port name="trigger" class="ptolemy.actor.TypedIOPort">
<property name="input"/>
<property name="multiport"/>
- <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="true">
+ <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="false">
</property>
</port>
</entity>
- <entity name="String Constant4" class="ptolemy.actor.lib.StringConst">
+ <entity name="String Constant3" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value=" Dataset has been reduced and saved in ">
+ </property>
<property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
</property>
<property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
</property>
- <property name="value" class="ptolemy.data.expr.Parameter" value="$END_PRODUCTS_DIR">
- </property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
@@ -3696,7 +3974,7 @@
<property name="port:trigger" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that has no declared type (in other words, the port can accept any data type: double, int, array, etc.) If the port is connected, the actor will not fire until the trigger port receives an input token. Connecting the port is optional, but useful when scheduling the actor to perform at a certain time. </configure></property>
<property name="prop:firingCountLimit" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The limit on the number of times the actor will fire. The default value is 'NONE', meaning there is no limit on the number of time the constant will be provided to the output port. Any integer can be provided as a value for this parameter.</configure></property>
<property name="prop:value" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The value produced by the actor. Specified strings do not require enclosing quotes. (To include a '$' sign in the string, enter '$$'.)</configure></property>
-</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:17547:23:5">
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:17547:19:3">
</property>
<property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.lib.StringConst">
<property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1052:1">
@@ -3712,9 +3990,11 @@
<property name="displayWidth" class="ptolemy.data.expr.Parameter" value="60">
</property>
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="{265.0, 405.0}">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{266.6612027096115, 232.69104677914112}">
</property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:204:1">
+ <property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="true">
+ </property>
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:204:1:urn:lsid:kepler-project.org/ns/:13643:21:2">
</property>
<port name="trigger" class="ptolemy.actor.TypedIOPort">
<property name="input"/>
@@ -3723,71 +4003,114 @@
</property>
</port>
</entity>
- <entity name="String Constant5" class="ptolemy.actor.lib.StringConst">
- <property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
- </property>
- <property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
- </property>
- <property name="value" class="ptolemy.data.expr.Parameter" value="README">
+ <entity name="Final directory path" class="org.resurgence.actor.StringAccumulator">
+ <property name="Substring separator" class="ptolemy.data.expr.Parameter" value=""/"">
</property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
-<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Wibke Sudholt</configure></property>
<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
-<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>The StringConstant actor outputs a string specified via the actor's value parameter.</p>
<p>Specifying strings with the StringConstant actor is convenient, as the actor does not require that strings be surrounded by quotes. The actor is often used to specify file paths, which can be selected using the Browse button available in the actor's parameters.</p&g [...]
-<property name="port:output" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An output port that broadcasts a string constant specified by the value parameter. </configure></property>
-<property name="port:trigger" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that has no declared type (in other words, the port can accept any data type: double, int, array, etc.) If the port is connected, the actor will not fire until the trigger port receives an input token. Connecting the port is optional, but useful when scheduling the actor to perform at a certain time. </configure></property>
-<property name="prop:firingCountLimit" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The limit on the number of times the actor will fire. The default value is 'NONE', meaning there is no limit on the number of time the constant will be provided to the output port. Any integer can be provided as a value for this parameter.</configure></property>
-<property name="prop:value" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The value produced by the actor. Specified strings do not require enclosing quotes. (To include a '$' sign in the string, enter '$$'.)</configure></property>
-</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:15314:123:3">
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>
The StringAccumulator actor reads multiple strings via its input port and outputs a string containing all of the input values. The characters separating the substrings in the output string can be specified with the substringSeparator parameter.</p></configure></property>
+<property name="port:whole" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An output port that broadcasts the full string.</configure></property>
+<property name="port:parts" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that accepts substrings.</configure></property>
+<property name="prop:Substring separator" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The characters used to separate the elements in the output string. By default, the value is "".</configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:17547:25:2">
</property>
- <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.lib.StringConst">
- <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1052:1">
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="org.resurgence.actor.StringAccumulator">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1117:1">
</property>
</property>
<property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#StringFunctionActor">
</property>
- <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#Constant">
- </property>
- <property name="_icon" class="ptolemy.vergil.icon.BoxedValueIcon">
- <property name="attributeName" class="ptolemy.kernel.util.StringAttribute" value="value">
- </property>
- <property name="displayWidth" class="ptolemy.data.expr.Parameter" value="60">
- </property>
- </property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="{730.0, 535.0}">
+ <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#IterativeOperation">
</property>
- <property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="true">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{341.6612027096115, 352.6910467791411}">
</property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:204:1">
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:292:1">
</property>
- <port name="trigger" class="ptolemy.actor.TypedIOPort">
- <property name="input"/>
- <property name="multiport"/>
- <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="false">
- </property>
- </port>
</entity>
- <entity name="String Constant6" class="ptolemy.actor.lib.StringConst">
- <property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
+ <entity name="Write README" class="org.geon.FileWrite">
+ <property name="fileName" class="ptolemy.actor.parameters.FilePortParameter" value="/diskb/cgarcia/reflex_data//reflex_end_products/2013-09-24T10:31:32/README">
</property>
- <property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
+ <property name="append" class="ptolemy.data.expr.Parameter" value="true">
</property>
- <property name="value" class="ptolemy.data.expr.Parameter" value="$END_PRODUCTS_DIR">
+ <property name="confirmOverwrite" class="ptolemy.data.expr.Parameter" value="false">
+ </property>
+ <property name="alwaysFlush" class="ptolemy.data.expr.Parameter" value="false">
</property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
-<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>No author given</configure></property>
<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
-<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>The StringConstant actor outputs a string specified via the actor's value parameter.</p>
<p>Specifying strings with the StringConstant actor is convenient, as the actor does not require that strings be surrounded by quotes. The actor is often used to specify file paths, which can be selected using the Browse button available in the actor's parameters.</p&g [...]
-<property name="port:output" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An output port that broadcasts a string constant specified by the value parameter. </configure></property>
-<property name="port:trigger" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that has no declared type (in other words, the port can accept any data type: double, int, array, etc.) If the port is connected, the actor will not fire until the trigger port receives an input token. Connecting the port is optional, but useful when scheduling the actor to perform at a certain time. </configure></property>
-<property name="prop:firingCountLimit" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The limit on the number of times the actor will fire. The default value is 'NONE', meaning there is no limit on the number of time the constant will be provided to the output port. Any integer can be provided as a value for this parameter.</configure></property>
-<property name="prop:value" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The value produced by the actor. Specified strings do not require enclosing quotes. (To include a '$' sign in the string, enter '$$'.)</configure></property>
-</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:15314:121:3">
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>The FileWriter actor reads a string and writes it to a file. The actor outputs the file path of the generated file.</p>
<p>Specify a destination file path with the fileName parameter. If the specified file does not exist, then the actor will create it. If the file already exists, then the actor will ask for permission to overwrite it (unless the append param [...]
+<property name="port:input" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An input port that receives a string to write to a file.</configure></property>
+<property name="port:url" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An output port that broadcasts the file name of the generated file.</configure></property>
+<property name="prop:append" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Specify whether to append the input string to an existing, specified file. By default, the actor will overwrite any preexisting file.</configure></property>
+<property name="prop:confirmOverwrite" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Specify whether the actor should confirm before overwriting an existing file. By default, the actor will not ask for confirmation.</configure></property>
+<property name="prop:fileName" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The name of the file to which to write. See FileParameter for more information about specifying file names. </configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:43955:73:1">
</property>
- <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.lib.StringConst">
- <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1052:1">
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="org.geon.FileWrite">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1003:1">
+ </property>
+ </property>
+ <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#WriterOutputActor">
+ </property>
+ <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#LocalOutput">
+ </property>
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{766.6612027096114, 557.6910467791411}">
+ </property>
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:144:1:urn:lsid:kepler-project.org/ns/:15314:118:5">
+ </property>
+ <property name="" class="ptolemy.vergil.basic.DocAttribute">
+ <property name="description" class="ptolemy.kernel.util.StringAttribute" value="<p>The FileWriter actor reads a string and writes it to a file. The actor outputs the file path of the generated file.</p>
<p>Specify a destination file path with the fileName parameter. If the specified file does not exist, then the actor will create it. If the file already exists, then the actor will ask for permission to overwrite it (unless the append parameter [...]
+ </property>
+ <property name="author" class="ptolemy.kernel.util.StringAttribute" value="No author given">
+ </property>
+ <property name="version" class="ptolemy.kernel.util.StringAttribute" value="null">
+ </property>
+ <property name="append (parameter)" class="ptolemy.data.expr.StringParameter" value="Specify whether to append the input string to an existing, specified file. By default, the actor will overwrite any preexisting file.">
+ </property>
+ <property name="confirmOverwrite (parameter)" class="ptolemy.data.expr.StringParameter" value="Specify whether the actor should confirm before overwriting an existing file. By default, the actor will not ask for confirmation.">
+ </property>
+ <property name="input (port)" class="ptolemy.kernel.util.StringAttribute" value="An input port that receives a string to write to a file.">
+ </property>
+ <property name="url (port)" class="ptolemy.kernel.util.StringAttribute" value="An output port that broadcasts the file name of the generated file.">
+ </property>
+ <property name="fileName (parameter)" class="ptolemy.data.expr.StringParameter" value="The name of the file to which to write. See FileParameter for more information about specifying file names. ">
+ </property>
+ </property>
+ <port name="fileName" class="ptolemy.actor.parameters.ParameterPort">
+ <property name="input"/>
+ <property name="_cardinal" class="ptolemy.kernel.util.StringAttribute" value="NORTH">
+ </property>
+ </port>
+ <port name="url" class="ptolemy.actor.TypedIOPort">
+ <property name="output"/>
+ <property name="_hide" class="ptolemy.data.expr.SingletonParameter" value="true">
+ </property>
+ </port>
+ </entity>
+ <entity name="String Constant4" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value="$END_PRODUCTS_SUBDIR">
+ </property>
+ <property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
+ </property>
+ <property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
+ </property>
+<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
+<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
+<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>The StringConstant actor outputs a string specified via the actor's value parameter.</p>
<p>Specifying strings with the StringConstant actor is convenient, as the actor does not require that strings be surrounded by quotes. The actor is often used to specify file paths, which can be selected using the Browse button available in the actor's parameters.</p&g [...]
+<property name="port:output" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An output port that broadcasts a string constant specified by the value parameter. </configure></property>
+<property name="port:trigger" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that has no declared type (in other words, the port can accept any data type: double, int, array, etc.) If the port is connected, the actor will not fire until the trigger port receives an input token. Connecting the port is optional, but useful when scheduling the actor to perform at a certain time. </configure></property>
+<property name="prop:firingCountLimit" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The limit on the number of times the actor will fire. The default value is 'NONE', meaning there is no limit on the number of time the constant will be provided to the output port. Any integer can be provided as a value for this parameter.</configure></property>
+<property name="prop:value" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The value produced by the actor. Specified strings do not require enclosing quotes. (To include a '$' sign in the string, enter '$$'.)</configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:17547:23:2">
+ </property>
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.lib.StringConst">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1052:1">
</property>
</property>
<property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#StringFunctionActor">
@@ -3800,49 +4123,59 @@
<property name="displayWidth" class="ptolemy.data.expr.Parameter" value="60">
</property>
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="{725.0, 435.0}">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{231.66120270961147, 402.6910467791411}">
</property>
<property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:204:1">
</property>
- <property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="true">
- </property>
<port name="trigger" class="ptolemy.actor.TypedIOPort">
<property name="input"/>
<property name="multiport"/>
- <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="false">
+ <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="true">
</property>
</port>
</entity>
- <entity name="Path to README" class="org.resurgence.actor.StringAccumulator">
- <property name="Substring separator" class="ptolemy.data.expr.Parameter" value=""/"">
+ <entity name="String Constant5" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value="$GLOBAL_TIMESTAMP">
+ </property>
+ <property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
+ </property>
+ <property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
</property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
-<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Wibke Sudholt</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
-<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>
The StringAccumulator actor reads multiple strings via its input port and outputs a string containing all of the input values. The characters separating the substrings in the output string can be specified with the substringSeparator parameter.</p></configure></property>
-<property name="port:whole" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An output port that broadcasts the full string.</configure></property>
-<property name="port:parts" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that accepts substrings.</configure></property>
-<property name="prop:Substring separator" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The characters used to separate the elements in the output string. By default, the value is "".</configure></property>
-</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:15314:124:4">
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>The StringConstant actor outputs a string specified via the actor's value parameter.</p>
<p>Specifying strings with the StringConstant actor is convenient, as the actor does not require that strings be surrounded by quotes. The actor is often used to specify file paths, which can be selected using the Browse button available in the actor's parameters.</p&g [...]
+<property name="port:output" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An output port that broadcasts a string constant specified by the value parameter. </configure></property>
+<property name="port:trigger" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that has no declared type (in other words, the port can accept any data type: double, int, array, etc.) If the port is connected, the actor will not fire until the trigger port receives an input token. Connecting the port is optional, but useful when scheduling the actor to perform at a certain time. </configure></property>
+<property name="prop:firingCountLimit" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The limit on the number of times the actor will fire. The default value is 'NONE', meaning there is no limit on the number of time the constant will be provided to the output port. Any integer can be provided as a value for this parameter.</configure></property>
+<property name="prop:value" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The value produced by the actor. Specified strings do not require enclosing quotes. (To include a '$' sign in the string, enter '$$'.)</configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:15314:122:3">
</property>
- <property name="class" class="ptolemy.kernel.util.StringAttribute" value="org.resurgence.actor.StringAccumulator">
- <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1117:1">
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.lib.StringConst">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1052:1">
</property>
</property>
<property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#StringFunctionActor">
</property>
- <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#IterativeOperation">
+ <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#Constant">
+ </property>
+ <property name="_icon" class="ptolemy.vergil.icon.BoxedValueIcon">
+ <property name="attributeName" class="ptolemy.kernel.util.StringAttribute" value="value">
+ </property>
+ <property name="displayWidth" class="ptolemy.data.expr.Parameter" value="60">
+ </property>
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="{870.0, 485.0}">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{741.6612027096114, 442.6910467791411}">
</property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:292:1">
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:204:1">
</property>
- <property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="false">
+ <property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="true">
</property>
- <port name="whole" class="ptolemy.actor.TypedIOPort">
- <property name="output"/>
- <property name="_cardinal" class="ptolemy.kernel.util.StringAttribute" value="NORTH">
+ <port name="trigger" class="ptolemy.actor.TypedIOPort">
+ <property name="input"/>
+ <property name="multiport"/>
+ <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="false">
</property>
</port>
</entity>
@@ -3875,136 +4208,289 @@
</property>
<property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#LocalOutput">
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="{840.0, 255.0}">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{846.6612027096114, 242.69104677914112}">
</property>
<property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:144:1:urn:lsid:kepler-project.org/ns/:15165:55:3">
</property>
</entity>
- <entity name="Display Current Dataset" class="ptolemy.actor.lib.gui.Display">
- <property name="_windowProperties" class="ptolemy.actor.gui.WindowPropertiesAttribute" value="{bounds={33, 949, 1568, 223}, maximized=false}">
+ <entity name="String Constant6" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value="$END_PRODUCTS_DIR">
</property>
- <property name="_paneSize" class="ptolemy.actor.gui.SizeAttribute" value="[1562, 172]">
+ <property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
</property>
- <property name="rowsDisplayed" class="ptolemy.data.expr.Parameter" value="10">
+ <property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
</property>
- <property name="columnsDisplayed" class="ptolemy.data.expr.Parameter" value="120">
+<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
+<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
+<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>The StringConstant actor outputs a string specified via the actor's value parameter.</p>
<p>Specifying strings with the StringConstant actor is convenient, as the actor does not require that strings be surrounded by quotes. The actor is often used to specify file paths, which can be selected using the Browse button available in the actor's parameters.</p&g [...]
+<property name="port:output" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An output port that broadcasts a string constant specified by the value parameter. </configure></property>
+<property name="port:trigger" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that has no declared type (in other words, the port can accept any data type: double, int, array, etc.) If the port is connected, the actor will not fire until the trigger port receives an input token. Connecting the port is optional, but useful when scheduling the actor to perform at a certain time. </configure></property>
+<property name="prop:firingCountLimit" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The limit on the number of times the actor will fire. The default value is 'NONE', meaning there is no limit on the number of time the constant will be provided to the output port. Any integer can be provided as a value for this parameter.</configure></property>
+<property name="prop:value" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The value produced by the actor. Specified strings do not require enclosing quotes. (To include a '$' sign in the string, enter '$$'.)</configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:17547:23:5">
</property>
- <property name="suppressBlankLines" class="ptolemy.data.expr.Parameter" value="false">
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.lib.StringConst">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1052:1">
+ </property>
</property>
- <property name="title" class="ptolemy.data.expr.StringParameter" value="Current Dataset">
+ <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#StringFunctionActor">
+ </property>
+ <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#Constant">
+ </property>
+ <property name="_icon" class="ptolemy.vergil.icon.BoxedValueIcon">
+ <property name="attributeName" class="ptolemy.kernel.util.StringAttribute" value="value">
+ </property>
+ <property name="displayWidth" class="ptolemy.data.expr.Parameter" value="60">
+ </property>
+ </property>
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{236.66120270961147, 342.6910467791411}">
+ </property>
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:204:1">
+ </property>
+ <port name="trigger" class="ptolemy.actor.TypedIOPort">
+ <property name="input"/>
+ <property name="multiport"/>
+ <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="true">
+ </property>
+ </port>
+ </entity>
+ <entity name="Path to README" class="org.resurgence.actor.StringAccumulator">
+ <property name="Substring separator" class="ptolemy.data.expr.Parameter" value=""/"">
</property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
-<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Yuhong Xiong, Edward A. Lee</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Wibke Sudholt</configure></property>
<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
-<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>The Display actor reads tokens of any type via its input multiport, and displays each token on a separate line in a text display window.</p>
<p>Specify the size of the text display window with the rowsDisplayed and columnsDisplayed parameters. Simply resizing the window onscreen does not persistently change the size when the workflow is saved, closed, and the [...]
-<property name="port:input" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that accepts tokens of any type.</configure></property>
-<property name="prop:suppressBlankLines" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Specify whether the actor should display blank lines (the default) or suppress them.</configure></property>
-<property name="prop:rowsDisplayed" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The vertical size of the display, in rows. The value is an integer that defaults to 10.</configure></property>
-<property name="prop:columnsDisplayed" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The horizontal size of the display, in columns. The value is an integer that defaults to 40.</configure></property>
-<property name="prop:title" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The title of the text display window. If specified, the value will appear in the title bar of the text display window.</configure></property>
-</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:17547:3:12">
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>
The StringAccumulator actor reads multiple strings via its input port and outputs a string containing all of the input values. The characters separating the substrings in the output string can be specified with the substringSeparator parameter.</p></configure></property>
+<property name="port:whole" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An output port that broadcasts the full string.</configure></property>
+<property name="port:parts" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that accepts substrings.</configure></property>
+<property name="prop:Substring separator" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The characters used to separate the elements in the output string. By default, the value is "".</configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:43955:72:1">
</property>
- <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.lib.gui.Display">
- <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:883:1">
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="org.resurgence.actor.StringAccumulator">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1117:1">
</property>
</property>
- <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#TextualOutputActor">
+ <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#StringFunctionActor">
</property>
- <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#TextualOutput">
+ <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#IterativeOperation">
+ </property>
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{876.6612027096114, 427.6910467791411}">
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="{795.0, 170.0}">
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:292:1:urn:lsid:kepler-project.org/ns/:15314:124:4">
+ </property>
+ <property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="false">
+ </property>
+ <port name="whole" class="ptolemy.actor.TypedIOPort">
+ <property name="output"/>
+ <property name="_cardinal" class="ptolemy.kernel.util.StringAttribute" value="SOUTH">
+ </property>
+ </port>
+ </entity>
+ <entity name="Final message" class="org.resurgence.actor.StringAccumulator">
+ <property name="Substring separator" class="ptolemy.data.expr.Parameter" value="""">
+ </property>
+<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
+<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Wibke Sudholt</configure></property>
+<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>
The StringAccumulator actor reads multiple strings via its input port and outputs a string containing all of the input values. The characters separating the substrings in the output string can be specified with the substringSeparator parameter.</p></configure></property>
+<property name="port:whole" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An output port that broadcasts the full string.</configure></property>
+<property name="port:parts" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that accepts substrings.</configure></property>
+<property name="prop:Substring separator" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The characters used to separate the elements in the output string. By default, the value is "".</configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:17547:26:1">
+ </property>
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="org.resurgence.actor.StringAccumulator">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1117:1">
+ </property>
+ </property>
+ <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#StringFunctionActor">
+ </property>
+ <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#IterativeOperation">
</property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:7:1:urn:lsid:kepler-project.org/ns/:13643:22:2">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{476.6612027096115, 312.6910467791411}">
</property>
<property name="" class="ptolemy.vergil.basic.DocAttribute">
- <property name="description" class="ptolemy.kernel.util.StringAttribute" value="<p>The Display actor reads tokens of any type via its input multiport, and displays each token on a separate line in a text display window.</p>
<p>Specify the size of the text display window with the rowsDisplayed and columnsDisplayed parameters. Simply resizing the window onscreen does not persistently change the size when the workflow is saved, closed, and then re- [...]
+ <property name="description" class="ptolemy.kernel.util.StringAttribute" value="<p>
The StringAccumulator actor reads multiple strings via its input port and outputs a string containing all of the input values. The characters separating the substrings in the output string can be specified with the substringSeparator parameter.</p>">
</property>
- <property name="author" class="ptolemy.kernel.util.StringAttribute" value="Yuhong Xiong, Edward A. Lee">
+ <property name="author" class="ptolemy.kernel.util.StringAttribute" value="Wibke Sudholt">
</property>
<property name="version" class="ptolemy.kernel.util.StringAttribute" value="null">
</property>
- <property name="rowsDisplayed (parameter)" class="ptolemy.data.expr.StringParameter" value="The vertical size of the display, in rows. The value is an integer that defaults to 10.">
+ <property name="Substring separator (parameter)" class="ptolemy.data.expr.StringParameter" value="The characters used to separate the elements in the output string. By default, the value is "".">
</property>
- <property name="columnsDisplayed (parameter)" class="ptolemy.data.expr.StringParameter" value="The horizontal size of the display, in columns. The value is an integer that defaults to 40.">
+ <property name="parts (port)" class="ptolemy.kernel.util.StringAttribute" value="A multiport that accepts substrings.">
</property>
- <property name="suppressBlankLines (parameter)" class="ptolemy.data.expr.StringParameter" value="Specify whether the actor should display blank lines (the default) or suppress them.">
+ <property name="whole (port)" class="ptolemy.kernel.util.StringAttribute" value="An output port that broadcasts the full string.">
</property>
- <property name="title (parameter)" class="ptolemy.data.expr.StringParameter" value="The title of the text display window. If specified, the value will appear in the title bar of the text display window.">
+ </property>
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:292:1">
+ </property>
+ </entity>
+ <entity name="String Constant7" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value=" with files: ">
+ </property>
+ <property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
+ </property>
+ <property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
+ </property>
+<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
+<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
+<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>The StringConstant actor outputs a string specified via the actor's value parameter.</p>
<p>Specifying strings with the StringConstant actor is convenient, as the actor does not require that strings be surrounded by quotes. The actor is often used to specify file paths, which can be selected using the Browse button available in the actor's parameters.</p&g [...]
+<property name="port:output" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An output port that broadcasts a string constant specified by the value parameter. </configure></property>
+<property name="port:trigger" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that has no declared type (in other words, the port can accept any data type: double, int, array, etc.) If the port is connected, the actor will not fire until the trigger port receives an input token. Connecting the port is optional, but useful when scheduling the actor to perform at a certain time. </configure></property>
+<property name="prop:firingCountLimit" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The limit on the number of times the actor will fire. The default value is 'NONE', meaning there is no limit on the number of time the constant will be provided to the output port. Any integer can be provided as a value for this parameter.</configure></property>
+<property name="prop:value" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The value produced by the actor. Specified strings do not require enclosing quotes. (To include a '$' sign in the string, enter '$$'.)</configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:43955:68:1">
+ </property>
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.lib.StringConst">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1052:1">
</property>
- <property name="input (port)" class="ptolemy.kernel.util.StringAttribute" value="A multiport that accepts tokens of any type.">
+ </property>
+ <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#StringFunctionActor">
+ </property>
+ <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#Constant">
+ </property>
+ <property name="_icon" class="ptolemy.vergil.icon.BoxedValueIcon">
+ <property name="attributeName" class="ptolemy.kernel.util.StringAttribute" value="value">
+ </property>
+ <property name="displayWidth" class="ptolemy.data.expr.Parameter" value="60">
</property>
</property>
- </entity>
- <entity name="Write README" class="org.geon.FileWrite">
- <property name="fileName" class="ptolemy.actor.parameters.FilePortParameter" value="System.out">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{231.66120270961147, 442.6910467791411}">
</property>
- <property name="append" class="ptolemy.data.expr.Parameter" value="true">
+ <property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="true">
</property>
- <property name="confirmOverwrite" class="ptolemy.data.expr.Parameter" value="false">
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:204:1:urn:lsid:kepler-project.org/ns/:13643:21:2:urn:lsid:kepler-project.org/ns/:17547:19:3">
</property>
- <property name="alwaysFlush" class="ptolemy.data.expr.Parameter" value="false">
+ <port name="trigger" class="ptolemy.actor.TypedIOPort">
+ <property name="input"/>
+ <property name="multiport"/>
+ <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="true">
+ </property>
+ </port>
+ </entity>
+ <entity name="README message" class="org.resurgence.actor.StringAccumulator">
+ <property name="Substring separator" class="ptolemy.data.expr.Parameter" value="""">
</property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
-<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>No author given</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Wibke Sudholt</configure></property>
<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
-<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>The FileWriter actor reads a string and writes it to a file. The actor outputs the file path of the generated file.</p>
<p>Specify a destination file path with the fileName parameter. If the specified file does not exist, then the actor will create it. If the file already exists, then the actor will ask for permission to overwrite it (unless the append param [...]
-<property name="port:input" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An input port that receives a string to write to a file.</configure></property>
-<property name="port:url" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An output port that broadcasts the file name of the generated file.</configure></property>
-<property name="prop:append" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Specify whether to append the input string to an existing, specified file. By default, the actor will overwrite any preexisting file.</configure></property>
-<property name="prop:confirmOverwrite" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Specify whether the actor should confirm before overwriting an existing file. By default, the actor will not ask for confirmation.</configure></property>
-<property name="prop:fileName" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The name of the file to which to write. See FileParameter for more information about specifying file names. </configure></property>
-</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:15314:118:5">
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>
The StringAccumulator actor reads multiple strings via its input port and outputs a string containing all of the input values. The characters separating the substrings in the output string can be specified with the substringSeparator parameter.</p></configure></property>
+<property name="port:whole" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An output port that broadcasts the full string.</configure></property>
+<property name="port:parts" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that accepts substrings.</configure></property>
+<property name="prop:Substring separator" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The characters used to separate the elements in the output string. By default, the value is "".</configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:43955:69:4">
</property>
- <property name="class" class="ptolemy.kernel.util.StringAttribute" value="org.geon.FileWrite">
- <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1003:1">
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="org.resurgence.actor.StringAccumulator">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1117:1">
</property>
</property>
- <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#WriterOutputActor">
+ <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#StringFunctionActor">
+ </property>
+ <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#IterativeOperation">
+ </property>
+ <property name="_location" class="ptolemy.kernel.util.Location" value="{451.6612027096115, 462.6910467791411}">
+ </property>
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:292:1:urn:lsid:kepler-project.org/ns/:17547:25:2">
+ </property>
+ </entity>
+ <entity name="ObjectToText" class="org.eso.ObjectToText">
+ <property name="Include Header and Footer" class="ptolemy.data.expr.Parameter" value="true">
+ </property>
+<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
+<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Converts Reflex JSON objects into a human-readable form</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>ESO</configure></property>
+<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>2.0</configure></property>
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The ObjectToString converts the JSON objects used by ESO actors (i.e. datasets, sof and sop) into a human-readable form.</configure></property>
+<property name="port:text out" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A nicely formatted string</configure></property>
+<property name="port:json in" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The input JSON object</configure></property>
+<property name="prop:semanticType41" class="ptolemy.kernel.util.ConfigurableAttribute"><configure></configure></property>
+<property name="prop:Include Header and Footer" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>if true the output text will contain a descriptive header and footer</configure></property>
+<property name="prop:entityId" class="ptolemy.kernel.util.ConfigurableAttribute"><configure></configure></property>
+<property name="prop:class" class="ptolemy.kernel.util.ConfigurableAttribute"><configure></configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org:actor:907:1">
+ </property>
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="org.eso.ObjectToText">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="null">
+ </property>
+ </property>
+ <property name="semanticType41" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:4:1#ESO">
+ </property>
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[250.0, 500.0]">
+ </property>
+ <port name="json in" class="ptolemy.actor.TypedIOPort">
+ <property name="input"/>
+ <property name="_showName" class="ptolemy.data.expr.Parameter" value="true">
+ </property>
+ <property name="tokenConsumptionRate" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
+ </port>
+ <port name="text out" class="ptolemy.actor.TypedIOPort">
+ <property name="output"/>
+ <property name="_showName" class="ptolemy.data.expr.Parameter" value="true">
+ </property>
+ <property name="tokenProductionRate" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
+ </port>
+ </entity>
+ <entity name="String Constant8" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value="$BOOKKEEPING_DIR/bookkeeping.db">
+ </property>
+ <property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
+ </property>
+ <property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
+ </property>
+<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
+<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
+<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>The StringConstant actor outputs a string specified via the actor's value parameter.</p>
<p>Specifying strings with the StringConstant actor is convenient, as the actor does not require that strings be surrounded by quotes. The actor is often used to specify file paths, which can be selected using the Browse button available in the actor's parameters.</p&g [...]
+<property name="port:output" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>An output port that broadcasts a string constant specified by the value parameter. </configure></property>
+<property name="port:trigger" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that has no declared type (in other words, the port can accept any data type: double, int, array, etc.) If the port is connected, the actor will not fire until the trigger port receives an input token. Connecting the port is optional, but useful when scheduling the actor to perform at a certain time. </configure></property>
+<property name="prop:firingCountLimit" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The limit on the number of times the actor will fire. The default value is 'NONE', meaning there is no limit on the number of time the constant will be provided to the output port. Any integer can be provided as a value for this parameter.</configure></property>
+<property name="prop:value" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The value produced by the actor. Specified strings do not require enclosing quotes. (To include a '$' sign in the string, enter '$$'.)</configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:44576:8:1">
</property>
- <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#LocalOutput">
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.lib.StringConst">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1052:1">
+ </property>
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="{880.0, 380.0}">
+ <property name="semanticType00" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:1:1#StringFunctionActor">
</property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:144:1">
+ <property name="semanticType11" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:2:1#Constant">
</property>
- <property name="" class="ptolemy.vergil.basic.DocAttribute">
- <property name="description" class="ptolemy.kernel.util.StringAttribute" value="<p>The FileWriter actor reads a string and writes it to a file. The actor outputs the file path of the generated file.</p>
<p>Specify a destination file path with the fileName parameter. If the specified file does not exist, then the actor will create it. If the file already exists, then the actor will ask for permission to overwrite it (unless the append parameter [...]
- </property>
- <property name="author" class="ptolemy.kernel.util.StringAttribute" value="No author given">
- </property>
- <property name="version" class="ptolemy.kernel.util.StringAttribute" value="null">
- </property>
- <property name="append (parameter)" class="ptolemy.data.expr.StringParameter" value="Specify whether to append the input string to an existing, specified file. By default, the actor will overwrite any preexisting file.">
- </property>
- <property name="confirmOverwrite (parameter)" class="ptolemy.data.expr.StringParameter" value="Specify whether the actor should confirm before overwriting an existing file. By default, the actor will not ask for confirmation.">
- </property>
- <property name="input (port)" class="ptolemy.kernel.util.StringAttribute" value="An input port that receives a string to write to a file.">
- </property>
- <property name="url (port)" class="ptolemy.kernel.util.StringAttribute" value="An output port that broadcasts the file name of the generated file.">
+ <property name="_icon" class="ptolemy.vergil.icon.BoxedValueIcon">
+ <property name="attributeName" class="ptolemy.kernel.util.StringAttribute" value="value">
</property>
- <property name="fileName (parameter)" class="ptolemy.data.expr.StringParameter" value="The name of the file to which to write. See FileParameter for more information about specifying file names. ">
+ <property name="displayWidth" class="ptolemy.data.expr.Parameter" value="60">
</property>
</property>
- <port name="fileName" class="ptolemy.actor.parameters.ParameterPort">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[285.0, 575.0]">
+ </property>
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:204:1:urn:lsid:kepler-project.org/ns/:17547:23:2:urn:lsid:kepler-project.org/ns/:38241:62:1">
+ </property>
+ <property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="true">
+ </property>
+ <port name="trigger" class="ptolemy.actor.TypedIOPort">
<property name="input"/>
- <property name="_cardinal" class="ptolemy.kernel.util.StringAttribute" value="SOUTH">
- </property>
- </port>
- <port name="url" class="ptolemy.actor.TypedIOPort">
- <property name="output"/>
- <property name="_hide" class="ptolemy.data.expr.SingletonParameter" value="true">
+ <property name="multiport"/>
+ <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="true">
</property>
</port>
</entity>
- <entity name="String Constant7" class="ptolemy.actor.lib.StringConst">
+ <entity name="String Constant9" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value="$GLOBAL_TIMESTAMP">
+ </property>
<property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
</property>
<property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
</property>
- <property name="value" class="ptolemy.data.expr.Parameter" value="$GLOBAL_TIMESTAMP">
- </property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
@@ -4014,7 +4500,7 @@
<property name="port:trigger" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>A multiport that has no declared type (in other words, the port can accept any data type: double, int, array, etc.) If the port is connected, the actor will not fire until the trigger port receives an input token. Connecting the port is optional, but useful when scheduling the actor to perform at a certain time. </configure></property>
<property name="prop:firingCountLimit" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The limit on the number of times the actor will fire. The default value is 'NONE', meaning there is no limit on the number of time the constant will be provided to the output port. Any integer can be provided as a value for this parameter.</configure></property>
<property name="prop:value" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The value produced by the actor. Specified strings do not require enclosing quotes. (To include a '$' sign in the string, enter '$$'.)</configure></property>
-</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:15314:122:3">
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:44576:9:1">
</property>
<property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.lib.StringConst">
<property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:1052:1">
@@ -4030,34 +4516,52 @@
<property name="displayWidth" class="ptolemy.data.expr.Parameter" value="60">
</property>
</property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="{720.0, 500.0}">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[240.0, 640.0]">
</property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:204:1">
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:204:1:urn:lsid:kepler-project.org/ns/:17547:23:2:urn:lsid:kepler-project.org/ns/:38241:63:1">
</property>
<property name="_hideName" class="ptolemy.data.expr.SingletonParameter" value="true">
</property>
<port name="trigger" class="ptolemy.actor.TypedIOPort">
<property name="input"/>
<property name="multiport"/>
- <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="false">
+ <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="true">
</property>
</port>
</entity>
+ <relation name="relation" class="ptolemy.actor.TypedIORelation">
+ <property name="width" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
+ <vertex name="vertex1" value="{576.6612027096114, 497.6910467791411}">
+ </vertex>
+ </relation>
<relation name="relation2" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
</property>
</relation>
+ <relation name="relation3" class="ptolemy.actor.TypedIORelation">
+ <property name="width" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
+ </relation>
+ <relation name="relation4" class="ptolemy.actor.TypedIORelation">
+ <property name="width" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
+ </relation>
+ <relation name="relation5" class="ptolemy.actor.TypedIORelation">
+ <property name="width" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
+ </relation>
+ <relation name="relation6" class="ptolemy.actor.TypedIORelation">
+ <property name="width" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
+ </relation>
<relation name="relation7" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
</property>
- <vertex name="vertex1" value="[570.0, 355.0]">
- </vertex>
</relation>
<relation name="relation8" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
</property>
- <vertex name="vertex1" value="[85.0, 405.0]">
- </vertex>
</relation>
<relation name="relation9" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
@@ -4066,6 +4570,8 @@
<relation name="relation10" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
</property>
+ <vertex name="vertex1" value="{101.66120270961146, 482.6910467791411}">
+ </vertex>
</relation>
<relation name="relation11" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
@@ -4074,6 +4580,8 @@
<relation name="relation12" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
</property>
+ <vertex name="vertex1" value="{571.6612027096114, 327.6910467791411}">
+ </vertex>
</relation>
<relation name="relation13" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
@@ -4091,91 +4599,49 @@
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
</property>
</relation>
- <link port="final_files2" relation="relation8"/>
- <link port="current_dataset" relation="relation16"/>
- <link port="String Constant2.output" relation="relation13"/>
- <link port="String Constant2.trigger" relation="relation8"/>
- <link port="Final directory path.parts" relation="relation2"/>
- <link port="Final directory path.parts" relation="relation9"/>
- <link port="Final directory path.whole" relation="relation15"/>
- <link port="Final message.parts" relation="relation16"/>
- <link port="Final message.parts" relation="relation13"/>
- <link port="Final message.parts" relation="relation15"/>
- <link port="Final message.whole" relation="relation7"/>
- <link port="String Constant3.output" relation="relation9"/>
- <link port="String Constant3.trigger" relation="relation8"/>
- <link port="String Constant4.output" relation="relation2"/>
- <link port="String Constant4.trigger" relation="relation8"/>
- <link port="String Constant5.output" relation="relation12"/>
- <link port="String Constant5.trigger" relation="relation7"/>
- <link port="String Constant6.output" relation="relation10"/>
- <link port="String Constant6.trigger" relation="relation7"/>
- <link port="Path to README.parts" relation="relation10"/>
- <link port="Path to README.parts" relation="relation11"/>
- <link port="Path to README.parts" relation="relation12"/>
- <link port="Path to README.whole" relation="relation14"/>
- <link port="Write to stdout.input" relation="relation7"/>
- <link port="Display Current Dataset.input" relation="relation7"/>
- <link port="Write README.input" relation="relation7"/>
- <link port="Write README.fileName" relation="relation14"/>
- <link port="String Constant7.output" relation="relation11"/>
- <link port="String Constant7.trigger" relation="relation7"/>
- </entity>
- <entity name="ProductRenamer" class="ptolemy.actor.lib.python.PythonScript">
- <property name="script" class="ptolemy.kernel.util.StringAttribute" value="import os
import shutil
from ptolemy.data import StringToken, IntToken
from ptolemy.data.expr import Parameter
from org.eso.util import JSONTools
from nom.tam.fits import Fits
from ptolemy.kernel.util import IllegalActionException
import org.apache.log4j
class Main :
"ProductRenamer"
def fire(self) :
#Get the logger
l [...]
- </property>
-<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
-<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Renames recipe products based on FITS keywords</configure></property>
-<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>ESO</configure></property>
-<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>2.0</configure></property>
-<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure> This actor moves (or copies or links) its input sof to a final product directory based on some FITS keywords.
Usually, it should be connected to the output of the recipes that produce final products. If the recipe produces more products that are not relevant to rename, an output filter can be put in the recipe.</configure></property>
-<property name="port:sof_out" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The final list of files produced</configure></property>
-<property name="port:sof_in" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The files to be copied/moved or linked</configure></property>
-<property name="prop:RenameKeywords" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The list of keywords used to create the new name</configure></property>
-<property name="prop:OutputExistsMode" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>This parameter defines the behaviour in case the output files already exists: it can be "append_version" (create a new file with a running index suffix), "overwrite" (replace the existing file), "stop" (stop the workflow)</configure></property>
-<property name="prop:script" class="ptolemy.kernel.util.ConfigurableAttribute"><configure></configure></property>
-<property name="prop:FinalProductDirectory" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The directory where the files are going to be copied/linked or renamed. It is usually set to END_PRODUCTS_DIR</configure></property>
-<property name="prop:SubDir" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>If it is not empty, a subdirectory will be created with this string. The value can contain backslashes (and intermediate directories will be created). It will usually be END_PROD_SUBDIR, created somewhere in the workflow</configure></property>
-<property name="prop:CopyMode" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>There are several options: "copy", "move" or "link".</configure></property>
-</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:37190:13:1">
- </property>
- <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.lib.python.PythonScript">
- <property name="id" class="ptolemy.kernel.util.StringAttribute" value="null">
- </property>
- </property>
- <property name="semanticType41" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:4:1#ESO">
- </property>
- <property name="_editorFactory" class="ptolemy.vergil.toolbox.TextEditorConfigureFactory">
- <property name="attributeName" class="ptolemy.kernel.util.StringAttribute" value="script">
- </property>
- </property>
- <property name="_location" class="ptolemy.kernel.util.Location" value="[1470.0, 867.25]">
- </property>
- <property name="RenameKeywords" class="ptolemy.data.expr.StringParameter" value="HIERARCH.ESO.OBS.NAME,'_',HIERARCH.ESO.PRO.CATG">
- </property>
- <property name="FinalProductDirectory" class="ptolemy.data.expr.StringParameter" value="$END_PRODUCTS_DIR">
- </property>
- <property name="SubDir" class="ptolemy.data.expr.StringParameter" value="$END_PRODUCT_SUBDIR">
- </property>
- <property name="CopyMode" class="ptolemy.data.expr.StringParameter" value="copy">
- </property>
- <property name="OutputExistsMode" class="ptolemy.data.expr.StringParameter" value="append_version">
- </property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:910:1:urn:lsid:kepler-project.org/ns/:25158:120:4:urn:lsid:kepler-project.org/ns/:31989:44:2">
- </property>
- <port name="sof_in" class="ptolemy.actor.TypedIOPort">
- <property name="input"/>
- <property name="tokenConsumptionRate" class="ptolemy.data.expr.Parameter" value="1">
- </property>
- <property name="_cardinal" class="ptolemy.kernel.util.StringAttribute" value="NORTH">
- </property>
- </port>
- <port name="sof_out" class="ptolemy.actor.TypedIOPort">
- <property name="output"/>
- <property name="multiport"/>
- <property name="_cardinal" class="ptolemy.kernel.util.StringAttribute" value="SOUTH">
- </property>
- </port>
+ <link port="current_dataset" relation="relation7"/>
+ <link port="final_files" relation="relation10"/>
+ <link port="bookkeeping_db" relation="relation15"/>
+ <link port="global_timestamp" relation="relation16"/>
+ <link port="String Constant.output" relation="relation9"/>
+ <link port="String Constant.trigger" relation="relation"/>
+ <link port="Finished Datasets.input" relation="relation12"/>
+ <link port="String Constant2.output" relation="relation2"/>
+ <link port="String Constant2.trigger" relation="relation"/>
+ <link port="String Constant3.output" relation="relation11"/>
+ <link port="String Constant3.trigger" relation="relation10"/>
+ <link port="Final directory path.parts" relation="relation5"/>
+ <link port="Final directory path.parts" relation="relation3"/>
+ <link port="Final directory path.whole" relation="relation4"/>
+ <link port="Write README.input" relation="relation"/>
+ <link port="Write README.fileName" relation="relation6"/>
+ <link port="String Constant4.output" relation="relation3"/>
+ <link port="String Constant4.trigger" relation="relation10"/>
+ <link port="String Constant5.output" relation="relation8"/>
+ <link port="String Constant5.trigger" relation="relation"/>
+ <link port="Write to stdout.input" relation="relation12"/>
+ <link port="String Constant6.output" relation="relation5"/>
+ <link port="String Constant6.trigger" relation="relation10"/>
+ <link port="Path to README.parts" relation="relation2"/>
+ <link port="Path to README.parts" relation="relation8"/>
+ <link port="Path to README.parts" relation="relation9"/>
+ <link port="Path to README.whole" relation="relation6"/>
+ <link port="Final message.parts" relation="relation7"/>
+ <link port="Final message.parts" relation="relation11"/>
+ <link port="Final message.parts" relation="relation4"/>
+ <link port="Final message.whole" relation="relation12"/>
+ <link port="String Constant7.output" relation="relation13"/>
+ <link port="String Constant7.trigger" relation="relation10"/>
+ <link port="README message.parts" relation="relation12"/>
+ <link port="README message.parts" relation="relation13"/>
+ <link port="README message.parts" relation="relation14"/>
+ <link port="README message.whole" relation="relation"/>
+ <link port="ObjectToText.json in" relation="relation10"/>
+ <link port="ObjectToText.text out" relation="relation14"/>
+ <link port="String Constant8.output" relation="relation15"/>
+ <link port="String Constant8.trigger" relation="relation10"/>
+ <link port="String Constant9.output" relation="relation16"/>
+ <link port="String Constant9.trigger" relation="relation10"/>
</entity>
<entity name="SofCombiner" class="org.eso.SofCombiner">
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
@@ -4342,8 +4808,6 @@
</property>
</property>
<property name="DDF Director" class="ptolemy.domains.ddf.kernel.DDFDirector">
- <property name="timeResolution" class="ptolemy.actor.parameters.SharedParameter" value="1E-10">
- </property>
<property name="iterations" class="ptolemy.data.expr.Parameter" value="0">
</property>
<property name="maximumReceiverCapacity" class="ptolemy.data.expr.Parameter" value="0">
@@ -4501,12 +4965,12 @@
</property>
</port>
<entity name="String Constant" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value="$N_SELECTED_DATASETS :">
+ </property>
<property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
</property>
<property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
</property>
- <property name="value" class="ptolemy.data.expr.Parameter" value="$N_SELECTED_DATASETS :">
- </property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
@@ -4602,12 +5066,12 @@
</port>
</entity>
<entity name="String Constant2" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value="$GLOBAL_TIMESTAMP">
+ </property>
<property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
</property>
<property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
</property>
- <property name="value" class="ptolemy.data.expr.Parameter" value="$GLOBAL_TIMESTAMP">
- </property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
@@ -4671,7 +5135,7 @@
</port>
</entity>
<entity name="Directory Maker" class="org.resurgence.actor.DirectoryMaker">
- <property name="Directory name" class="ptolemy.actor.parameters.PortParameter" value="">
+ <property name="Directory name" class="ptolemy.actor.parameters.PortParameter" value="/diskb/cgarcia/reflex_data//reflex_end_products/2013-09-24T10:31:32/obsdata_tpl">
</property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
@@ -4760,12 +5224,12 @@
</port>
</entity>
<entity name="String Constant3" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value=" out of ">
+ </property>
<property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
</property>
<property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
</property>
- <property name="value" class="ptolemy.data.expr.Parameter" value=" out of ">
- </property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
@@ -4801,12 +5265,12 @@
</port>
</entity>
<entity name="String Constant4" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value="$END_PRODUCTS_DIR">
+ </property>
<property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
</property>
<property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
</property>
- <property name="value" class="ptolemy.data.expr.Parameter" value="$END_PRODUCTS_DIR">
- </property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
@@ -4846,7 +5310,7 @@
</port>
</entity>
<entity name="Variable Setter" class="ptolemy.actor.lib.SetVariable">
- <property name="variableName" class="ptolemy.kernel.util.StringAttribute" value="END_PRODUCT_SUBDIR">
+ <property name="variableName" class="ptolemy.kernel.util.StringAttribute" value="END_PRODUCTS_SUBDIR">
</property>
<property name="delayed" class="ptolemy.data.expr.Parameter" value="false">
</property>
@@ -4881,12 +5345,12 @@
</property>
</entity>
<entity name="String Constant5" class="ptolemy.actor.lib.StringConst">
+ <property name="value" class="ptolemy.data.expr.Parameter" value="Processing data set ">
+ </property>
<property name="firingCountLimit" class="ptolemy.data.expr.Parameter" value="NONE">
</property>
<property name="NONE" class="ptolemy.data.expr.Parameter" value="0">
</property>
- <property name="value" class="ptolemy.data.expr.Parameter" value="Processing data set ">
- </property>
<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>null</configure></property>
<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Edward Lee</configure></property>
@@ -4950,7 +5414,7 @@
</property>
</entity>
<entity name="Display" class="ptolemy.actor.lib.gui.Display">
- <property name="_windowProperties" class="ptolemy.actor.gui.WindowPropertiesAttribute" value="{bounds={1367, 140, 514, 397}, maximized=false}">
+ <property name="_windowProperties" class="ptolemy.actor.gui.WindowPropertiesAttribute" value="{bounds={1367, 140, 516, 395}, maximized=false}">
</property>
<property name="_paneSize" class="ptolemy.actor.gui.SizeAttribute" value="[508, 346]">
</property>
@@ -5073,7 +5537,7 @@
<entity name="Data Set Selection" class="ptolemy.actor.TypedCompositeActor">
<property name="_createdBy" class="ptolemy.kernel.attributes.VersionAttribute" value="8.1.devel">
</property>
- <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:31989:82:3">
+ <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:44497:14:2">
</property>
<property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.TypedCompositeActor">
<property name="id" class="ptolemy.kernel.util.StringAttribute" value="urn:lsid:kepler-project.org:class:449:1">
@@ -5092,11 +5556,9 @@
<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure><p>A Composite actor is an aggregation of actors. It may have a local director that is responsible for executing the contained actors. A Composite actor with a local director is called an opaque actor. Composite actors do not require a local director. Composite actors with no local director "inherit" the director from the containing workflow and are called non-opaque.</ [...]
</property> <property name="_location" class="ptolemy.kernel.util.Location" value="[95.0, 760.0]">
</property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:449:1">
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:449:1:urn:lsid:kepler-project.org/ns/:31989:82:3">
</property>
<property name="DDF Director" class="ptolemy.domains.ddf.kernel.DDFDirector">
- <property name="timeResolution" class="ptolemy.actor.parameters.SharedParameter" value="1E-10">
- </property>
<property name="iterations" class="ptolemy.data.expr.Parameter" value="0">
</property>
<property name="maximumReceiverCapacity" class="ptolemy.data.expr.Parameter" value="0">
@@ -5195,11 +5657,13 @@
</entity>
<entity name="DataSetChooser" class="org.eso.DataSetChooser">
<display name="Data Set Chooser"/>
- <property name="Mode" class="ptolemy.data.expr.StringParameter" value="Select">
+ <property name="Selection mode" class="ptolemy.data.expr.StringParameter" value="$DataSelectionMethod">
</property>
<property name="FITS Viewer" class="ptolemy.data.expr.StringParameter" value="$FITS_VIEWER">
</property>
- <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:31617:78:3">
+ <property name="Mode" class="ptolemy.data.expr.StringParameter" value="Select">
+ </property>
+ <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:44497:13:1">
</property>
<property name="class" class="ptolemy.kernel.util.StringAttribute" value="org.eso.DataSetChooser">
<property name="id" class="ptolemy.kernel.util.StringAttribute" value="null">
@@ -5212,10 +5676,10 @@
</property>
<property name="version" class="ptolemy.kernel.util.StringAttribute" value="1.0">
</property>
- <property name="Mode (parameter)" class="ptolemy.data.expr.StringParameter" value="<p>Skip: automatically select all files and don't show any window;</p><p>Display: select all the files and allow the user only to view them;</p><p>Select: standard mode.</p>">
- </property>
<property name="FITS Viewer (parameter)" class="ptolemy.data.expr.StringParameter" value="The application used to inspect FITS files">
</property>
+ <property name="Mode (parameter)" class="ptolemy.data.expr.StringParameter" value="<p>Skip: automatically select all files and don't show any window;</p><p>Display: select all the files and allow the user only to view them;</p><p>Select: standard mode.</p>">
+ </property>
<property name="class (parameter)" class="ptolemy.data.expr.StringParameter" value="">
</property>
<property name="semanticType41 (parameter)" class="ptolemy.data.expr.StringParameter" value="">
@@ -5231,7 +5695,7 @@
</property>
<property name="_location" class="ptolemy.kernel.util.Location" value="{75.0, 395.0}">
</property>
- <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:workflow:5:1:urn:lsid:kepler-project.org/ns/:12776:6:1:urn:lsid:kepler-project.org/ns/:13961:210:1">
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:workflow:5:1:urn:lsid:kepler-project.org/ns/:12776:6:1:urn:lsid:kepler-project.org/ns/:13961:210:1:urn:lsid:kepler-project.org/ns/:31617:78:3">
</property>
<port name="datasets in" class="ptolemy.actor.TypedIOPort">
<property name="input"/>
@@ -5327,28 +5791,116 @@
</property>
</port>
</entity>
- <relation name="relation" class="ptolemy.actor.TypedIORelation">
- <property name="width" class="ptolemy.data.expr.Parameter" value="1">
+ <entity name="ProvenanceExplorer" class="org.eso.ProvenanceExplorer">
+ <property name="Enabled" class="ptolemy.data.expr.StringParameter" value="true">
</property>
- </relation>
- <relation name="relation7" class="ptolemy.actor.TypedIORelation">
- <property name="width" class="ptolemy.data.expr.Parameter" value="1">
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[1560.0, 1085.0]">
</property>
- </relation>
- <relation name="relation2" class="ptolemy.actor.TypedIORelation">
+ <port name="bookkeeping db" class="ptolemy.actor.TypedIOPort">
+ <property name="input"/>
+ <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="false">
+ </property>
+ </port>
+ <port name="start date" class="ptolemy.actor.TypedIOPort">
+ <property name="input"/>
+ <property name="_showName" class="ptolemy.data.expr.SingletonParameter" value="false">
+ </property>
+ </port>
+ </entity>
+ <entity name="ProductRenamer" class="ptolemy.actor.lib.python.PythonScript">
+ <property name="jythonClassName" class="ptolemy.kernel.util.StringAttribute" value="Main">
+ </property>
+ <property name="script" class="ptolemy.kernel.util.StringAttribute" value="import os
import shutil
from ptolemy.data import StringToken, IntToken
from ptolemy.data.expr import Parameter
from org.eso.util import JSONTools
from nom.tam.fits import Fits
from nom.tam.fits import FitsFactory
from ptolemy.kernel.util import IllegalActionException
from org.eso.service import ExecutionServiceDB
import org.apache.log4j
from java.util import Has [...]
+ </property>
+<property name="KeplerDocumentation" class="ptolemy.vergil.basic.KeplerDocumentationAttribute">
+<property name="description" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>Renames recipe products based on FITS keywords</configure></property>
+<property name="author" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>ESO</configure></property>
+<property name="version" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>2.0</configure></property>
+<property name="userLevelDocumentation" class="ptolemy.kernel.util.ConfigurableAttribute"><configure> This actor moves (or copies or links) its input sof to a final product directory based on some FITS keywords.
Usually, it should be connected to the output of the recipes that produce final products. If the recipe produces more products that are not relevant to rename, an output filter can be put in the recipe.</configure></property>
+<property name="port:sof_out" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The final list of files produced</configure></property>
+<property name="port:sof_in" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The files to be copied/moved or linked</configure></property>
+<property name="prop:RenameKeywords" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The list of keywords used to create the new name</configure></property>
+<property name="prop:OutputExistsMode" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>This parameter defines the behaviour in case the output files already exists: it can be "append_version" (create a new file with a running index suffix), "overwrite" (replace the existing file), "stop" (stop the workflow)</configure></property>
+<property name="prop:script" class="ptolemy.kernel.util.ConfigurableAttribute"><configure></configure></property>
+<property name="prop:FinalProductDirectory" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>The directory where the files are going to be copied/linked or renamed. It is usually set to END_PRODUCTS_DIR</configure></property>
+<property name="prop:SubDir" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>If it is not empty, a subdirectory will be created with this string. The value can contain backslashes (and intermediate directories will be created). It will usually be END_PROD_SUBDIR, created somewhere in the workflow</configure></property>
+<property name="prop:CopyMode" class="ptolemy.kernel.util.ConfigurableAttribute"><configure>There are several options: "copy", "move" or "link".</configure></property>
+</property> <property name="entityId" class="org.kepler.moml.NamedObjId" value="urn:lsid:kepler-project.org/ns/:44576:59:2">
+ </property>
+ <property name="class" class="ptolemy.kernel.util.StringAttribute" value="ptolemy.actor.lib.python.PythonScript">
+ <property name="id" class="ptolemy.kernel.util.StringAttribute" value="null">
+ </property>
+ </property>
+ <property name="semanticType41" class="org.kepler.sms.SemanticType" value="urn:lsid:localhost:onto:4:1#ESO">
+ </property>
+ <property name="_editorFactory" class="ptolemy.vergil.toolbox.TextEditorConfigureFactory">
+ <property name="attributeName" class="ptolemy.kernel.util.StringAttribute" value="script">
+ </property>
+ </property>
+ <property name="_location" class="ptolemy.kernel.util.Location" value="[1455.0, 675.0]">
+ </property>
+ <property name="RenameKeywords" class="ptolemy.data.expr.StringParameter" value="HIERARCH.ESO.OBS.NAME,'_',HIERARCH.ESO.PRO.CATG">
+ </property>
+ <property name="FinalProductDirectory" class="ptolemy.data.expr.StringParameter" value="$END_PRODUCTS_DIR">
+ </property>
+ <property name="SubDir" class="ptolemy.data.expr.StringParameter" value="$END_PRODUCTS_SUBDIR">
+ </property>
+ <property name="CopyMode" class="ptolemy.data.expr.StringParameter" value="copy">
+ </property>
+ <property name="OutputExistsMode" class="ptolemy.data.expr.StringParameter" value="append_version">
+ </property>
+ <property name="derivedFrom" class="org.kepler.moml.NamedObjIdReferralList" value="urn:lsid:kepler-project.org:actor:910:1:urn:lsid:kepler-project.org/ns/:24723:4:5:urn:lsid:kepler-project.org/ns/:25047:16:2:urn:lsid:kepler-project.org/ns/:25158:50:1:urn:lsid:kepler-project.org/ns/:38241:57:8">
+ </property>
+ <property name="" class="ptolemy.vergil.basic.DocAttribute">
+ <property name="description" class="ptolemy.kernel.util.StringAttribute" value=" This actor moves (or copies or links) its input sof to a final product directory based on some FITS keywords.
Usually, it should be connected to the output of the recipes that produce final products. If the recipe produces more products that are not relevant to rename, an output filter can be put in the recipe.">
+ </property>
+ <property name="author" class="ptolemy.kernel.util.StringAttribute" value="ESO">
+ </property>
+ <property name="version" class="ptolemy.kernel.util.StringAttribute" value="2.0">
+ </property>
+ <property name="RenameKeywords (parameter)" class="ptolemy.data.expr.StringParameter" value="The list of keywords used to create the new name">
+ </property>
+ <property name="FinalProductDirectory (parameter)" class="ptolemy.data.expr.StringParameter" value="The directory where the files are going to be copied/linked or renamed. It is usually set to END_PRODUCTS_DIR">
+ </property>
+ <property name="SubDir (parameter)" class="ptolemy.data.expr.StringParameter" value="If it is not empty, a subdirectory will be created with this string. The value can contain backslashes (and intermediate directories will be created). It will usually be END_PROD_SUBDIR, created somewhere in the workflow">
+ </property>
+ <property name="CopyMode (parameter)" class="ptolemy.data.expr.StringParameter" value="There are several options: "copy", "move" or "link".">
+ </property>
+ <property name="OutputExistsMode (parameter)" class="ptolemy.data.expr.StringParameter" value="This parameter defines the behaviour in case the output files already exists: it can be "append_version" (create a new file with a running index suffix), "overwrite" (replace the existing file), "stop" (stop the workflow)">
+ </property>
+ <property name="script (parameter)" class="ptolemy.data.expr.StringParameter" value="">
+ </property>
+ <property name="sof_out (port)" class="ptolemy.kernel.util.StringAttribute" value="The final list of files produced">
+ </property>
+ <property name="sof_in (port)" class="ptolemy.kernel.util.StringAttribute" value="The files to be copied/moved or linked">
+ </property>
+ </property>
+ <property name="BookkeepingDir" class="ptolemy.data.expr.StringParameter" value="$BOOKKEEPING_DIR">
+ </property>
+ <port name="sof_in" class="ptolemy.actor.TypedIOPort">
+ <property name="input"/>
+ <property name="tokenConsumptionRate" class="ptolemy.data.expr.Parameter" value="1">
+ </property>
+ <property name="_cardinal" class="ptolemy.kernel.util.StringAttribute" value="WEST">
+ </property>
+ </port>
+ <port name="sof_out" class="ptolemy.actor.TypedIOPort">
+ <property name="output"/>
+ <property name="multiport"/>
+ <property name="_cardinal" class="ptolemy.kernel.util.StringAttribute" value="SOUTH">
+ </property>
+ </port>
+ </entity>
+ <relation name="relation" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
</property>
</relation>
- <relation name="relation4" class="ptolemy.actor.TypedIORelation">
+ <relation name="relation7" class="ptolemy.actor.TypedIORelation">
<property name="width" class="ptolemy.data.expr.Parameter" value="1">
</property>
</relation>
- <relation name="relation5" class="ptolemy.actor.TypedIORelation">
- </relation>
<relation name="relation10" class="ptolemy.actor.TypedIORelation">
</relation>
- <relation name="relation6" class="ptolemy.actor.TypedIORelation">
- </relation>
<relation name="relation12" class="ptolemy.actor.TypedIORelation">
</relation>
<relation name="relation11" class="ptolemy.actor.TypedIORelation">
@@ -5359,17 +5911,25 @@
</relation>
<relation name="relation8" class="ptolemy.actor.TypedIORelation">
</relation>
- <link port="Data Filter.sof in" relation="relation2"/>
- <link port="Data Filter.sof out" relation="relation4"/>
+ <relation name="relation5" class="ptolemy.actor.TypedIORelation">
+ </relation>
+ <relation name="relation13" class="ptolemy.actor.TypedIORelation">
+ </relation>
+ <relation name="relation14" class="ptolemy.actor.TypedIORelation">
+ </relation>
+ <relation name="relation4" class="ptolemy.actor.TypedIORelation">
+ </relation>
+ <relation name="relation2" class="ptolemy.actor.TypedIORelation">
+ </relation>
<link port="Calibration.sof_in" relation="relation8"/>
<link port="Calibration.sof_out" relation="relation7"/>
<link port="Science.sof_in" relation="relation"/>
<link port="Science.sof_out" relation="relation2"/>
<link port="Initialize.raw_data_dir" relation="relation9"/>
- <link port="Close DataSet.final_files2" relation="relation5"/>
- <link port="Close DataSet.current_dataset" relation="relation6"/>
- <link port="ProductRenamer.sof_in" relation="relation4"/>
- <link port="ProductRenamer.sof_out" relation="relation5"/>
+ <link port="Close DataSet.current_dataset" relation="relation5"/>
+ <link port="Close DataSet.final_files" relation="relation4"/>
+ <link port="Close DataSet.bookkeeping_db" relation="relation13"/>
+ <link port="Close DataSet.global_timestamp" relation="relation14"/>
<link port="SofCombiner.sof in" relation="relation7"/>
<link port="SofCombiner.sof in" relation="relation12"/>
<link port="SofCombiner.sof out" relation="relation"/>
@@ -5377,10 +5937,14 @@
<link port="DataOrganizer.datasets out" relation="relation10"/>
<link port="Initialise Current Dataset.dataset" relation="relation3"/>
<link port="Initialise Current Dataset.dataset_in" relation="relation11"/>
- <link port="Initialise Current Dataset.current_dataset" relation="relation6"/>
+ <link port="Initialise Current Dataset.current_dataset" relation="relation5"/>
<link port="Data Set Selection.dataset_out" relation="relation11"/>
<link port="Data Set Selection.datasets_in" relation="relation10"/>
<link port="FitsRouter.in" relation="relation3"/>
<link port="FitsRouter.CALIB" relation="relation8"/>
<link port="FitsRouter.SCIENCE" relation="relation12"/>
+ <link port="ProvenanceExplorer.bookkeeping db" relation="relation13"/>
+ <link port="ProvenanceExplorer.start date" relation="relation14"/>
+ <link port="ProductRenamer.sof_in" relation="relation2"/>
+ <link port="ProductRenamer.sof_out" relation="relation4"/>
</entity>
diff --git a/reflex/iiinstrument_wkf.oca b/reflex/iiinstrument_wkf.oca
index c899bd6..b2e5a16 100644
--- a/reflex/iiinstrument_wkf.oca
+++ b/reflex/iiinstrument_wkf.oca
@@ -25,8 +25,6 @@ select execute(ACTION_COMBINE_IMG) from inputFiles where DO.CATG == "RRRECIPE_DO
action ACTION_CALIB_IMG
{
-minRet = 1; maxRet = 1;
-select file as LINE_INTMON_TABLE from calibFiles where DO.CATG == "LINE_INTMON_TABLE";
recipe rrrecipe_calib;
product IMG_CALIBRATED { REFLEX.CATG = "IMG_CALIBRATED"; PRO.CATG = "IMG_CALIBRATED"; PRO.EXT="tpl_0000.fits";}
@@ -36,6 +34,8 @@ action ACTION_COMBINE_IMG
{
minRet = 1; maxRet = 1;
select file as IMG_CALIBRATED from calibFiles where PRO.CATG == "IMG_CALIBRATED";
+minRet = 1; maxRet = 1;
+select file as LINE_INTMON_TABLE from calibFiles where DO.CATG == "LINE_INTMON_TABLE";
recipe rrrecipe;
product IMG_OBJ_COMBINED { PRO.CATG = "IMG_OBJ_COMBINED"; PRO.EXT="tpl_0001.fits";}
diff --git a/regtests/tests/Makefile.am b/regtests/tests/Makefile.am
index b3603ff..f493e88 100644
--- a/regtests/tests/Makefile.am
+++ b/regtests/tests/Makefile.am
@@ -38,7 +38,7 @@ reg1:
valgrind:
esoreg.pl -valgrind -preload ../../${PACKAGE}_reg/sof
-check:
+regcheck:
mkdir -p .purifydir
@if test -d ../../${PACKAGE}_reg/sof/; then esorex --version ; fi
@if test -d ../../${PACKAGE}_reg/sof/; then mkdir -p ../../${PACKAGE}_reg/sof/.purifydir ; fi
diff --git a/regtests/tests/Makefile.in b/regtests/tests/Makefile.in
index 5a393cc..16d646b 100644
--- a/regtests/tests/Makefile.in
+++ b/regtests/tests/Makefile.in
@@ -437,7 +437,7 @@ reg1:
valgrind:
esoreg.pl -valgrind -preload ../../${PACKAGE}_reg/sof
-check:
+regcheck:
mkdir -p .purifydir
@if test -d ../../${PACKAGE}_reg/sof/; then esorex --version ; fi
@if test -d ../../${PACKAGE}_reg/sof/; then mkdir -p ../../${PACKAGE}_reg/sof/.purifydir ; fi
diff --git a/setup b/setup
index 7b21b0f..2f52caa 100755
--- a/setup
+++ b/setup
@@ -17,9 +17,9 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 USA
# $Author: llundin $
-# $Date: 2013/03/12 08:01:57 $
+# $Date: 2013-03-12 08:01:57 $
# $Revision: 1.3 $
-# $Name: iiinstrument-0_0_3 $
+# $Name: not supported by cvs2svn $
# This script is the autoinstaller for the VLT instrument pipeline
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-iiinstrument.git
More information about the debian-science-commits
mailing list