Changeset 14986 for branches/eam_branch_20070921/psModules/src/objects/pmPSFtry.c

Timestamp:

Sep 22, 2007, 3:47:28 AM (19 years ago)

Author:

eugene

Message:

fix compilation issues re pmTrend for psf parameters

File:

• branches/eam_branch_20070921/psModules/src/objects/pmPSFtry.c (modified) (8 diffs)

branches/eam_branch_20070921/psModules/src/objects/pmPSFtry.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.45.2.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-22 02:20:11 $
+ *  @version $Revision: 1.45.2.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-22 13:47:28 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -139 +139 @@
 
     // stage 2: construct a psf (pmPSF) from this collection of model fits
-    // XXX take 'applyWeights' from the psf options?
-    if (!pmPSFFromPSFtry (psfTry, options->applyWeights)) {
+    if (!pmPSFFromPSFtry (psfTry)) {
         psError(PS_ERR_UNKNOWN, false, "failed to construct a psf model from collection of sources");
         psFree(psfTry);
@@ -339 +338 @@
 /*****************************************************************************
 pmPSFFromPSFtry (psfTry): build a PSF model from a collection of
-source->modelEXT entires.  The PSF ignores the first 4 (independent) model
+source->modelEXT entries.  The PSF ignores the first 4 (independent) model
 parameters and constructs a polynomial fit to the remaining as a function of
 image coordinate.
@@ -345 +344 @@
 Note: some of the array entries may be NULL (failed fits); ignore them.
  *****************************************************************************/
-bool pmPSFFromPSFtry (pmPSFtry *psfTry, bool applyWeight)
+bool pmPSFFromPSFtry (pmPSFtry *psfTry)
 {
     pmPSF *psf = psfTry->psf;
@@ -355 +354 @@
 
     psVector *dz = NULL;
-    if (applyWeight) {
+    if (psf->poissonErrorsParams) {
         dz = psVectorAlloc (psfTry->sources->n, PS_TYPE_F32);
     }
@@ -420 +419 @@
     if (psTraceGetLevel("psModules.objects") >= 4) {
         FILE *f = fopen ("pol.dat", "w");
-        fprintf (f, "x y  :  e0obs e1obs e2obs  : e0fit e1fit e2fit : mask\n",
+        fprintf (f, "# x y  :  e0obs e1obs e2obs  : e0fit e1fit e2fit : mask\n");
         for (int i = 0; i < e0->n; i++) {
             fprintf (f, "%f %f  :  %f %f %f  : %f %f %f  : %d\n",
@@ -462 +461 @@
         // fit the collection of measured parameters to the PSF 2D model
         // the mask is carried from previous steps and updated with this operation
-        // the weight is either the flux error or NULL, depending on 'applyWeights'
+        // the weight is either the flux error or NULL, depending on 'psf->poissonErrorParams'
         if (!pmTrend2DFit (psf->params->data[i], psfTry->mask, 0xff, x, y, e0, NULL)) {
             psError(PS_ERR_UNKNOWN, false, "failed to build psf model for parameter %d", i);
-            psFree(stats);
             psFree(x);
             psFree(y);
@@ -502 +500 @@
     }
 
-    psFree (stats);
     psFree (x);
     psFree (y);