Changeset 13064 for trunk/psModules/src/objects/models

Timestamp:

Apr 27, 2007, 12:14:08 PM (19 years ago)

Author:

magnier

Message:

converting the PSF model fits to the polariation terms (replacing Sx,Sy,Sxy)

Location:

trunk/psModules/src/objects/models

Files:

• pmModel_GAUSS.c (modified) (3 diffs)
• pmModel_PGAUSS.c (modified) (3 diffs)
• pmModel_QGAUSS.c (modified) (3 diffs)

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

@@ -208 +208 @@
     psF32 *PAR = params->data.F32;
 
-    shape.sx  = PAR[PM_PAR_SXX] / sqrt(2.0);
-    shape.sy  = PAR[PM_PAR_SYY] / sqrt(2.0);
+    shape.sx  = PAR[PM_PAR_SXX] / M_SQRT2;
+    shape.sy  = PAR[PM_PAR_SYY] / M_SQRT2;
     shape.sxy = PAR[PM_PAR_SXY];
 
@@ -237 +237 @@
         return (1.0);
 
-    shape.sx  = PAR[PM_PAR_SXX] / sqrt(2.0);
-    shape.sy  = PAR[PM_PAR_SYY] / sqrt(2.0);
+    shape.sx  = PAR[PM_PAR_SXX] / M_SQRT2;
+    shape.sy  = PAR[PM_PAR_SYY] / M_SQRT2;
     shape.sxy = PAR[PM_PAR_SXY];
 
@@ -267 +267 @@
     }
 
-    // the 2D model for SXY actually fits SXY / (SXX^-2 + SYY^-2); correct here
-    out[PM_PAR_SXY] = pmPSF_SXYtoModel (out);
+    // the OLD 2D model for SXY actually fitted SXY / (SXX^-2 + SYY^-2); correct here
+    // out[PM_PAR_SXY] = pmPSF_SXYtoModel (out);
+
+    // the 2D PSF model fits polarization terms (E0,E1,E2)
+    // convert to shape terms (SXX,SYY,SXY)
+    // XXX user-defined value for limit?
+    pmPSF_FitToModel (out, 0.1);
 
     // apply the model limits here: this truncates excessive extrapolation
+    // XXX do we need to do this still?  should we put in asserts to test?
     for (int i = 0; i < psf->params_NEW->n; i++) {
         // apply the limits to all components or just the psf-model parameters?

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

@@ -209 +209 @@
     psF32 *PAR = params->data.F32;
 
-    shape.sx  = PAR[PM_PAR_SXX] / sqrt(2.0);
-    shape.sy  = PAR[PM_PAR_SYY] / sqrt(2.0);
+    shape.sx  = PAR[PM_PAR_SXX] / M_SQRT2;
+    shape.sy  = PAR[PM_PAR_SYY] / M_SQRT2;
     shape.sxy = PAR[PM_PAR_SXY];
 
@@ -253 +253 @@
         return (1.0);
 
-    shape.sx  = PAR[PM_PAR_SXX] / sqrt(2.0);
-    shape.sy  = PAR[PM_PAR_SYY] / sqrt(2.0);
+    shape.sx  = PAR[PM_PAR_SXX] / M_SQRT2;
+    shape.sy  = PAR[PM_PAR_SYY] / M_SQRT2;
     shape.sxy = PAR[PM_PAR_SXY];
 
@@ -288 +288 @@
     }
 
-    // the 2D model for SXY actually fits SXY / (SXX^-2 + SYY^-2); correct here
-    out[PM_PAR_SXY] = pmPSF_SXYtoModel (out);
-
+    // the OLD 2D model for SXY actually fitted SXY / (SXX^-2 + SYY^-2); correct here
+    // out[PM_PAR_SXY] = pmPSF_SXYtoModel (out);
+
+    // the 2D PSF model fits polarization terms (E0,E1,E2)
+    // convert to shape terms (SXX,SYY,SXY)
+    pmPSF_FitToModel (out, 0.1);
+
+    // apply the model limits here: this truncates excessive extrapolation
+    // XXX do we need to do this still?  should we put in asserts to test?
+    for (int i = 0; i < psf->params_NEW->n; i++) {
+        // apply the limits to all components or just the psf-model parameters?
+        if (psf->params_NEW->data[i] == NULL)
+            continue;
+        PM_MODEL_LIMITS (PS_MINIMIZE_PARAM_MIN, i, out, NULL);
+        PM_MODEL_LIMITS (PS_MINIMIZE_PARAM_MAX, i, out, NULL);
+    }
     return(true);
 }

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

@@ -238 +238 @@
     psF32 *PAR = params->data.F32;
 
-    shape.sx  = PAR[PM_PAR_SXX] / sqrt(2.0);
-    shape.sy  = PAR[PM_PAR_SYY] / sqrt(2.0);
+    shape.sx  = PAR[PM_PAR_SXX] / M_SQRT2;
+    shape.sy  = PAR[PM_PAR_SYY] / M_SQRT2;
     shape.sxy = PAR[PM_PAR_SXY];
 
@@ -284 +284 @@
         return (1.0);
 
-    shape.sx  = PAR[PM_PAR_SXX] / sqrt(2.0);
-    shape.sy  = PAR[PM_PAR_SYY] / sqrt(2.0);
+    shape.sx  = PAR[PM_PAR_SXX] / M_SQRT2;
+    shape.sy  = PAR[PM_PAR_SYY] / M_SQRT2;
     shape.sxy = PAR[PM_PAR_SXY];
 
@@ -345 +345 @@
     }
 
-    // the 2D model for SXY actually fits SXY / (SXX^-2 + SYY^-2); correct here
-    out[PM_PAR_SXY] = pmPSF_SXYtoModel (out);
+    // the OLD 2D model for SXY actually fitted SXY / (SXX^-2 + SYY^-2); correct here
+    // out[PM_PAR_SXY] = pmPSF_SXYtoModel (out);
+
+    // the 2D PSF model fits polarization terms (E0,E1,E2)
+    // convert to shape terms (SXX,SYY,SXY)
+    pmPSF_FitToModel (out, 0.1);
 
     // apply the model limits here: this truncates excessive extrapolation
+    // XXX do we need to do this still?  should we put in asserts to test?
     for (int i = 0; i < psf->params_NEW->n; i++) {
         // apply the limits to all components or just the psf-model parameters?