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

Timestamp:

Sep 24, 2007, 11:27:58 AM (19 years ago)

Author:

eugene

Message:

update from eam_branch_20070921

Location:

trunk/psModules/src/objects/models

Files:

• pmModel_GAUSS.c (modified) (2 diffs)
• pmModel_PGAUSS.c (modified) (2 diffs)
• pmModel_QGAUSS.c (modified) (2 diffs)
• pmModel_RGAUSS.c (modified) (2 diffs)
• pmModel_SERSIC.c (modified) (2 diffs)

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

@@ -274 +274 @@
             out[i] = in[i];
         } else {
-            psPolynomial2D *poly = psf->params->data[i];
-            out[i] = psPolynomial2DEval(poly, in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
+            pmTrend2D *trend = psf->params->data[i];
+            out[i] = pmTrend2DEval(trend, in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
         }
     }
@@ -331 +331 @@
         if (i == PM_PAR_XPOS) continue;
         if (i == PM_PAR_YPOS) continue;
-        psPolynomial2D *poly = psf->params->data[i];
-        assert (poly);
-        PAR[i] = psPolynomial2DEval(poly, Xo, Yo);
+        pmTrend2D *trend = psf->params->data[i];
+        PAR[i] = pmTrend2DEval(trend, Xo, Yo);
     }
 

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

@@ -328 +328 @@
             out[i] = in[i];
         } else {
-            psPolynomial2D *poly = psf->params->data[i];
-            out[i] = psPolynomial2DEval(poly, in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
+            pmTrend2D *trend = psf->params->data[i];
+            out[i] = pmTrend2DEval(trend, in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
         }
     }
@@ -384 +384 @@
         if (i == PM_PAR_XPOS) continue;
         if (i == PM_PAR_YPOS) continue;
-        psPolynomial2D *poly = psf->params->data[i];
-        assert (poly);
-        PAR[i] = psPolynomial2DEval(poly, Xo, Yo);
+        pmTrend2D *trend = psf->params->data[i];
+        PAR[i] = pmTrend2DEval(trend, Xo, Yo);
     }
 

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

@@ -358 +358 @@
             out[i] = in[i];
         } else {
-            psPolynomial2D *poly = psf->params->data[i];
-            out[i] = psPolynomial2DEval(poly, in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
+            pmTrend2D *trend = psf->params->data[i];
+            out[i] = pmTrend2DEval(trend, in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
         }
     }
@@ -412 +412 @@
         if (i == PM_PAR_XPOS) continue;
         if (i == PM_PAR_YPOS) continue;
-        psPolynomial2D *poly = psf->params->data[i];
-        assert (poly);
-        PAR[i] = psPolynomial2DEval(poly, Xo, Yo);
+        pmTrend2D *trend = psf->params->data[i];
+        PAR[i] = pmTrend2DEval(trend, Xo, Yo);
     }
 

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

@@ -351 +351 @@
             out[i] = in[i];
         } else {
-            psPolynomial2D *poly = psf->params->data[i];
-            out[i] = psPolynomial2DEval(poly, in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
+            pmTrend2D *trend = psf->params->data[i];
+            out[i] = pmTrend2DEval(trend, in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
         }
     }
@@ -405 +405 @@
         if (i == PM_PAR_XPOS) continue;
         if (i == PM_PAR_YPOS) continue;
-        psPolynomial2D *poly = psf->params->data[i];
-        assert (poly);
-        PAR[i] = psPolynomial2DEval(poly, Xo, Yo);
+        pmTrend2D *trend = psf->params->data[i];
+        PAR[i] = pmTrend2DEval(trend, Xo, Yo);
     }
 

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

@@ -343 +343 @@
             out[i] = in[i];
         } else {
-            psPolynomial2D *poly = psf->params->data[i];
-            out[i] = psPolynomial2DEval(poly, in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
+            pmTrend2D *trend = psf->params->data[i];
+            out[i] = pmTrend2DEval(trend, in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
         }
     }
@@ -397 +397 @@
         if (i == PM_PAR_XPOS) continue;
         if (i == PM_PAR_YPOS) continue;
-        psPolynomial2D *poly = psf->params->data[i];
-        assert (poly);
-        PAR[i] = psPolynomial2DEval(poly, Xo, Yo);
+        pmTrend2D *trend = psf->params->data[i];
+        PAR[i] = pmTrend2DEval(trend, Xo, Yo);
     }