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

Timestamp:

Sep 21, 2007, 11:45:00 AM (19 years ago)

Author:

eugene

Message:

updating psf parameter to pmTrend2D

File:

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

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

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-21 00:06:57 $
+ *  @version $Revision: 1.45.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-21 21:45:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -58 +58 @@
 
 // allocate a pmPSFtry based on the desired sources and the model (identified by name)
-pmPSFtry *pmPSFtryAlloc (psArray *sources, char *modelName, bool poissonErrors, psPolynomial2D *psfTrendMask)
+pmPSFtry *pmPSFtryAlloc (psArray *sources, char *modelName, pmPSFOptions *options)
 {
 
     // validate the requested model name
-    pmModelType type = pmModelClassGetType (modelName);
-    if (type == -1) {
+    options->type = pmModelClassGetType (modelName);
+    if (options->type == -1) {
         psError (PS_ERR_UNKNOWN, true, "invalid model name %s", modelName);
         return NULL;
@@ -70 +70 @@
     pmPSFtry *test = (pmPSFtry *) psAlloc(sizeof(pmPSFtry));
 
-    test->psf       = pmPSFAlloc (type, poissonErrors, psfTrendMask);
+    test->psf       = pmPSFAlloc (options);
     test->metric    = psVectorAlloc (sources->n, PS_TYPE_F32);
     test->metricErr = psVectorAlloc (sources->n, PS_TYPE_F32);
@@ -99 +99 @@
 
 // generate a pmPSFtry with a copy of the test PSF sources
-pmPSFtry *pmPSFtryModel (psArray *sources, char *modelName, float RADIUS, bool poissonErrors, psPolynomial2D *psfTrendMask, bool applyWeights, psMaskType maskVal, psMaskType mark)
+pmPSFtry *pmPSFtryModel (psArray *sources, char *modelName, pmPSFOptions *options, psMaskType maskVal, psMaskType mark)
 {
     bool status;
@@ -105 +105 @@
     int Npsf = 0;
 
-    pmPSFtry *psfTry = pmPSFtryAlloc (sources, modelName, poissonErrors, psfTrendMask);
+    // XXX use the options structure here instead?
+
+    pmPSFtry *psfTry = pmPSFtryAlloc (sources, modelName, options);
     if (psfTry == NULL) {
         psError (PS_ERR_UNKNOWN, false, "failed to allocate psf model");
@@ -124 +126 @@
 
         // set object mask to define valid pixels
-        psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, RADIUS, "OR", mark);
+        psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, options->radius, "OR", mark);
 
         // fit model as EXT, not PSF
@@ -140 +142 @@
 
     // stage 2: construct a psf (pmPSF) from this collection of model fits
-    if (!pmPSFFromPSFtry (psfTry, applyWeights)) {
+    if (!pmPSFFromPSFtry (psfTry, options->applyWeights)) {
         psError(PS_ERR_UNKNOWN, false, "failed to construct a psf model from collection of sources");
         psFree(psfTry);
@@ -162 +164 @@
             continue;
         }
-        source->modelPSF->radiusFit = RADIUS;
+        source->modelPSF->radiusFit = options->radius;
 
         // set object mask to define valid pixels
-        psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, RADIUS, "OR", mark);
+        psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, options->radius, "OR", mark);
 
         // fit the PSF model to the source
@@ -241 +243 @@
 
     // XXX this function wants aperture radius for pmSourcePhotometry
-    pmPSFtryMetric (psfTry, RADIUS);
+    pmPSFtryMetric (psfTry, options->radius);
     psLogMsg ("psphot.pspsf", 3, "try model %s, ap-fit: %f +/- %f : sky bias: %f\n",
               modelName, psfTry->psf->ApResid, psfTry->psf->dApResid, psfTry->psf->skyBias);
@@ -501 +503 @@
     psFree (z);
     psFree (dz);
-    return (true);
+    return true;
 }