Changeset 5593

Timestamp:

Nov 25, 2005, 1:13:43 PM (21 years ago)

Author:

eugene

Message:

updated to use psLib.v8, dropping _EAM code everywhere

Location:

trunk/psphot

Files:

• Makefile (modified) (2 diffs)
• doc/notes.txt (modified) (1 diff)
• src/models/pmModel_GAUSS.c (modified) (1 diff)
• src/models/pmModel_PGAUSS.c (modified) (1 diff)
• src/models/pmModel_QGAUSS.c (modified) (1 diff)
• src/models/pmModel_SGAUSS.c (modified) (1 diff)
• src/models/pmModel_TGAUSS.c (modified) (1 diff)
• src/pmObjects_EAM.c (modified) (6 diffs)
• src/pmPSF.c (modified) (2 diffs)
• src/pmPSFtry.c (modified) (2 diffs)
• src/pmPeaksSigmaLimit.c (modified) (1 diff)
• src/psLibUtils.c (modified) (2 diffs)
• src/psMinimize.c (deleted)
• src/psPolynomials.c (deleted)
• src/psphotFitGalaxies.c (modified) (1 diff)

trunk/psphot/Makefile

@@ -36 +36 @@
 $(SRC)/psLibUtils.$(ARCH).o        \
 $(SRC)/psLine.$(ARCH).o            \
-$(SRC)/psMinimize.$(ARCH).o        \
-$(SRC)/psPolynomials.$(ARCH).o     \
 $(SRC)/psEllipse.$(ARCH).o         \
 $(SRC)/psModulesUtils.$(ARCH).o    \
@@ -55 +53 @@
 
 $(SRC)/pmModelGroup.$(ARCH).o: $(MODELS)
-
-# deprecated
 
 FITSOURCE = \

trunk/psphot/doc/notes.txt

@@ -1 +1 @@
 
 Notes on psphot
+
+2005.11.16
+
+  I have made some fixes to make psphot work with pslib rel8_0.  I
+  need to merge psphot with the rel8_0 version of the psMinimize and
+  pmObjects code.  
 
 2005.09.06

trunk/psphot/src/models/pmModel_GAUSS.c

@@ -124 +124 @@
     for (int i = 4; i < 7; i++) {
         psPolynomial2D *poly = psf->params->data[i-4];
-        out[i] = Polynomial2DEval_EAM (poly, out[2], out[3]);
+        out[i] = psPolynomial2DEval (poly, out[2], out[3]);
     }
     return(true);

trunk/psphot/src/models/pmModel_PGAUSS.c

@@ -140 +140 @@
     for (int i = 4; i < 7; i++) {
         psPolynomial2D *poly = psf->params->data[i-4];
-        out[i] = Polynomial2DEval_EAM (poly, out[2], out[3]);
+        out[i] = psPolynomial2DEval (poly, out[2], out[3]);
     }
     return(true);

trunk/psphot/src/models/pmModel_QGAUSS.c

@@ -170 +170 @@
     for (int i = 4; i < 8; i++) {
         psPolynomial2D *poly = psf->params->data[i-4];
-        out[i] = Polynomial2DEval_EAM (poly, out[2], out[3]);
+        out[i] = psPolynomial2DEval (poly, out[2], out[3]);
     }
     return(true);

trunk/psphot/src/models/pmModel_SGAUSS.c

@@ -300 +300 @@
     for (int i = 4; i < 9; i++) {
         psPolynomial2D *poly = psf->params->data[i-4];
-        out[i] = Polynomial2DEval_EAM (poly, out[2], out[3]);
+        out[i] = psPolynomial2DEval (poly, out[2], out[3]);
     }
     return(true);

trunk/psphot/src/models/pmModel_TGAUSS.c

@@ -173 +173 @@
     for (int i = 4; i < 8; i++) {
         psPolynomial2D *poly = psf->params->data[i-4];
-        out[i] = Polynomial2DEval_EAM (poly, out[2], out[3]);
+        out[i] = psPolynomial2DEval (poly, out[2], out[3]);
     }
     return(true);

trunk/psphot/src/pmObjects_EAM.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-10-17 19:04:33 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-11-25 23:13:43 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -999 +999 @@
     int Ncr      = 0;
     int Nsatstar = 0;
-    // psRegion allArray;
+    psRegion allArray = psRegionSet (0, 0, 0, 0);
 
     psVector *starsn = psVectorAlloc (sources->n, PS_TYPE_F32);
@@ -1031 +1031 @@
 
         // XXX EAM : can we use the value of SATURATE if mask is NULL?
-        // XXX EAM *** serious errors in psImageCountPixelMask: inconsistent with psRegion and subimage
-        // allArray = psRegionSet (1, tmpSrc->mask->numCols, 1, tmpSrc->mask->numRows);
-        // int Nsatpix = psImageCountPixelMask (tmpSrc->mask, allArray, PSPHOT_MASK_SATURATED);
-        int Nsatpix = psImageCountPixelMask_EAM (tmpSrc->mask, PSPHOT_MASK_SATURATED);
+        // allArray = psRegionSet (0, 0, 0, 0);
+        int Nsatpix = psImageCountPixelMask (tmpSrc->mask, allArray, PSPHOT_MASK_SATURATED);
 
         // saturated star (size consistent with PSF or larger)
@@ -1648 +1646 @@
                 Ro = 1.0 + fabs (y->data.F32[tmpCnt] - ymodel) / sqrt(PS_SQR(ymodel - So) + PS_SQR(So));
 
-                // psMinimizeLMChi2_EAM takes wt = 1/dY^2
+                // psMinimizeLMChi2 takes wt = 1/dY^2
                 if (source->weight->data.F32[i][j] == 0) {
                   yErr->data.F32[tmpCnt] = 0.0;
@@ -1701 +1699 @@
 
     psTrace (".pmObjects.pmSourceFitModel", 5, "fitting function\n");
-    fitStatus = psMinimizeLMChi2_EAM(myMin, covar, params, paramMask, x, y, yErr, modelFunc);
+
+    fitStatus = psMinimizeLMChi2 (myMin, covar, params, paramMask, x, y, yErr, modelFunc);
     for (int i = 0; i < dparams->n; i++) {
         if ((paramMask != NULL) && paramMask->data.U8[i]) continue;
         dparams->data.F32[i] = sqrt(covar->data.F64[i][i]);
     }
- 
     // XXX EAM: we need to do something (give an error?) if rc is false
     // XXX EAM: psMinimizeLMChi2 does not check convergence
@@ -1724 +1722 @@
     if (paramMask != NULL) {
         psVector *delta = psVectorAlloc (params->n, PS_TYPE_F64);
-        psMinimizeGaussNewtonDelta_EAM (delta, params, NULL, x, y, yErr, modelFunc);
+        psMinimizeGaussNewtonDelta (delta, params, NULL, x, y, yErr, modelFunc);
         for (int i = 0; i < dparams->n; i++) {
             if (!paramMask->data.U8[i]) continue;

trunk/psphot/src/pmPSF.c

@@ -38 +38 @@
     psf->params = psArrayAlloc (Nparams - 4);
     for (int i = 0; i < psf->params->n; i++) {
-        // XXX EAM : make this a user-defined value?
-        // XXX EAM : future version (0.7.0?) psf->params->data[i] = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 1, 1);
+        // XXX EAM : make polynomial order user-specified?
         if (1) {
-            psf->params->data[i] = Polynomial2DAlloc_EAM(PS_POLYNOMIAL_ORD, 1, 1);
+            psf->params->data[i] = psPolynomial2DAlloc(1, 1, PS_POLYNOMIAL_ORD);
         } else {
-            psf->params->data[i] = Polynomial2DAlloc_EAM(PS_POLYNOMIAL_ORD, 0, 0);
+            psf->params->data[i] = psPolynomial2DAlloc(0, 0, PS_POLYNOMIAL_ORD);
         }
     }
@@ -93 +92 @@
 
         // XXX EAM : this is the expected API (cycle 7? cycle 8?)
-        psf->params->data[i] = VectorClipFitPolynomial2D_EAM (psf->params->data[i], stats, mask, 0xff, z, dz, x, y);
+        psf->params->data[i] = psVectorClipFitPolynomial2D (psf->params->data[i], stats, mask, 0xff, z, dz, x, y);
 
         // XXX EAM : drop this when above is implemented...

trunk/psphot/src/pmPSFtry.c

@@ -265 +265 @@
   }
 
-  // linear fit to rfBin, daBin
-  psPolynomial1D *poly = Polynomial1DAlloc_EAM (PS_POLYNOMIAL_ORD, 1);
-
-  // XXX EAM : this is the intended API (cycle 7? cycle 8?) 
+  // linear clipped fit to rfBin, daBin
+  psPolynomial1D *poly = psPolynomial1DAlloc (1, PS_POLYNOMIAL_ORD);
   psStats *fitstat = psStatsAlloc (PS_STAT_SAMPLE_MEDIAN | PS_STAT_SAMPLE_STDEV);
-  poly = VectorClipFitPolynomial1D_EAM (poly, fitstat, maskB, 1, daBin, NULL, rfBin);
-
-  // poly = VectorFitPolynomial1D_EAM (poly, maskB, 1, daBin, NULL, rfBin);
-
-  // XXX EAM : replace this when the above version is implemented
-  // poly = VectorFitPolynomial1DOrd_EAM (poly, maskB, rfBin, daBin, NULL);
-
-  psVector *daBinFit = Polynomial1DEvalVector_EAM (poly, rfBin);
+  poly = psVectorClipFitPolynomial1D (poly, fitstat, maskB, 1, daBin, NULL, rfBin);
+
+  psVector *daBinFit = psPolynomial1DEvalVector (poly, rfBin);
   psVector *daResid  = (psVector *) psBinaryOp (NULL, (void *) daBin, "-", (void *) daBinFit);
 
@@ -326 +319 @@
   stats->clipIter = 3;
 
-  // linear fit to rfBin, daBin
-  psPolynomial1D *poly = Polynomial1DAlloc_EAM (PS_POLYNOMIAL_ORD, 1);
-
-  // XXX EAM : this is the intended API (cycle 7? cycle 8?) 
-  poly = VectorClipFitPolynomial1D_EAM (poly, stats, try->mask, PSFTRY_MASK_ALL, try->metric, NULL, rflux);
-
+  // linear clipped fit to rfBin, daBin
+  psPolynomial1D *poly = psPolynomial1DAlloc (1, PS_POLYNOMIAL_ORD);
+  poly = psVectorClipFitPolynomial1D (poly, stats, try->mask, PSFTRY_MASK_ALL, try->metric, NULL, rflux);
   fprintf (stderr, "fit stats: %f +/- %f\n", stats->sampleMedian, stats->sampleStdev);
-
-  // these stats should come back from the fit above...
-  // psVector *daFit   = Polynomial1DEvalVector_EAM (poly, rflux);
-  // psVector *daResid = (psVector *) psBinaryOp (NULL, (void *) try->metric, "-", (void *) daFit);
-
-  // stats = psStatsAlloc (PS_STAT_CLIPPED_STDEV);
-  // stats->clipIter = 3;
-  // stats->clipSigma = 3;
-
-  // stats = psVectorStats (stats, daResid, NULL, maskB, 1);
 
   try->psf->ApResid = poly->coeff[0];

trunk/psphot/src/pmPeaksSigmaLimit.c

@@ -16 +16 @@
 
     psImage *smooth = psImageCopy (NULL, imdata->image, PS_TYPE_F32);
-    psImageSmooth_EAM (smooth, SIGMA, NSIGMA);
+    psImageSmooth (smooth, SIGMA, NSIGMA);
     psLogMsg ("psphot", 4, "smooth: %f sec\n", psTimerMark ("psphot"));
 

trunk/psphot/src/psLibUtils.c

@@ -1 +1 @@
 # include <strings.h>  // for strncasecmp
+# include <unistd.h>   // for write
 # include <pslib.h>
 # include "psLibUtils.h"
 
-// XXX EAM : this is NOT included in the C99 headers ??
-FILE *fdopen(int fildes, const char *mode);
-
-// XXX EAM : these utility functions should be added back into PSLib
-
-# if (0) // now in psLib (v8)
-static psHash *timers = NULL;
-
-// start/restart a named timer
-bool psTimerStart (char *name) {
-
-    psTime *start;
-
-    if (timers == NULL) timers = psHashAlloc (16);
-
-    start = psTimeGetNow (PS_TIME_UTC);
-    psHashAdd (timers, name, start);
-    psFree (start); 
-    return (TRUE);
-}
-
-bool psTimerClear (char *name) {
-
-  bool status;
-
-  if (name == NULL) return false;
-
-  status = psHashRemove (timers, name);
-  return (status);
-}
-
-// get current elapsed time on named timer
-psF64 psTimerMark (char *name) {
-
-    psTime *start;
-    psTime *mark;
-    psF64   delta;
-
-    if (timers == NULL) return (0);
-
-    start = psHashLookup (timers, name);
-    if (start == NULL) return (0);
-
-    mark = psTimeGetNow (PS_TIME_UTC);
-    delta = psTimeDelta (mark, start);
-    psFree (mark);
-    // psFree (start); -- XXX is psHashLookup not psMemCopying?
-
-    return (delta);
-}
-
-void psTimerFree () {
-
-  psFree (timers);
-  p_psTimeFinalize();
-  return;
-}
-# endif
-
-# if (0)
-// find the location of the specified argument
-int psArgumentGet (int argc, char **argv, char *arg) {
-
-    int i;
-
-    for (i = 0; i < argc; i++) {
-        if (!strcmp(argv[i], arg))
-            return (i);
-    }
-  
-    return ((int)NULL);
-}
-
-// remove the specified argument (by location)
-int psArgumentRemove (int N, int *argc, char **argv) {
-
-    int i;
-
-    if ((N != (int)NULL) && (N != 0)) {
-        (*argc)--;
-        for (i = N; i < *argc; i++) {
-            argv[i] = argv[i+1];
-        }
-    }
-
-    return (N);
-}
-# endif
-
+// XXX EAM : These two functions (psLogArguments and psTraceArguments) have been 
+//           rolled together into a single function in psLib
 // we have log levels 1 (Error), 2 (Warning), 3 (Info), 4 (Details), 5 (Minutiae)
 // 2 = default, -v = 3, -vv = 4, -vvv = 5 
@@ -151 +65 @@
 }
 
-# if (0)
-// alternate implementation of this function from pmObjects.c
-// now defined in psLib SDRS as psImageRow
-psVector *psGetRowVectorFromImage(psImage *image,
-                                  psU32 row)
-{
-    PS_ASSERT_IMAGE_NON_NULL(image, NULL);
-    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL);
-
-    psVector *tmpVector = psVectorAlloc(image->numCols, PS_TYPE_F32);
-    memcpy (tmpVector->data.F32, image->data.F32[row], image->numCols*sizeof(psF32));
-    return(tmpVector);
-}
-# endif
-
-// XXX EAM : this is now in psLib
-void psImageSmooth_EAM (psImage *image, float sigma, float Nsigma) {
-
-    int Nx, Ny, Npixel, Nrange;
-    float factor, g, s;
-    psVector *temp;
-
-    // relevant terms
-    Nrange = sigma*Nsigma + 0.5;
-    Npixel = 2*Nrange + 1;
-    factor = -0.5/(sigma*sigma);
-
-    Nx = image->numCols;
-    Ny = image->numRows;
-
-    // generate gaussian
-    psVector *gaussnorm = psVectorAlloc (Npixel, PS_TYPE_F32);
-    for (int i = -Nrange; i < Nrange + 1; i++) {
-        gaussnorm->data.F32[i+Nrange] = exp (factor*i*i);
-    }
-    psF32 *gauss = &gaussnorm->data.F32[Nrange];
-
-    // smooth in X direction
-    temp = psVectorAlloc (Nx, PS_TYPE_F32);
-    for (int j = 0; j < Ny; j++) {
-        psF32 *vi = image->data.F32[j];
-        psF32 *vo = temp->data.F32;
-        for (int i = 0; i < Nx; i++) {
-            g = s = 0;
-            for (int n = -Nrange; n < Nrange + 1; n++) {
-                if (i+n < 0) continue;
-                if (i+n >= Nx) continue;
-                s += gauss[n]*vi[i+n];
-                g += gauss[n];
-            }
-            vo[i] = s / g;
-        }
-        memcpy (image->data.F32[j], temp->data.F32, Nx*sizeof(psF32));
-    }
-    psFree (temp);
-
-    // smooth in Y direction
-    temp = psVectorAlloc (image->numRows, PS_TYPE_F32);
-    for (int i = 0; i < Nx; i++) {
-        psF32  *vo = temp->data.F32;
-        psF32 **vi = image->data.F32;
-        for (int j = 0; j < Ny; j++) {
-            g = s = 0;
-            for (int n = -Nrange; n < Nrange + 1; n++) {
-                if (j+n < 0) continue;
-                if (j+n >= Ny) continue;
-                s += gauss[n]*vi[j+n][i];
-                g += gauss[n];
-            }
-            vo[j] = s / g;
-        }
-        // replace temp in image
-        for (int j = 0; j < Ny; j++) {
-            vi[j][i] = vo[j];
-        }
-    }
-    psFree (temp);
-    psFree (gaussnorm);
-}
-    
-bool psImageInit (psImage *image,...) {
-
-  va_list argp;
-  psU8  vU8;
-  psF32 vF32;
-  psF64 vF64;
-
-  if (image == NULL) return (false);
-
-  va_start (argp, image);
-
-  switch (image->type.type) {
-    case PS_TYPE_U8:
-      vU8 = va_arg (argp, psU32);
-
-      for (int iy = 0; iy < image->numRows; iy++) {
-        for (int ix = 0; ix < image->numCols; ix++) {
-          image->data.U8[iy][ix] = vU8;
-        }
-      }
-      break;
-
-    case PS_TYPE_F32:
-      vF32 = va_arg (argp, psF64);
-      
-      for (int iy = 0; iy < image->numRows; iy++) {
-        for (int ix = 0; ix < image->numCols; ix++) {
-          image->data.F32[iy][ix] = vF32;
-        }
-      }
-      return (true);
-
-    case PS_TYPE_F64:
-      vF64 = va_arg (argp, psF64);
-
-      for (int iy = 0; iy < image->numRows; iy++) {
-        for (int ix = 0; ix < image->numCols; ix++) {
-          image->data.F64[iy][ix] = vF64;
-        }
-      }
-      return (true);
-
-    default:
-      psAbort ("psphot.psUtils", "datatype %d not defined in psImageInit\n", image->type);
-      return (false);
-  }
-  return (false);
-}           
-
-// now in psLib (v8)
-// count number of pixels with given mask value
-// XXX EAM : version in psLib is broken
-int psImageCountPixelMask_EAM (psImage *mask, psU8 value) 
-{
-    int Npixels = 0;
-  
-    for (int i = 0; i < mask->numRows; i++) {
-        for (int j = 0; j < mask->numCols; j++) {
-            if (mask->data.U8[i][j] & value) {
-                Npixels ++;
-            }
-        }
-    }
-    return (Npixels);
-}
-
-// define a square region centered on the given coordinate
-// XXX EAM : this is now in psLib
-# if (0)
-psRegion *psRegionSquare (psF32 x, psF32 y, psF32 radius) {
-    psRegion *region;
-    region = psRegionAlloc (x - radius, x + radius + 1,    
-                            y - radius, y + radius + 1);
-    return (region);
-}
-# endif
-
-// set actual region based on image parameters:
-// compensate for negative upper limits
-// XXX this is inconsistent: the coordindates should always be in the parent
-//     frame, which means the negative values should subtract from Nx,Ny of
-//     the parent, not the child.  but, we don't carry the dimensions of the 
-//     parent in the psImage container.  for now, use the child Nx,Ny
-//     force range to be on this subimage 
-// XXX EAM : this needs to be changed to use psRegion rather than psRegion*
-// XXX EAM : this is now in psLib
-# if (0)
-psRegion *psRegionForImage (psRegion *out, psImage *image, psRegion *in) {
-    
-    // x0,y0, x1,y1 are in *parent* units
-
-    if (out == NULL) {
-        out = psRegionAlloc(in->x0, in->x1, in->y0, in->y1);
-    } else {
-        *out = *in;
-    }
-    // XXX these are probably wrong (see above)
-    if (out->x1 <= 0) {
-        out->x1 = image->col0 + image->numCols + out->x1;
-    }
-    if (out->y1 <= 0) {
-        out->y1 = image->row0 + image->numRows + out->y1;
-    }
-
-    // force the lower-limits to be on the child
-    out->x0 = PS_MAX(image->col0, out->x0);
-    out->y0 = PS_MAX(image->row0, out->y0);
-
-    // force the upper-limits to be on the child
-    out->x1 = PS_MIN(image->col0 + image->numCols, out->x1);
-    out->y1 = PS_MIN(image->row0 + image->numRows, out->y1);
-    return (out);
-}
-# endif
-
-// mask the area contained by the region
-// the region is defined wrt the parent image
-// XXX EAM : this is now in psLib
-# if (0)
-void psImageMaskRegion (psImage *image, psRegion *region, bool logical_and, int maskValue) {
-
-    for (int iy = 0; iy < image->numRows; iy++) {
-        for (int ix = 0; ix < image->numCols; ix++) {
-            if (ix + image->col0 <  region->x0) continue;
-            if (ix + image->col0 >= region->x1) continue;
-            if (iy + image->row0 <  region->y0) continue;
-            if (iy + image->row0 >= region->y1) continue;
-            if (logical_and) {
-                image->data.U8[iy][ix] &= maskValue;
-            } else {
-                image->data.U8[iy][ix] |= maskValue;
-            }
-        }
-    }
-}
-# endif
-
-// mask the area not contained by the region
-// the region is defined wrt the parent image
-// XXX EAM : this is now in psLib
-# if (0)
-void psImageKeepRegion (psImage *image, psRegion *region, bool logical_and, int maskValue) {
-
-    for (int iy = 0; iy < image->numRows; iy++) {
-        for (int ix = 0; ix < image->numCols; ix++) {
-            if (ix + image->col0 <  region->x0) goto maskit;
-            if (ix + image->col0 >= region->x1) goto maskit;
-            if (iy + image->row0 <  region->y0) goto maskit;
-            if (iy + image->row0 >= region->y1) goto maskit;
-            continue;
-        maskit:
-            if (logical_and) {
-                image->data.U8[iy][ix] &= maskValue;
-            } else {
-                image->data.U8[iy][ix] |= maskValue;
-            }
-        }
-    }
-}
-# endif
-
-// mask the area contained by the region
-// the region is defined wrt the parent image
-// XXX EAM : this is now in psLib
-# if (0)
-void psImageMaskCircle (psImage *image, double x, double y, double radius, bool logical_and, int maskValue) {
-
-    double dx, dy, r2, R2;
-
-    R2 = PS_SQR(radius);
-
-    for (int iy = 0; iy < image->numRows; iy++) {
-        for (int ix = 0; ix < image->numCols; ix++) {
-            dx = ix + image->col0 - x;
-            dy = iy + image->row0 - y;
-            r2 = PS_SQR(dx) + PS_SQR(dy);
-            if (r2 > R2) continue;
-            if (logical_and) {
-                image->data.U8[iy][ix] &= maskValue;
-            } else {
-                image->data.U8[iy][ix] |= maskValue;
-            }
-        }
-    }
-}
-# endif
-
-// mask the area contained by the region
-// the region is defined wrt the parent image
-// XXX EAM : this is now in psLib
-# if (0)
-void psImageKeepCircle (psImage *image, double x, double y, double radius, bool logical_and, int maskValue) {
-
-    double dx, dy, r2, R2;
-
-    R2 = PS_SQR(radius);
-
-    for (int iy = 0; iy < image->numRows; iy++) {
-        for (int ix = 0; ix < image->numCols; ix++) {
-            dx = ix + image->col0 - x;
-            dy = iy + image->row0 - y;
-            r2 = PS_SQR(dx) + PS_SQR(dy);
-            if (r2 < R2) continue;
-            if (logical_and) {
-                image->data.U8[iy][ix] &= maskValue;
-            } else {
-                image->data.U8[iy][ix] |= maskValue;
-            }
-        }
-    }
-}
-# endif
-
-# if (0)
-psVector *psVectorCreate (double lower, double upper, double delta, psElemType type) {
-
-  int nBin = (upper - lower) / delta;
-
-  psVector *out = psVectorAlloc (nBin, type);
-  
-  for (int i = 0; i < nBin; i++) {
-    out->data.F64[i] = lower + i * delta;
-  }
-
-  return (out);
-}
-# endif
-
 // XXX EAM a utility function
 bool p_psVectorPrintRow (int fd, psVector *a, char *name)
 {
 
-    FILE *f;
-    f = fdopen(fd, "a+");
-    fprintf (f, "vector: %s\n", name);
+    char line[1024];
+
+    sprintf (line, "vector: %s\n", name);
+    write (fd, line, strlen(line));
 
     for (int i = 0; i < a[0].n; i++) {
-        fprintf (f, "%f  ", p_psVectorGetElementF64(a, i));
+        sprintf (line, "%f  ", p_psVectorGetElementF64(a, i));
+        write (fd, line, strlen(line));
     }
-    fprintf (f, "\n");
-    fclose(f);
+    write (fd, "\n", 1);
     return (true);
 }
-// XXX EAM is the use of fdopen here a good way to do this?

trunk/psphot/src/psphotFitGalaxies.c

@@ -75 +75 @@
         // fit FLT (not PSF) model (set/unset the pixel mask)
         psImageKeepCircle (source->mask, x, y, model->radius, "OR", PSPHOT_MASK_MARKED);
-        // XXX EAM : 0.5.0 code used _EAM version
-        // status = pmSourceFitModel (source, model, false);
         status = pmSourceFitModel (source, model, false);
         psImageKeepCircle (source->mask, x, y, model->radius, "AND", ~PSPHOT_MASK_MARKED);