Changeset 31153 for trunk/psModules/test/objects/tap_pmPeaks.c

Timestamp:

Apr 4, 2011, 1:04:41 PM (15 years ago)

Author:

eugene

Message:

updates to pmPeak to better distinguish peak flux versions; updates to visualization; add bits for substantial suspect masking; consolidate assignment of source position and flux based on peak, moments, etc; improve footprint culling process; fix PSF_QF and PSF_QF_PERFECT calculations; fix source model chisq values

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• test/objects/tap_pmPeaks.c (modified) (1 diff)

trunk/psModules

@@ -28 +28 @@
 ChangeLog
 psmodules-*.tar.*
+a.out.dSYM

@@ -28 +28 @@
 ChangeLog
 psmodules-*.tar.*
+a.out.dSYM

trunk/psModules/test/objects/tap_pmPeaks.c

@@ -650 +650 @@
     ok(test_pmPeaksInImage(TST02_NUM_ROWS, 2*TST02_NUM_COLS),
       "Tested pmPeaksInImage() on (%d, %d) image", TST02_NUM_ROWS, 2*TST02_NUM_COLS);
-
-
-    // ------------------------------------------------------------------------
-    // Test pmPeaksSubset()
-    // Calling pmPeaksSubset with NULL psList.  Should generate error.
-    {
-        psMemId id = psMemGetId();
-        psArray *outData = pmPeaksSubset(NULL, 0.0, psRegionSet(0, 0, 0, 0));
-        ok(outData == NULL, "pmPeaksSubset() returned a NULL with a NULL psArray input");
-        psFree(outData);
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-    }
-
-
-    // Set peaks in input image.  All even-column and even-row pixels are
-    // set non-zero, all other pixels are set to zero.
-    psImage *imgData = psImageAlloc(NUM_COLS, NUM_ROWS, PS_TYPE_F32);
-    psS32 numPeaksOrig = 0;
-    for (psS32 i = 0 ; i < NUM_ROWS ; i++) {
-        for (psS32 j = 0 ; j < NUM_COLS ; j++) {
-            if ((0 == i%2) && (0 == j%2)) {
-                imgData->data.F32[i][j] = (float) (i + 10);
-                numPeaksOrig++;
-            } else {
-                imgData->data.F32[i][j] = 0.0;
-            }
-        }
-    }
-    // Call pmPeaksSubset() with large maxValue and disjoint psRegion.
-    // Should not remove any peaks.
-    {
-        psMemId id = psMemGetId();
-        psArray *outData = pmPeaksInImage(imgData, 0.0);
-        psArray *outData2 = pmPeaksSubset(outData, PS_MAX_F32, psRegionSet(20, 20, 20, 20));
-        ok(outData2 != NULL && psMemCheckArray(outData),
-           "pmPeaksSubset() returned a non-NULL psArray (large maxValue)");
-        ok(outData2->n == numPeaksOrig,
-          "pmPeaksSubset() returned correct number of peaks (was %d, should be %d)", outData2->n+1, numPeaksOrig);
-        psFree(outData);
-        psFree(outData2);
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-    }
-
-
-    // Call pmPeaksSubset() with small maxValue and disjoint psRegion.
-    // Should not remove any peaks.
-    {
-        psMemId id = psMemGetId();
-        psArray *outData = pmPeaksInImage(imgData, 0.0);
-        psArray *outData2 = pmPeaksSubset(outData, 0.0, psRegionSet(20, 20, 20, 20));
-        ok(outData2 != NULL && psMemCheckArray(outData),
-           "pmPeaksSubset() returned a non-NULL psArray (small maxValue)");
-        ok(outData2->n == 0,
-          "pmPeaksSubset() returned correct number of peaks (was %d, should be %d)", outData2->n, 0);
-        psFree(outData);
-        psFree(outData2);
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-    }
-
-
-    // Call pmPeaksSubset() with large maxValue and enclosing psRegion.
-    // Should remove aall peaks.
-    {
-        psMemId id = psMemGetId();
-        psArray *outData = pmPeaksInImage(imgData, 0.0);
-        psRegion tmpRegion = psRegionSet(-PS_MAX_F32, PS_MAX_F32, -PS_MAX_F32, PS_MAX_F32);
-        psArray *outData2 = pmPeaksSubset(outData, PS_MAX_F32, tmpRegion);
-        ok(outData2 != NULL && psMemCheckArray(outData),
-           "pmPeaksSubset() returned a non-NULL psArray (small maxValue, enclosing psRegion)");
-        ok(outData2->n == 0,
-          "pmPeaksSubset() returned correct number of peaks (was %d, should be %d)", outData2->n, 0);
-        psFree(outData);
-        psFree(outData2);
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-    }
-
-
-    // Call pmPeaksSubset() with large maxValue and enclosing psRegion.
-    // Should remove aall peaks.
-    {
-        psMemId id = psMemGetId();
-        psArray *outData = pmPeaksInImage(imgData, 0.0);
-        psRegion tmpRegion = psRegionSet(-PS_MAX_F32, PS_MAX_F32, -PS_MAX_F32, PS_MAX_F32);
-        psArray *outData2 = pmPeaksSubset(outData, 0.0, tmpRegion);
-        ok(outData2 != NULL && psMemCheckArray(outData),
-           "pmPeaksSubset() returned a non-NULL psArray (small maxValue, inclusive psRegion)");
-        ok(outData2->n == 0,
-          "pmPeaksSubset() returned correct number of peaks (was %d, should be %d)", outData2->n, 0);
-        psFree(outData);
-        psFree(outData2);
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-    }
 }

@@ -28 +28 @@
 ChangeLog
 psmodules-*.tar.*
+a.out.dSYM