Changeset 29215 for branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionStamps.c

Timestamp:

Sep 23, 2010, 7:02:45 AM (16 years ago)

Author:

eugene

Message:

replace pmSubtractionMaskInvalid with pmReadoutMaskInvalid (takes test and set masks); change stack mask to propagate good (or suspect) and bad pixel masks; replace test blocks with CHECKPIX test macro; replace robust median for window with sample median (less prone to fail)

File:

• branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionStamps.c (modified) (6 diffs)

branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionStamps.c

@@ -106 +106 @@
 
     if (xMax < xMin) {
-      fprintf (stderr, "%f,%f : x-border\n", xRaw, yRaw);
-      return false;
+        // fprintf (stderr, "%f,%f : x-border\n", xRaw, yRaw);
+        return false;
     }
     if (yMax < yMin) {
-      fprintf (stderr, "%f,%f : y-border\n", xRaw, yRaw);
-      return false;
+        // fprintf (stderr, "%f,%f : y-border\n", xRaw, yRaw);
+        return false;
     }
 
@@ -458 +458 @@
                 // Take stamps off the top of the (sorted) list
                 for (int j = xList->n - 1; j >= 0 && !goodStamp; j--) {
-                  fprintf (stderr, "%d : xList: %ld elements\n", i, xList->n);
+                    // fprintf (stderr, "%d : xList: %ld elements\n", i, xList->n);
                     // Chop off the top of the list
                     xList->n = j;
@@ -706 +706 @@
 
     // storage vector for flux data
-    psStats *stats = psStatsAlloc (PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV);
+    psStats *stats = psStatsAlloc (PS_STAT_SAMPLE_MEDIAN);
     psVector *flux1 = psVectorAllocEmpty(2*stamps->num, PS_TYPE_F32);
     psVector *flux2 = psVectorAllocEmpty(2*stamps->num, PS_TYPE_F32);
@@ -734 +734 @@
                 psAbort ("failed to generate stats");
             }
-            float f1 = stats->robustMedian;
+            float f1 = stats->sampleMedian;
 
             psStatsInit (stats);
@@ -740 +740 @@
                 psAbort ("failed to generate stats");
             }
-            float f2 = stats->robustMedian;
+            float f2 = stats->sampleMedian;
 
             stamps->window1->kernel[y][x] = f1;
@@ -755 +755 @@
         }
     }
+
+#if 0
+    {
+        psFits *fits = NULL;
+        fits = psFitsOpen ("window1.fits", "w");
+        psFitsWriteImage (fits, NULL, stamps->window1->image, 0, NULL);
+        psFitsClose (fits);
+        fits = psFitsOpen ("window2.fits", "w");
+        psFitsWriteImage (fits, NULL, stamps->window2->image, 0, NULL);
+        psFitsClose (fits);
+    }
+#endif
 
     psTrace("psModules.imcombine", 3, "Window total (1): %f, threshold: %f\n", sum1, (1.0 - stamps->normFrac) * sum1);