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

Timestamp:

Mar 3, 2006, 3:01:34 PM (20 years ago)

Author:

drobbin

Message:

Updated files to reflect psArray, psVector, & psPixels changes in psLib that set n=0 upon allocation.

Location:

trunk/psModules/src/objects/models

Files:

• pmModel_GAUSS.c (modified) (1 diff)
• pmModel_PGAUSS.c (modified) (1 diff)
• pmModel_QGAUSS.c (modified) (2 diffs)
• pmModel_SGAUSS.c (modified) (2 diffs)

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

@@ -71 +71 @@
     *params_min = psVectorAlloc (7, PS_TYPE_F32);
     *params_max = psVectorAlloc (7, PS_TYPE_F32);
+    (*beta_lim)->n = (*beta_lim)->nalloc;
+    (*params_min)->n = (*params_min)->nalloc;
+    (*params_max)->n = (*params_max)->nalloc;
 
     beta_lim[0][0].data.F32[0] = 1000;

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

@@ -45 +45 @@
     *params_min = psVectorAlloc (7, PS_TYPE_F32);
     *params_max = psVectorAlloc (7, PS_TYPE_F32);
+    (*beta_lim)->n = (*beta_lim)->nalloc;
+    (*params_min)->n = (*params_min)->nalloc;
+    (*params_max)->n = (*params_max)->nalloc;
 
     beta_lim[0][0].data.F32[0] = 1000;

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

@@ -11 +11 @@
     params->data.F32[5] = sqrt(2.0) / SigmaY;
     params->data.F32[6] = Sxy;
-    params->data.F32[7] = 
-    params->data.F32[8] = 
+    params->data.F32[7] =
+    params->data.F32[8] =
 *****************************************************************************/
 
@@ -53 +53 @@
     *params_min = psVectorAlloc (8, PS_TYPE_F32);
     *params_max = psVectorAlloc (8, PS_TYPE_F32);
+    (*beta_lim)->n = (*beta_lim)->nalloc;
+    (*params_min)->n = (*params_min)->nalloc;
+    (*params_max)->n = (*params_max)->nalloc;
 
     beta_lim[0][0].data.F32[0] = 1000;

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

@@ -64 +64 @@
     *params_min = psVectorAlloc (9, PS_TYPE_F32);
     *params_max = psVectorAlloc (9, PS_TYPE_F32);
+    (*beta_lim)->n = (*beta_lim)->nalloc;
+    (*params_min)->n = (*params_min)->nalloc;
+    (*params_max)->n = (*params_max)->nalloc;
 
     beta_lim[0][0].data.F32[0] = 1000;
@@ -116 +119 @@
 
     psVector *contour = psVectorAlloc (Nt, PS_TYPE_F32);
+    contour->n = contour->nalloc;
     for (t = 0, N = 0; (t < 2*M_PI) && (N < Nt); t += dt) {
         x = ct*axes.major*cos(t) + st*axes.minor*sin(t) + xo;