Changeset 30974 for branches/eam_branches/ipp-20110213/psModules/test/objects/tap_pmSource.c

Timestamp:

Mar 18, 2011, 2:09:39 PM (15 years ago)

Author:

eugene

Message:

we had 3 items conceptually equivalent to the brightness of a peak: "value", "flux", and "SN"; Ive modified pmPeak to carry explicitly named elements "rawFlux", "smoothFlux", and "detValue". Ive also added the corresponding variance values for rawFlux and smoothFlux. This lets us choose independently of the peak detection process whether flux comparisons are done relative to the smoothed or unsmoothed image. It also simplifies tests of the peak flux compared to something else

File:

• branches/eam_branches/ipp-20110213/psModules/test/objects/tap_pmSource.c (modified) (3 diffs)

branches/eam_branches/ipp-20110213/psModules/test/objects/tap_pmSource.c

@@ -21 +21 @@
         pmSourceCacheModel()
         pmSourceCachePSF()
-        pmSourceSortBySN()      (COMPILER ERRORS)
+        pmSourceSortByFlux()    (COMPILER ERRORS)
         pmSourceSortByY()       (COMPILER ERRORS)
     Must test
@@ -801 +801 @@
 
     // ----------------------------------------
-    // pmSourceSortBySN() tests
-    // int pmSourceSortBySN (const void **a, const void **b)
-    // Call pmSourceSortBySN() with acceptable input parameters.
+    // pmSourceSortByFlux() tests
+    // int pmSourceSortByFlux (const void **a, const void **b)
+    // Call pmSourceSortByFlux() with acceptable input parameters.
     // XXX: We don't test with NULL input parameters since this function has no PS_ASSERTS to protect
     // against that.
@@ -816 +816 @@
         src2->peak->SN = 20.0;
 
-        int rc = pmSourceSortBySN((const void **) &src1, (const void **) &src2);
-        ok(rc == 1, "pmSourceSortBySN() returned correct result (source1 < source2) (%d)", rc);
-        rc = pmSourceSortBySN((const void **) &src2, (const void **) &src1);
-        ok(rc == -1, "pmSourceSortBySN() returned correct result (source2 < source1) (%d)", rc);
-        rc = pmSourceSortBySN((const void **) &src1, (const void **) &src1);
-        ok(rc == 0, "pmSourceSortBySN() returned correct result (source1 == source2) (%d)", rc);
+        int rc = pmSourceSortByFlux((const void **) &src1, (const void **) &src2);
+        ok(rc == 1, "pmSourceSortByFlux() returned correct result (source1 < source2) (%d)", rc);
+        rc = pmSourceSortByFlux((const void **) &src2, (const void **) &src1);
+        ok(rc == -1, "pmSourceSortByFlux() returned correct result (source2 < source1) (%d)", rc);
+        rc = pmSourceSortByFlux((const void **) &src1, (const void **) &src1);
+        ok(rc == 0, "pmSourceSortByFlux() returned correct result (source1 == source2) (%d)", rc);
 
         psFree(src1);