Changeset 5743 for trunk/stac/src/stacCombine.c

Timestamp:

Dec 7, 2005, 2:57:14 PM (21 years ago)

Author:

Paul Price

Message:

Importing from PAP cvs tree again. This will now be the working tree.

File:

• trunk/stac/src/stacCombine.c (modified) (4 diffs)

trunk/stac/src/stacCombine.c

@@ -10 +10 @@
 float stacCombineMean(psVector *values, // Values for which to take the mean
                       psVector *errors, // Errors in the values
-                      psVector *masks   // Masks for the values, 0 = don't use, 1 = use
+                      psVector *masks   // Masks for the values, 1 = don't use, 0 = use
     )
 {
@@ -149 +149 @@
                     }
                 }
-            
+                
                 float average = stacCombineMean(pixels, deltas, mask); // Combined value
+
+                // We set the value BEFORE the rejection iteration because not all pixels that we reject
+                // here will be rejected in the final cut.
+                (*combined)->data.F32[y][x] = average;
 
 #ifdef TESTING
@@ -188 +192 @@
                 }
             
-                (*combined)->data.F32[y][x] = average;
-
             } // Pixels of interest
 
@@ -201 +203 @@
     sprintf(chiName,"chi2_%d.fits",iteration);
     psFits *chiFile = psFitsAlloc(chiName);
-    if (!psFitsWriteImage(chiFile, NULL, chi2 , 0, NULL)) {
+    if (!psFitsWriteImage(chiFile, NULL, chi2 , 0)) {
         psErrorStackPrint(stderr, "Unable to write image: %s\n", chiName);
     }