Changeset 3666 for trunk/stac/src/stacConfig.c

Timestamp:

Apr 5, 2005, 11:51:26 AM (21 years ago)

Author:

Paul Price

Message:

Removing stac-specific configuration out of functions so that I can use them in other programs. Program appears to work as it did before.

File:

• trunk/stac/src/stacConfig.c (modified) (7 diffs)

trunk/stac/src/stacConfig.c

@@ -6 +6 @@
 #include "pslib.h"
 #include "stac.h"
+#include "stacConfig.h"
 
 stacConfig *stacConfigAlloc(void)
@@ -21 +22 @@
     config->starMapFile = NULL;
     config->aper = 3.0;
-    config->outnx = 512;
-    config->outny = 512;
-    config->saturated = NULL;           // Saturations; will fill this in later, when we know how many images
-    config->bad = NULL;                 // Bad levels; will fill this in later, when we know how many images
+    config->outnx = 0;
+    config->outny = 0;
+    config->saturated = 65535.0;        // Saturation level
+    config->bad = 0.0;                  // Bad level
     config->reject = 3.0;
     config->frac = 0.5;
@@ -40 +41 @@
         psFree(config->inputs);
     }
-    if (config->saturated) {
-        psFree(config->saturated);
-    }
-    if (config->bad) {
-        psFree(config->bad);
-    }
     // Free everything
     psFree(config);
@@ -57 +52 @@
     stacConfig *config = stacConfigAlloc(); // Configuration values
     const char *programName = argv[0];  // Program name
-
-    float saturated = 65535.0;          // Saturation level
-    float bad = 0.0;                    // Bad level
 
     /* Variables for getopt */
@@ -96 +88 @@
             break;
           case 's':
-            if (sscanf(optarg, "%f", &saturated) != 1) {
+            if (sscanf(optarg, "%f", &config->saturated) != 1) {
                 help(programName);
                 exit(EXIT_FAILURE);
@@ -102 +94 @@
             break;
           case 'b':
-            if (sscanf(optarg, "%f", &bad) != 1) {
+            if (sscanf(optarg, "%f", &config->bad) != 1) {
                 help(programName);
                 exit(EXIT_FAILURE);
@@ -170 +162 @@
     }
 
-    // Create the saturation and bad vectors
-    config->saturated = psVectorAlloc(argc-1, PS_TYPE_F32);
-    config->bad = psVectorAlloc(argc-1, PS_TYPE_F32);
-    for (int i = 0; i < argc - 1; i++) {
-        ((psVector*)config->saturated)->data.F32[i] = saturated;
-        ((psVector*)config->bad)->data.F32[i] = bad;
-    }
-
     // Debugging output
     psTrace("stac.config", 8, "Parsed command line for configuration\n");