Changeset 31451 for trunk/psModules/src/objects/pmGrowthCurve.c

Timestamp:

May 5, 2011, 11:02:53 AM (15 years ago)

Author:

eugene

Message:

merge updates from eam branch 20110404

File:

• trunk/psModules/src/objects/pmGrowthCurve.c (modified) (3 diffs)

trunk/psModules/src/objects/pmGrowthCurve.c

@@ -73 +73 @@
     // Fractional pixel radii are not well defined; use integer pixel radii.  Use 1 pixel steps
     // until the scaling factor steps in intervals larger than 1 pixel
-    float Rlin = 1.0 / (fR - 1.0);
+    // float Rlin = 1.0 / (fR - 1.0);
 
     growth->radius = psVectorAllocEmpty (NPTS, PS_DATA_F32);
@@ -79 +79 @@
     // there will be NPTS radii + a few extras 
     float radius = minRadius;
-    while (radius < Rlin) {
+    while (radius < refRadius) {
         // fprintf (stderr, "r: %f\n", radius);
-        psVectorAppend (growth->radius, radius);
+        psVectorAppend (growth->radius, radius - 0.001);
         radius += 1.0;
     }    
+    growth->refBin = growth->radius->n - 1;
     while (radius < maxRadius) {
         // fprintf (stderr, "r: %f\n", radius);
-        psVectorAppend (growth->radius, radius);
+        psVectorAppend (growth->radius, radius - 0.001);
         radius *= fR;
         radius = (int) (radius + 0.5);
@@ -96 +97 @@
     growth->refRadius = refRadius;
     growth->maxRadius = maxRadius;
-    growth->apLoss = 0.0;
-    growth->fitMag = 0.0;
+    growth->fitMag = NAN;
+    growth->refMag = NAN;
+    growth->apRef  = NAN;
+    growth->apLoss = NAN;
+
     return growth;
 }