Changeset 26078

Timestamp:

Nov 9, 2009, 3:37:56 PM (17 years ago)

Author:

Paul Price

Message:

Make temporary directory a command-line option.

Location:

trunk/ppStack/src

Files:

• ppStackArguments.c (modified) (1 diff)
• ppStackSetup.c (modified) (1 diff)

trunk/ppStack/src/ppStackArguments.c

@@ -185 +185 @@
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-zp-star-sys-1", 0, "Estimated systematic error; pass 1", NAN);
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-zp-star-sys-2", 0, "Estimated systematic error; pass 2", NAN);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-temp-dir", 0, "Directory for temporary images", NULL);
     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);

trunk/ppStack/src/ppStackSetup.c

@@ -47 +47 @@
 
     // Generate temporary names for convolved images
-    const char *tempDir = psMetadataLookupStr(NULL, config->site, "TEMP.DIR"); // Directory for temp images
+    const char *tempDir = psMetadataLookupStr(NULL, config->arguments, "-temp-dir"); // Directory for temps
+    if (!tempDir) {
+        tempDir = psMetadataLookupStr(NULL, config->site, "TEMP.DIR");
+    }
     if (!tempDir) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Unable to find TEMP.DIR in site configuration");