Changeset 35236 for branches/eam_branches/ipp-20130207/psModules

Timestamp:

Mar 5, 2013, 2:24:05 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130207

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/imcombine/pmStack.c (modified) (1 diff)
• psModules/src/objects/models/pmModel_TRAIL.c (modified) (1 diff)

branches/eam_branches/ipp-20130207/psModules/src/imcombine/pmStack.c

@@ -1418 +1418 @@
       }
       combined->image->data.F32[y][x] = stats->robustMedian;
-      combined->mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] = 0;
+      if (combined->mask) {
+        combined->mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] = 0;
+      }
 #if (0)
       if ((x == 59)&&(y > 40)&&(y < 50)) {

branches/eam_branches/ipp-20130207/psModules/src/objects/models/pmModel_TRAIL.c

@@ -256 +256 @@
     if (!isfinite(axes.theta)) return false;
 
-    float size = (axes.major > source->moments->Mrf) ? axes.major : source->moments->Mrf;
+    float size = (axes.major > sqrt(source->moments->Mrf)) ? axes.major : sqrt(source->moments->Mrf);
+    //    if (size > psfAxes.major) { size -= psfAxes.major; }
+    //else { size = psfAxes.major; }
 
     // axes.major is a sigma in the major direction; scale to