[SCM] Sample data reduction pipeline branch, debian, updated. 658ccae2a5f472c81304313eacb88e15618c9914

Ole Streicher debian at liska.ath.cx
Mon Jul 2 11:43:43 UTC 2012


The following commit has been merged in the debian branch:
commit 658ccae2a5f472c81304313eacb88e15618c9914
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jul 2 13:40:19 2012 +0200

    Use the correct tag (same as in rrrecipe)

diff --git a/debian/patches/add_test_recipe.patch b/debian/patches/add_test_recipe.patch
index 6567566..98a66ed 100644
--- a/debian/patches/add_test_recipe.patch
+++ b/debian/patches/add_test_recipe.patch
@@ -4,7 +4,7 @@ Description: This patch adds another recipe that is mainly used for the
  has more option parameter types, a "crash" option, and a "sleep" option.
 --- /dev/null
 +++ b/recipes/rtest.c
-@@ -0,0 +1,420 @@
+@@ -0,0 +1,421 @@
 +/* $Id: rtest.c,v 1.28 2007/07/30 07:08:59 llundin Exp $
 + *
 + * This file is part of the IIINSTRUMENT Pipeline
@@ -333,12 +333,12 @@ Description: This patch adds another recipe that is mainly used for the
 +		    cpl_error_get_code());
 +
 +    /*  - raw input file */
-+    const cpl_frame *rawframe = cpl_frameset_find_const(frameset, "RTEST_DOCATG_RAW");
++    const cpl_frame *rawframe = cpl_frameset_find_const(frameset, RRRECIPE_RAW);
 +    if (rawframe == NULL) {
 +	/* cpl_frameset_find_const() does not set an error code, when a frame
 +	   is not found, so we will set one here. */
 +	return (int)cpl_error_set_message(cpl_func, CPL_ERROR_DATA_NOT_FOUND,
-+					  "No file tagged with %s", "RTEST_DOCATG_RAW");
++					  "No file tagged with %s", RRRECIPE_RAW);
 +    }
 +
 +    cpl_propertylist *plist
@@ -346,6 +346,8 @@ Description: This patch adds another recipe that is mainly used for the
 +				       0, "ESO DET ", 0);
 +    if (plist == NULL) {
 +	/* In this case an error message is added to the error propagation */
++	cpl_msg_error(cpl_func, "Could not read plist from %s",
++		      cpl_frame_get_filename(rawframe));
 +	return (int)cpl_error_set_message(cpl_func, cpl_error_get_code(),
 +					  "Could not read the FITS header");
 +    }
@@ -377,8 +379,7 @@ Description: This patch adds another recipe that is mainly used for the
 +    cpl_propertylist *qclist = cpl_propertylist_new();
 +
 +    cpl_propertylist_append_double(qclist, "ESO QC QCPARAM", qc_param);
-+    cpl_propertylist_append_string(qclist, "ESO PRO CATG",
-+				   "THE_PRO_CATG_VALUE");
++    cpl_propertylist_append_string(qclist, "ESO PRO CATG","THE_PRO_CATG_VALUE");
 +    if (str_option != NULL) {
 +	cpl_propertylist_append_string(qclist, "ESO QC STROPT", str_option);
 +    } else {

-- 
Sample data reduction pipeline



More information about the debian-science-commits mailing list