Changeset 36375 for trunk/psModules/src/objects/pmModelUtils.c

Timestamp:

Dec 10, 2013, 2:55:11 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130904

Location:

trunk

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects/pmModelUtils.c (modified) (3 diffs)

trunk/psModules/src/objects/pmModelUtils.c

@@ -129 +129 @@
 bool pmModelAxesToParams (float *Sxx, float *Sxy, float *Syy, psEllipseAxes axes, bool useReff)  {
 
+    // restrict axex to 0.5 here not below 
+    if (axes.minor < 0.2) axes.minor = 0.2;
+    if (axes.major < 0.2) axes.major = 0.2;
+
     psEllipseShape shape = psEllipseAxesToShape (axes);
 
@@ -137 +141 @@
     // set the shape parameters
     if (useReff) {
-        *Sxx  = PS_MAX(0.5, shape.sx);
-        *Syy  = PS_MAX(0.5, shape.sy);
+        // *Sxx  = PS_MAX(0.5, shape.sx);
+        // *Syy  = PS_MAX(0.5, shape.sy);
+        *Sxx  = shape.sx;
+        *Syy  = shape.sy;
         *Sxy  = shape.sxy * 2.0;
     } else {
-        *Sxx  = PS_MAX(0.5, M_SQRT2*shape.sx);
-        *Syy  = PS_MAX(0.5, M_SQRT2*shape.sy);
+        // *Sxx  = PS_MAX(0.5, M_SQRT2*shape.sx);
+        // *Syy  = PS_MAX(0.5, M_SQRT2*shape.sy);
+        *Sxx  = M_SQRT2*shape.sx;
+        *Syy  = M_SQRT2*shape.sy;
         *Sxy  = shape.sxy;
     }
@@ -193 +201 @@
     if (!isfinite(axes.minor)) return false;
     if (!isfinite(axes.theta)) return false;
+    if (axes.major == 0) return false;
 
     // Mxx, Mxy, Myy define the elliptical shape, but Mrf defines the width