Changeset 35662 for branches/eam_branches/ipp-20130509/psModules/src/objects/models/pmModel_GAUSS.c

Timestamp:

Jun 14, 2013, 6:23:44 AM (13 years ago)

Author:

eugene

Message:

calculation of the Sxy limits needs to include the factors used by the Sxx,Syy,Sxy -> PAR[n] conversion

File:

• branches/eam_branches/ipp-20130509/psModules/src/objects/models/pmModel_GAUSS.c (modified) (1 diff)

branches/eam_branches/ipp-20130509/psModules/src/objects/models/pmModel_GAUSS.c

@@ -129 +129 @@
     float q2 = NAN;
     if (nParam == PM_PAR_SXY) {
-        float f1 = 1.0 / PS_SQR(params[PM_PAR_SYY]) + 1.0 / PS_SQR(params[PM_PAR_SXX]);
-        float f2 = 1.0 / PS_SQR(params[PM_PAR_SYY]) - 1.0 / PS_SQR(params[PM_PAR_SXX]);
+        // NOTE: the factor of 2 is needed to convert par[SXX,SYY] to shape.sx,sy
+        float f1 = 2.0 / PS_SQR(params[PM_PAR_SYY]) + 2.0 / PS_SQR(params[PM_PAR_SXX]);
+        float f2 = 2.0 / PS_SQR(params[PM_PAR_SYY]) - 2.0 / PS_SQR(params[PM_PAR_SXX]);
         float q1 = PS_SQR(f1)*AR_RATIO - PS_SQR(f2);
         q1 = (q1 < 0.0) ? 0.0 : q1;