Changeset 14220 for trunk/psModules/src/objects/models/pmModel_QGAUSS.c

Timestamp:

Jul 15, 2007, 1:30:42 PM (19 years ago)

Author:

magnier

Message:

further attempt to set valid limits for sigma_xy

File:

• trunk/psModules/src/objects/models/pmModel_QGAUSS.c (modified) (2 diffs)

trunk/psModules/src/objects/models/pmModel_QGAUSS.c

@@ -88 +88 @@
         f2 = 1.0 / PS_SQR(params[PM_PAR_SYY]) - 1.0 / PS_SQR(params[PM_PAR_SXX]);
         q1 = PS_SQR(f1)*AR_RATIO - PS_SQR(f2);
-        if (q1 <= 0) {
-            psError(PM_ERR_PSF, true, "Q1 < 0 (%g)", q1);
-            return false;
-        }
+        q1 = (q1 < 0.0) ? 0.0 : q1;
+        // if q1 < 0.0, f2 ~ f1, we have a very large axis ratio near 45deg..  Saturate at that
+        // angle and let f2,f1 fight it out
         q2  = 0.5*sqrt (q1);
     }
@@ -117 +116 @@
             break;
         case PM_PAR_SXY:
-            beta_lim =  q2;
+            beta_lim =  0.5*q2;
             break;
         case PM_PAR_7: