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

trunk/stac/src/stacRejection.c

@@ -48 +48 @@
                        psArray *maps,   // Maps from input to transformed image
                        psArray *inverseMaps, // Maps from transformed to input image
-                       stacConfig *config // Configuration
+                       float frac,      // Fraction of pixel rejected before looking more carefully
+                       float grad,      // Gradient limit for rejection
+                       psArray *names   // Names of original images (only for writing out when TESTING)
     )
 {
@@ -58 +60 @@
     assert(inputs->n == maps->n);
     assert(inputs->n == inverseMaps->n);
+    assert(!names || names->n == inputs->n);
 
     for (int i = 0; i < nImages; i++) {
@@ -93 +96 @@
         FILE *crs = NULL;               // File for outputting details of rejected pixels
         char crfile[MAXCHAR];   // Filename
-        sprintf(crfile,"%s.cr",config->inputs->data[i]);
+        sprintf(crfile,"%s.cr",names->data[i]);
         if ((crs = fopen(crfile, "w")) == NULL) {
             fprintf(stderr, "Unable to open file for detailed output, %s\n");
@@ -119 +122 @@
 #endif
 
-                    if (maskVal > config->frac) {
+                    if (maskVal > frac) {
                         // Calculate mean gradient on other images
                         float meanGrads = 0.0;
@@ -147 +150 @@
 #endif
 
-                        if (stacGradient(inputs->data[i], x, y) < config->grad * meanGrads) {
+                        if (stacGradient(inputs->data[i], x, y) < grad * meanGrads) {
                             mask->data.U8[y][x] = 1;
                             nBad++;
@@ -182 +185 @@
         char rejmapName[MAXCHAR];       // Filename of rejection image
         char gradName[MAXCHAR];         // Filename of gradient image
-        sprintf(maskName,"%s.mask",config->inputs->data[i]);
-        sprintf(rejmapName,"%s.rejmap",config->inputs->data[i]);
-        sprintf(gradName,"%s.grad",config->inputs->data[i]);
+        sprintf(maskName, "%s.mask", names->data[i]);
+        sprintf(rejmapName, "%s.rejmap", names->data[i]);
+        sprintf(gradName, "%s.grad", names->data[i]);
 
         psFits *maskFile = psFitsAlloc(maskName);