Index: trunk/psModules/src/astrom/pmAstrometryDistortion.c
===================================================================
--- trunk/psModules/src/astrom/pmAstrometryDistortion.c	(revision 9719)
+++ trunk/psModules/src/astrom/pmAstrometryDistortion.c	(revision 9730)
@@ -7,6 +7,6 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-09-15 09:49:01 $
+*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-24 22:55:04 $
 *
 *  Copyright 2006 Institute for Astronomy, University of Hawaii
@@ -54,5 +54,5 @@
 
     if (grads == NULL) {
-        grads = psArrayAlloc (100);
+        grads = psArrayAllocEmpty (100);
     }
 
@@ -76,8 +76,8 @@
             int Ymax = Ymin + DY;
 
-            psVector *L  = psVectorAlloc (100, PS_TYPE_F32);
-            psVector *M  = psVectorAlloc (100, PS_TYPE_F32);
-            psVector *dP = psVectorAlloc (100, PS_TYPE_F32);
-            psVector *dQ = psVectorAlloc (100, PS_TYPE_F32);
+            psVector *L  = psVectorAllocEmpty (100, PS_TYPE_F32);
+            psVector *M  = psVectorAllocEmpty (100, PS_TYPE_F32);
+            psVector *dP = psVectorAllocEmpty (100, PS_TYPE_F32);
+            psVector *dQ = psVectorAllocEmpty (100, PS_TYPE_F32);
             int Npts = 0;
 
@@ -121,5 +121,4 @@
             psStats *stats = psStatsAlloc (PS_STAT_SAMPLE_MEDIAN | PS_STAT_SAMPLE_STDEV);
             psVector *mask = psVectorAlloc (Npts, PS_TYPE_MASK);
-            mask->n = Npts;
             psVectorInit (mask, 0);
 
@@ -175,10 +174,7 @@
         M->data.F32[i] = grad->FP.y;
     }
-    dPdL->n = dQdL->n = dPdM->n = dQdM->n = grads->n;
-    L->n = M->n = grads->n;
 
     psStats *stats = psStatsAlloc (PS_STAT_SAMPLE_MEDIAN | PS_STAT_SAMPLE_STDEV);
     psVector *mask = psVectorAlloc (grads->n, PS_TYPE_MASK);
-    mask->n = grads->n;
     psVectorInit (mask, 0);
 
Index: trunk/psModules/src/astrom/pmAstrometryObjects.c
===================================================================
--- trunk/psModules/src/astrom/pmAstrometryObjects.c	(revision 9719)
+++ trunk/psModules/src/astrom/pmAstrometryObjects.c	(revision 9730)
@@ -8,6 +8,6 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-10-19 02:56:40 $
+*  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-24 22:55:04 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -76,6 +76,5 @@
                             const double RADIUS) // matching radius
 {
-    psArray *matches = psArrayAlloc(x1->n);
-    matches->n = 0;
+    psArray *matches = psArrayAllocEmpty(x1->n);
 
     const double RADIUS_SQR = PS_SQR(RADIUS);
@@ -144,6 +143,4 @@
     /* sort both lists by X coord; st1 first */ \
     psVector *x1 = psVectorAlloc(st1->n, PS_TYPE_F64); \
-    \
-    x1->n = x1->nalloc; \
     for (int i = 0; i < st1->n; i++) { \
         x1->data.F64[i] = ((pmAstromObj *)st1->data[i])->MEMBER->x; \
@@ -153,5 +150,4 @@
     \
     psVector *y1 = psVectorAlloc(st1->n, PS_TYPE_F64); \
-    y1->n = y1->nalloc; \
     for (int i = 0; i < st1->n; i++) { \
         x1->data.F64[i] = ((pmAstromObj *)st1->data[sorted1->data.S32[i]])->MEMBER->x; \
@@ -161,5 +157,4 @@
     /* now st2 */ \
     psVector *x2 = psVectorAlloc(st2->n, PS_TYPE_F64); \
-    x2->n = x2->nalloc; \
     for (int i = 0; i < st2->n; i++) { \
         x2->data.F64[i] = ((pmAstromObj *)st2->data[i])->MEMBER->x; \
@@ -168,5 +163,4 @@
     \
     psVector *y2 = psVectorAlloc(st2->n, PS_TYPE_F64); \
-    y2->n = y2->nalloc; \
     for (int i = 0; i < st2->n; i++) { \
         x2->data.F64[i] = ((pmAstromObj *)st2->data[sorted2->data.S32[i]])->MEMBER->x; \
@@ -236,9 +230,4 @@
     psVector *y = psVectorAlloc (match->n, PS_TYPE_F32);
     psVector *wt = psVectorAlloc (match->n, PS_TYPE_F32);
-    X->n = X->nalloc;
-    Y->n = Y->nalloc;
-    x->n = x->nalloc;
-    y->n = y->nalloc;
-    wt->n = wt->nalloc;
     // take the matched stars, first fit
     for (int i = 0; i < match->n; i++) {
@@ -259,5 +248,4 @@
     // constant errors
     psVector *mask = psVectorAlloc (match->n, PS_TYPE_U8);
-    mask->n = match->n;
     psVectorInit (mask, 0);
 
@@ -352,5 +340,4 @@
 
     psArray *new = psArrayAlloc (old->n);
-    new->n = new->nalloc;
     double cs = cos(angle);
     double sn = sin(angle);
@@ -659,5 +646,4 @@
     // sort the NP values and choose
     psVector *listNP = psVectorAlloc (nPix*nPix, PS_TYPE_U32);
-    listNP->n = nPix*nPix;
     int n = 0;
     for (int i = 0; i < nPix; i++) {
@@ -780,5 +766,4 @@
     psVector *xHist = psVectorAlloc (nBin, PS_TYPE_F32);
     psVector *yHist = psVectorAlloc (nBin, PS_TYPE_F32);
-    xHist->n = yHist->n = nBin;
     psVectorInit (xHist, 0);
     psVectorInit (yHist, 0);