Changeset 30977 for branches/eam_branches/ipp-20110213/ppSub

Timestamp:

Mar 18, 2011, 2:11:57 PM (15 years ago)

Author:

eugene

Message:

change due to pmPeak element changes

Location:

branches/eam_branches/ipp-20110213/ppSub/src

Files:

• ppSubFlagNeighbors.c (modified) (3 diffs)
• ppSubMakePSF.c (modified) (1 diff)

branches/eam_branches/ipp-20110213/ppSub/src/ppSubFlagNeighbors.c

@@ -191 +191 @@
         if (!isfinite(src->peak->xf)) NEXT1; 
         if (!isfinite(src->peak->yf)) NEXT1; 
-        if (!isfinite(src->peak->SN)) NEXT1; 
-        if (src->peak->SN < MIN_SN) NEXT1; 
+        if (!isfinite(src->peak->detValue)) NEXT1; 
+        if (sqrt(src->peak->detValue) < MIN_SN) NEXT1; 
  
         if (!obj) NEXT2; 
@@ -213 +213 @@
             if (!isfinite(src->peak->xf)) NEXT1; 
             if (!isfinite(src->peak->yf)) NEXT1; 
-            if (!isfinite(src->peak->SN)) NEXT1; 
-            if (src->peak->SN < MIN_SN) NEXT1; 
+            if (!isfinite(src->peak->detValue)) NEXT1; 
+            if (sqrt(src->peak->detValue) < MIN_SN) NEXT1; 
 
             dx = src->peak->xf - obj->x; 
@@ -235 +235 @@
         src = sources->data[Imin]; 
 
-        // fprintf (stderr, "j: %d, Imin: %d, obj x,y: %f, %f  src x,y: %f, %f, SN: %f, ID: %d\n", j, Imin, obj->x, obj->y, src->peak->xf, src->peak->yf, src->peak->SN, src->id);
+        // fprintf (stderr, "j: %d, Imin: %d, obj x,y: %f, %f  src x,y: %f, %f, SN: %f, ID: %d\n", j, Imin, obj->x, obj->y, src->peak->xf, src->peak->yf, sqrt(src->peak->detValue), src->id);
 
         // add source to object

branches/eam_branches/ipp-20110213/ppSub/src/ppSubMakePSF.c

@@ -158 +158 @@
 psArray *ppSubSelectPSFSources(psArray *sources){
 
-    sources = psArraySort (sources, pmSourceSortBySN);
+    sources = psArraySort (sources, pmSourceSortByFlux);
 
     psArray *subset = psArrayAllocEmpty(MAX_NPSF);