Changeset 3666 for trunk/stac/src/stacCombine.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/stacCombine.c (modified) (4 diffs)

trunk/stac/src/stacCombine.c

@@ -62 +62 @@
                  int nReject,           // Number of rejection iterations
                  psImage *region,       // Region to combine
-                 stacConfig *config     // Configuration
+                 psVector *saturated,   // Saturation limits for each image
+                 psVector *bad,         // Bad pixel limits for each image
+                 float reject           // Rejection (k-sigma)
     )
 {
@@ -68 +70 @@
     int numRows = ((psImage*)images->data[0])->numRows; // Image size
     int numCols = ((psImage*)images->data[0])->numCols; // Image size
-    psVector *saturated = config->saturated;// Saturation limits
-    psVector *bad = config->bad;        // Bad pixel limits
-    float reject = config->reject;      // Rejection (k-sigma)
     
     // Check dimensions for consistency
@@ -188 +187 @@
 
 #ifdef TESTING
-    // Write rejection images out to check
-    if (nReject > 0) {
-        for (int i = 0; i < nImages; i++) {
-            char rejName[MAXCHAR];      // Filename of rejection image
-            sprintf(rejName,"%s.shiftrej",config->inputs->data[i]);
-
-            psFits *rejFile = psFitsAlloc(rejName);
-            if (!psFitsWriteImage(rejFile, NULL, (*rejected)->data[i], 0, NULL)) {
-                psErrorStackPrint(stderr, "Unable to write image: %s\n", rejName);
-            }
-            psTrace("stac", 1, "Rejection image written to %s\n", rejName);
-            psFree(rejFile);
-        }
-    }
     // Write chi^2 image
     iteration++;
@@ -210 +195 @@
         psErrorStackPrint(stderr, "Unable to write image: %s\n", chiName);
     }
-    psTrace("stac", 1, "Chi^2 image written to %s\n", chiName);
+    psTrace("stac.combine", 1, "Chi^2 image written to %s\n", chiName);
     psFree(chiFile);
     psFree(chi2);
 #endif
-
 
     // Clean up