Changeset 27840 for branches/simtest_nebulous_branches/psModules/src/objects/pmPeaks.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects/pmPeaks.c (modified) (6 diffs)

branches/simtest_nebulous_branches/psModules/src/objects/pmPeaks.c

@@ -60 +60 @@
     // if min point is too deviant, use the peak value
     // XXX need to calculate dx, dy correctly
+    // 0.5 PIX: peaks are calculated using the pixel index and converted here to pixel coords
     if ((fabs(min.x) < 1.5) && (fabs(min.y) < 1.5)) {
-        peak->xf = min.x + ix + image->col0;
-        peak->yf = min.y + iy + image->row0;
+        peak->xf = min.x + ix + image->col0 + 0.5;
+        peak->yf = min.y + iy + image->row0 + 0.5;
 
         // These errors are fractional errors, and should be scaled by the 
@@ -73 +74 @@
         peak->yf = PS_MAX (PS_MIN (peak->yf, image->numRows - 1), image->row0);
     } else {
-        peak->xf = ix;
-        peak->yf = iy;
+        peak->xf = ix + 0.5;
+        peak->yf = iy + 0.5; 
         peak->dx = NAN;
         peak->dy = NAN;
@@ -374 +375 @@
     psU32 col = 0;
     psU32 row = 0;
-    psArray *list = NULL;
+    psArray *list = psArrayAllocEmpty(100);
 
     // Find peaks in row 0 only.
@@ -415 +416 @@
 
         } else {
-            psError(PS_ERR_UNKNOWN, true, "peak specified valid column range.");
+            psLogMsg ("psModules.objects", 5, "peak specified outside valid column range.");
         }
     }
@@ -500 +501 @@
                 }
             } else {
-                psError(PS_ERR_UNKNOWN, true, "peak specified outside valid column range.");
+                psLogMsg ("psModules.objects", 5, "peak specified outside valid column range.");
             }
 
@@ -544 +545 @@
             }
         } else {
-            psError(PS_ERR_UNKNOWN, true, "peak specified outside valid column range.");
+            psLogMsg ("psModules.objects", 5, "peak specified outside valid column range.");
         }
     }