Changeset 31153 for trunk/psModules/src/objects/pmPhotObj.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)
• src/objects/pmPhotObj.c (modified) (3 diffs)

trunk/psModules

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

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

trunk/psModules/src/objects/pmPhotObj.c

@@ -67 +67 @@
         return false; 
     }
-    if (!finite(source->peak->xf)) {
+    if (!isfinite(source->peak->xf)) {
         psError(PS_ERR_UNKNOWN, true, "NAN peak coordinate");
         return false; 
     }
-    if (!finite(source->peak->yf)) {
+    if (!isfinite(source->peak->yf)) {
         psError(PS_ERR_UNKNOWN, true, "NAN peak coordinate");
         return false; 
@@ -81 +81 @@
         object->x  = source->peak->xf;
         object->y  = source->peak->yf;
-        object->SN = source->peak->SN;
+        object->flux = source->peak->rawFlux;
     } else {
-        object->SN = PS_MAX(object->SN, source->peak->SN);
+        object->flux = PS_MAX(object->flux, source->peak->rawFlux);
     }
     psArrayAdd (object->sources, 1, source);
@@ -89 +89 @@
 }
 
-// sort by SN (descending)
-int pmPhotObjSortBySN (const void **a, const void **b)
+// sort by flux (descending)
+int pmPhotObjSortByFlux (const void **a, const void **b)
 {
     pmPhotObj *objA = *(pmPhotObj **)a;
     pmPhotObj *objB = *(pmPhotObj **)b;
 
-    psF32 fA = objA->SN;
-    psF32 fB = objB->SN;
+    psF32 fA = objA->flux;
+    psF32 fB = objB->flux;
 
     psF32 diff = fA - fB;

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