Changeset 31156 for trunk/ppSub/src/ppSubFlagNeighbors.c

Timestamp:

Apr 4, 2011, 1:13:59 PM (15 years ago)

Author:

eugene

Message:

minor fixes from eam branch

Location:

trunk/ppSub

Files:

• . (modified) (1 prop)
• src/ppSubFlagNeighbors.c (modified) (3 diffs)

trunk/ppSub

@@ -17 +17 @@
 test
 Doxyfile
+a.out.dSYM

@@ -17 +17 @@
 test
 Doxyfile
+a.out.dSYM

trunk/ppSub/src/ppSubFlagNeighbors.c

@@ -189 +189 @@
         if (!src) NEXT1; 
         if (!src->peak) NEXT1; 
-        if (!finite(src->peak->xf)) NEXT1; 
-        if (!finite(src->peak->yf)) NEXT1; 
-        if (!finite(src->peak->SN)) NEXT1; 
-        if (src->peak->SN < MIN_SN) NEXT1; 
+        if (!isfinite(src->peak->xf)) NEXT1; 
+        if (!isfinite(src->peak->yf)) NEXT1; 
+        if (!isfinite(src->peak->detValue)) NEXT1; 
+        if (sqrt(src->peak->detValue) < MIN_SN) NEXT1; 
  
         if (!obj) NEXT2; 
-        if (!finite(obj->x)) NEXT2; 
-        if (!finite(obj->y)) NEXT2; 
+        if (!isfinite(obj->x)) NEXT2; 
+        if (!isfinite(obj->y)) NEXT2; 
  
         dx = src->peak->xf - obj->x; 
@@ -211 +211 @@
             if (!src) NEXT1; 
             if (!src->peak) NEXT1; 
-            if (!finite(src->peak->xf)) NEXT1; 
-            if (!finite(src->peak->yf)) NEXT1; 
-            if (!finite(src->peak->SN)) NEXT1; 
-            if (src->peak->SN < MIN_SN) NEXT1; 
+            if (!isfinite(src->peak->xf)) NEXT1; 
+            if (!isfinite(src->peak->yf)) 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

@@ -17 +17 @@
 test
 Doxyfile
+a.out.dSYM