Changeset 6511 for trunk/psModules/src/objects/pmObjects.c

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.

File:

• trunk/psModules/src/objects/pmObjects.c (modified) (18 diffs)

trunk/psModules/src/objects/pmObjects.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-06 22:17:54 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-04 01:01:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -96 +96 @@
 
     psVector *tmpVector = psVectorAlloc(image->numCols, PS_TYPE_F32);
+    tmpVector->n = tmpVector->nalloc;
     for (psU32 col = 0; col < image->numCols ; col++) {
         tmpVector->data.F32[col] = image->data.F32[row][col];
@@ -282 +283 @@
     tmp->params  = psVectorAlloc(Nparams, PS_TYPE_F32);
     tmp->dparams = psVectorAlloc(Nparams, PS_TYPE_F32);
+    tmp->params->n = tmp->params->nalloc;
+    tmp->dparams->n = tmp->dparams->nalloc;
 
     for (psS32 i = 0; i < tmp->params->n; i++) {
@@ -348 +351 @@
         if (vector->data.F32[0] > threshold) {
             tmpVector = psVectorAlloc(1, PS_TYPE_U32);
+            tmpVector->n = 1;
             tmpVector->data.U32[0] = 0;
         } else {
@@ -388 +392 @@
     //
     psVector *tmpVector = psVectorAlloc(count, PS_TYPE_U32);
+    tmpVector->n = tmpVector->nalloc;
     count = 0;
 
@@ -1428 +1433 @@
     //
     psVector *x = psVectorAlloc(2, PS_TYPE_F32);
+    x->n = x->nalloc;
     x->data.F32[0] = (psF32) (col + image->col0);
     x->data.F32[1] = (psF32) (row + image->row0);
@@ -1472 +1478 @@
     psVector *xVec = psVectorAlloc(2 * source->pixels->numRows, PS_TYPE_F32);
     psVector *yVec = psVectorAlloc(2 * source->pixels->numRows, PS_TYPE_F32);
-
+    xVec->n = xVec->nalloc;
+    yVec->n = yVec->nalloc;
     //
     // Start at the row with peak pixel, then decrement.
@@ -1552 +1559 @@
     //
     psArray *tmpArray = psArrayAlloc(2);
+    tmpArray->n = 2;
     tmpArray->data[0] = (psPtr *) yVec;
     tmpArray->data[1] = (psPtr *) xVec;
@@ -1616 +1624 @@
     psVector *y = psVectorAlloc(count, PS_TYPE_F32);
     psVector *yErr = psVectorAlloc(count, PS_TYPE_F32);
+    x->n = x->nalloc;
+    y->n = y->nalloc;
+    yErr->n = yErr->nalloc;
     psS32 tmpCnt = 0;
     for (psS32 i = 0; i < source->pixels->numRows; i++) {
@@ -1621 +1632 @@
             if (source->mask->data.U8[i][j] == 0) {
                 psVector *coord = psVectorAlloc(2, PS_TYPE_F32);
+                coord->n = 2;
                 // XXX: Convert i/j to image space:
                 // XXX EAM: coord order is (x,y) == (col,row)
@@ -1641 +1653 @@
     if (PSF) {
         paramMask = psVectorAlloc (params->n, PS_TYPE_U8);
+        paramMask->n = paramMask->nalloc;
         for (int i = 0; i < 4; i++) {
             paramMask->data.U8[i] = 0;
@@ -1673 +1686 @@
     if (paramMask != NULL) {
         psVector *delta = psVectorAlloc (params->n, PS_TYPE_F64);
+        delta->n = delta->nalloc;
         psMinimizeGaussNewtonDelta (delta, params, NULL, x, y, yErr, modelFunc);
         for (int i = 0; i < dparams->n; i++) {
@@ -1763 +1777 @@
     psVector *y = psVectorAlloc(count, PS_TYPE_F32);
     psVector *yErr = psVectorAlloc(count, PS_TYPE_F32);
+    x->n = x->nalloc;
+    y->n = y->nalloc;
+    yErr->n = yErr->nalloc;
     psS32 tmpCnt = 0;
     for (psS32 i = 0; i < source->pixels->numRows; i++) {
@@ -1768 +1785 @@
             if (source->mask->data.U8[i][j] == 0) {
                 psVector *coord = psVectorAlloc(2, PS_TYPE_F32);
+                coord->n = 2;
                 // XXX: Convert i/j to image space:
                 // XXX EAM: coord order is (x,y) == (col,row)
@@ -1779 +1797 @@
 
                 // this test enhances the weight based on deviation from the model flux
-                Ro = 1.0 + fabs (y->data.F32[tmpCnt] - ymodel) / sqrt(PS_SQR(ymodel - So) + PS_SQR(So));
+                Ro = 1.0 + fabs (y->data.F32[tmpCnt] - ymodel) / sqrt(PS_SQR(ymodel - So)
+                        + PS_SQR(So));
 
                 // psMinimizeLMChi2_EAM takes wt = 1/dY^2
@@ -1798 +1817 @@
     if (PSF) {
         paramMask = psVectorAlloc (params->n, PS_TYPE_U8);
+        paramMask->n = paramMask->nalloc;
         for (int i = 0; i < 4; i++) {
             paramMask->data.U8[i] = 0;
@@ -1846 +1866 @@
     if (paramMask != NULL) {
         psVector *delta = psVectorAlloc (params->n, PS_TYPE_F64);
+        delta->n = delta->nalloc;
         psMinimizeGaussNewtonDelta(delta, params, NULL, x, y, yErr, modelFunc);
         for (int i = 0; i < dparams->n; i++) {
@@ -1897 +1918 @@
 
     psVector *x = psVectorAlloc(2, PS_TYPE_F32);
+    x->n = 2;
     psVector *params = model->params;
     pmModelFunc modelFunc = pmModelFunc_GetFunction (model->type);