Changeset 13006

Timestamp:

Apr 24, 2007, 1:43:47 PM (19 years ago)

Author:

rhl

Message:

Renamed psphotSortBy* to psphotSourceSortBy*

Location:

trunk/psphot/src

Files:

• psphotBasicDeblend.c (modified) (1 diff)
• psphotBlendFit.c (modified) (1 diff)
• psphotDeblendSatstars.c (modified) (1 diff)
• psphotEnsemblePSF.c (modified) (1 diff)
• psphotSortBySN.c (modified) (2 diffs)
• psphotSourcePlots.c (modified) (1 diff)
• psphotTestPSF.c (modified) (1 diff)
• psphotWeightBias.c (modified) (1 diff)

trunk/psphot/src/psphotBasicDeblend.c

@@ -19 +19 @@
 
     // we need sources spatially-sorted to find overlaps
-    sources = psArraySort (sources, psphotSortByY);
+    sources = psArraySort (sources, pmSourceSortByY);
 
     // source analysis is done in peak order (brightest first)

trunk/psphot/src/psphotBlendFit.c

@@ -13 +13 @@
 
     // source analysis is done in S/N order (brightest first)
-    sources = psArraySort (sources, psphotSortBySN);
+    sources = psArraySort (sources, pmSourceSortBySN);
     
     // S/N limit to perform full non-linear fits

trunk/psphot/src/psphotDeblendSatstars.c

@@ -13 +13 @@
 
     // we need sources spatially-sorted to find overlaps
-    sources = psArraySort (sources, psphotSortByY);
+    sources = psArraySort (sources, pmSourceSortByY);
 
     // source analysis is done in peak order (brightest first)

trunk/psphot/src/psphotEnsemblePSF.c

@@ -24 +24 @@
 
     // source analysis is done in spatial order
-    refSources = psArraySort (refSources, psphotSortByY);
+    refSources = psArraySort (refSources, pmSourceSortByY);
 
     // storage arrays for fitSources and sequence index

trunk/psphot/src/psphotSortBySN.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
+
 // sort by SN (descending)
-int psphotSortBySN (const void **a, const void **b)
+int pmPeakSortBySN (const void **a, const void **b)
+{
+    pmPeak *A = *(pmPeak **)a;
+    pmPeak *B = *(pmPeak **)b;
+
+    psF32 fA = A->SN;
+    psF32 fB = B->SN;
+    if (isnan (fA)) fA = 0;
+    if (isnan (fB)) fB = 0;
+
+    psF32 diff = fA - fB;
+    if (diff > FLT_EPSILON) return (-1);
+    if (diff < FLT_EPSILON) return (+1);
+    return (0);
+}
+
+// sort by Y (ascending)
+int pmPeakSortByY (const void **a, const void **b)
+{
+    pmPeak *A = *(pmPeak **)a;
+    pmPeak *B = *(pmPeak **)b;
+
+    psF32 fA = A->y;
+    psF32 fB = B->y;
+
+    psF32 diff = fA - fB;
+    if (diff > FLT_EPSILON) return (+1);
+    if (diff < FLT_EPSILON) return (-1);
+    return (0);
+}
+
+// sort by SN (descending)
+int pmSourceSortBySN (const void **a, const void **b)
 {
     pmSource *A = *(pmSource **)a;
@@ -19 +52 @@
 
 // sort by Y (ascending)
-int psphotSortByY (const void **a, const void **b)
+int pmSourceSortByY (const void **a, const void **b)
 {
     pmSource *A = *(pmSource **)a;

trunk/psphot/src/psphotSourcePlots.c

@@ -14 +14 @@
 
     // examine PSF sources in S/N order (brightest first)
-    sources = psArraySort (sources, psphotSortBySN);
+    sources = psArraySort (sources, pmSourceSortBySN);
 
     // counters to track the size of the image and area used in a row

trunk/psphot/src/psphotTestPSF.c

@@ -17 +17 @@
 
     // examine PSF sources in S/N order (brightest first)
-    sources = psArraySort (sources, psphotSortBySN);
+    sources = psArraySort (sources, pmSourceSortBySN);
 
     // array to store candidate PSF stars

trunk/psphot/src/psphotWeightBias.c

@@ -15 +15 @@
 
     // source analysis is done in S/N order (brightest first)
-    sources = psArraySort (sources, psphotSortBySN);
+    sources = psArraySort (sources, pmSourceSortBySN);
 
     // set fitting method to use non-poisson errors (local sky error)