Changeset 10198

Timestamp:

Nov 26, 2006, 12:24:45 PM (19 years ago)

Author:

magnier

Message:

removed old model components of pmPSFtry (are kept in the sources array)

added 'applyWeight' parameter to pmPSFFromPSFtry and pmPSFtryModel : this
turns on/off the measured parameter weights when setting the 2D model. off
is probably better to avoid biasing to much to the brightest sources

changed test output to trace options rather than #defs

File:

• trunk/psModules/src/objects/pmPSFtry.c (modified) (14 diffs)

trunk/psModules/src/objects/pmPSFtry.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-20 20:37:50 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-26 22:24:45 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -46 +46 @@
     psFree (test->psf);
     psFree (test->sources);
-    // psFree (test->modelEXT);
-    // psFree (test->modelPSF);
     psFree (test->metric);
     psFree (test->metricErr);
@@ -73 +71 @@
     test->fitMag    = psVectorAlloc (sources->n, PS_TYPE_F64);
     test->mask      = psVectorAlloc (sources->n, PS_TYPE_U8);
-    // test->modelEXT  = psArrayAlloc (sources->n);
-    // test->modelPSF  = psArrayAlloc (sources->n);
 
     test->sources   = psArrayAlloc (sources->n);
@@ -83 +79 @@
         test->metricErr->data.F64[i] = 0;
         test->fitMag->data.F64[i] = 0;
-        // test->modelEXT->data[i] = NULL;
-        // test->modelPSF->data[i] = NULL;
     }
 
@@ -101 +95 @@
 
 // generate a pmPSFtry with a copy of the test PSF sources
-pmPSFtry *pmPSFtryModel (psArray *sources, char *modelName, float RADIUS, bool poissonErrors, psPolynomial2D *psfTrendMask)
+pmPSFtry *pmPSFtryModel (psArray *sources, char *modelName, float RADIUS, bool poissonErrors, psPolynomial2D *psfTrendMask, bool applyWeights)
 {
     bool status;
@@ -140 +134 @@
             continue;
         }
-        // XXX is this still needed?
-        // psfTry->modelEXT->data[i] = psMemIncrRefCounter (source->modelEXT);
         Next ++;
     }
@@ -148 +140 @@
 
     // stage 2: construct a psf (pmPSF) from this collection of model fits
-    pmPSFFromPSFtry (psfTry);
+    pmPSFFromPSFtry (psfTry, applyWeights);
 
     // stage 3: refit with fixed shape parameters
@@ -168 +160 @@
         psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PM_MASK_MARK);
         status = pmSourceFitModel (source, source->modelPSF, PM_SOURCE_FIT_PSF);
-        // pmModelSub (source->pixels, source->mask, source->modelPSF, false, false);
         psImageKeepCircle (source->mask, x, y, RADIUS, "AND", PS_NOT_U8(PM_MASK_MARK));
 
@@ -176 +167 @@
             continue;
         }
-
-        // otherwise, save the resulting model
-        // psfTry->modelPSF->data[i] = psMemIncrRefCounter (source->modelPSF);
 
         // XXX : use a different aperture radius from the fit radius?
@@ -292 +280 @@
 
     // XXX test dump of fitted model (dump when tracing?)
-    if (1) {
+    if (psTraceGetLevel("psModules.objects") >= 4) {
         FILE *f = fopen ("resid.dat", "w");
         psVector *apfit = psPolynomial1DEvalVector (poly, r2rflux);
@@ -343 +331 @@
 Note: some of the array entries may be NULL (failed fits); ignore them.
  *****************************************************************************/
-bool pmPSFFromPSFtry (pmPSFtry *psfTry)
+bool pmPSFFromPSFtry (pmPSFtry *psfTry, bool applyWeight)
 {
     pmPSF *psf = psfTry->psf;
@@ -351 +339 @@
     psVector *y  = psVectorAlloc (psfTry->sources->n, PS_TYPE_F64);
     psVector *z  = psVectorAlloc (psfTry->sources->n, PS_TYPE_F64);
-    psVector *dz = psVectorAlloc (psfTry->sources->n, PS_TYPE_F64);
+
+    psVector *dz = NULL;
+    if (applyWeight) {
+        dz = psVectorAlloc (psfTry->sources->n, PS_TYPE_F64);
+    }
 
     // construct the x,y terms
@@ -388 +380 @@
 
             z->data.F64[j] = source->modelEXT->params->data.F32[i];
-            dz->data.F64[j] = source->modelEXT->dparams->data.F32[i];
-            // dz->data.F64[j] = 1; // use the model-fitted error? or S/N?
+            if (applyWeight) {
+                dz->data.F64[j] = source->modelEXT->dparams->data.F32[i];
+            }
 
             // for SXY, we actually fit SXY / (SXX^-2  + SYY^-2)
@@ -396 +389 @@
             }
         }
-        // XXX does psfTry->mask need to be init to 0 and set to 1 above?
-        if (!psVectorClipFitPolynomial2D(psf->params_NEW->data[i], stats, psfTry->mask, 0xff, z, dz, x, y)) {
+
+        // 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 parameter error or NULL, depending on 'applyWeights'
+        if (!psVectorClipFitPolynomial2D(psf->params_NEW->data[i], stats, psfTry->mask, 0xff, z, NULL, x, y)) {
             psError(PS_ERR_UNKNOWN, false, "failed to build psf model for parameter %d", i);
             return false;
         }
-        // psTrace ("psphot.psftest", 3, "keeping %d of %d PSF candidates (PSF param %d)\n", Nkeep, psfTry->mask->n, i);
-    }
-
-    // XXX test dump of star parameters vs position (compare with fitted values)
-    if (1) {
+    }
+
+    // test dump of star parameters vs position (compare with fitted values)
+    if (psTraceGetLevel("psModules.objects") >= 4) {
         FILE *f = fopen ("params.dat", "w");