Changeset 16704

Timestamp:

Feb 27, 2008, 5:38:21 PM (18 years ago)

Author:

Paul Price

Message:

Adding recipe options to choose the suffix for temporary files.

Location:

trunk

Files:

• ippconfig/recipes/ppStack.config (modified) (2 diffs)
• ppStack/src/ppStackArguments.c (modified) (2 diffs)
• ppStack/src/ppStackLoop.c (modified) (6 diffs)
• ppStack/src/ppStackReadout.c (modified) (1 diff)

trunk/ippconfig/recipes/ppStack.config

@@ -3 +3 @@
 ITER            S32     1               # Number of rejection iterations
 COMBINE.REJ     F32     2.0             # Rejection threshold in combination (sigma)
-CONVOLVE.REJ    F32     10.0            # Rejection threshold in convolution (sigma)
+CONVOLVE.REJ    F32     5.0             # Rejection threshold in convolution (sigma)
 EXTENT          F32     3.0             # Extent of Gaussian convolution (sigma)
 MASK.BAD        STR     BLANK,SAT,BAD   # Mask value of bad pixels
@@ -16 +16 @@
 PSF.ORDER       S32     3               # Order of spatial variation for PSF generation
 PSF.MODEL       STR     PS_MODEL_RGAUSS # Model for PSF generation
+
+TEMP.IMAGE      STR     conv.im.fits    # Suffix for convolved images
+TEMP.MASK       STR     conv.mk.fits    # Suffix for convolved masks
+TEMP.IMAGE      STR     conv.wt.fits    # Suffix for convolved weight maps
+TEMP.DELETE     BOOL    TRUE            # Delete temporary files on completion?

trunk/ppStack/src/ppStackArguments.c

@@ -124 +124 @@
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-variance", 0, "Use variance for rejection?", false);
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-safe", 0, "Play safe with small numbers of pixels to combine?", false);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-temp-image", 0, "Suffix for temporary images", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-temp-mask", 0, "Suffix for temporary masks", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-temp-weight", 0, "Suffix for temporary weight maps", NULL);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-temp-delete", 0, "Delete temporary files on completion?", false);
 
     if (argc == 1 || !psArgumentParse(arguments, &argc, argv) || argc != 3) {
@@ -188 +192 @@
     }
 
+    valueArgStr(config, arguments, "-temp-image",  "TEMP.IMAGE",  config->arguments);
+    valueArgStr(config, arguments, "-temp-mask",   "TEMP.MASK",   config->arguments);
+    valueArgStr(config, arguments, "-temp-weight", "TEMP.WEIGHT", config->arguments);
+
+    if (psMetadataLookupBool(NULL, arguments, "-temp-delete") ||
+        psMetadataLookupBool(NULL, recipe, "TEMP.DELETE")) {
+        psMetadataAddBool(config->arguments, PS_LIST_TAIL, "TEMP.DELETE", 0,
+                          "Delete temporary files on completion?", true);
+    }
+
+
     psTrace("ppStack", 1, "Done reading command-line arguments\n");
     psFree(arguments);

trunk/ppStack/src/ppStackLoop.c

@@ -4 +4 @@
 
 #include <stdio.h>
+#include <unistd.h>
 #include <string.h>
 #include <pslib.h>
@@ -11 +12 @@
 #include "ppStack.h"
 
-#define TESTING
+//#define TESTING
 
 // Here follows lists of files for activation/deactivation at various stages.  Each must be NULL-terminated.
@@ -185 +186 @@
     assert(config);
 
+    bool mdok;                          // Status of MD lookup
     psMaskType maskBlank = psMetadataLookupU8(NULL, config->arguments, "MASK.BLANK"); // Mask for blank reg.
-
-    bool mdok;                          // Status of MD lookup
+    bool tempDelete = psMetadataLookupBool(&mdok, config->arguments, "TEMP.DELETE"); // Delete temporary files?
+    const char *tempImage = psMetadataLookupStr(NULL, config->arguments, "TEMP.IMAGE"); // Suffix for temporary images
+    const char *tempMask = psMetadataLookupStr(NULL, config->arguments, "TEMP.MASK"); // Suffix for temporary masks
+    const char *tempWeight = psMetadataLookupStr(NULL, config->arguments, "TEMP.WEIGHT"); // Suffix for temporary weight (variance) maps
+    if (!tempImage || !tempMask || !tempWeight) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unable to find TEMP.IMAGE, TEMP.MASK and TEMP.WEIGHT");
+        return false;
+    }
+
     const char *statsName = psMetadataLookupStr(&mdok, config->arguments, "STATS"); // Filename for statistics
     psMetadata *stats = NULL;           // Container for statistics
@@ -286 +295 @@
     }
 
-    const char *suffix = "conv.fits";   // Suffix for convolved images; ultimately this will be from recipe
     const char *outName = psMetadataLookupStr(NULL, config->arguments, "OUTPUT"); // Output root
     assert(outName);
@@ -294 +302 @@
     for (int i = 0; i < num; i++) {
         psString imageName = NULL, maskName = NULL, weightName = NULL; // Names for convolved images
-        psStringAppend(&imageName, "%s.im-%d.%s", outName, i, suffix);
-        psStringAppend(&maskName, "%s.mk-%d.%s", outName, i, suffix);
-        psStringAppend(&weightName, "%s.wt-%d.%s", outName, i, suffix);
+        psStringAppend(&imageName, "%s.%d.%s", outName, i, tempImage);
+        psStringAppend(&maskName, "%s.%d.%s", outName, i, tempMask);
+        psStringAppend(&weightName, "%s.%d.%s", outName, i, tempWeight);
         imageNames->data[i] = imageName;
         maskNames->data[i] = maskName;
@@ -508 +516 @@
             psFitsClose(maskFits->data[i]);
             psFitsClose(weightFits->data[i]);
+            if (tempDelete && (unlink(imageNames->data[i]) || unlink(maskNames->data[i]) ||
+                               unlink(weightNames->data[i]))) {
+                psWarning("Unable to delete temporary files for image %d", i);
+            }
         }
 

trunk/ppStack/src/ppStackReadout.c

@@ -12 +12 @@
 #define WCS_TOLERANCE 0.001             // Tolerance for WCS
 
-#define REJECTION_FILES                 // Write rejection mask?
-#define INSPECTION_FILES                // Write inspection mask?
-#define COMBINED_FILES                  // Write combined images?
-
+//#define REJECTION_FILES                 // Write rejection mask?
+//#define INSPECTION_FILES                // Write inspection mask?
+//#define COMBINED_FILES                  // Write combined images?