Changeset 14980 for branches/eam_branch_20070921/psModules/src/objects/pmPSF.c

Timestamp:

Sep 21, 2007, 4:20:17 PM (19 years ago)

Author:

eugene

Message:

updating to use pmTrend for the psf parameters

File:

• branches/eam_branch_20070921/psModules/src/objects/pmPSF.c (modified) (7 diffs)

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

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.28.2.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-21 21:45:00 $
+ *  @version $Revision: 1.28.2.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-22 02:20:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -45 +45 @@
 
 static void pmPSFOptionsFree (pmPSFOptions *options) {
+
+    if (!options) return;
+
+    psFree (options->image);
+    psFree (options->stats);
     return;
 }
@@ -54 +59 @@
 
     options->type          = 0;
-    options->poissonErrors = false;
+
+    options->image         = NULL;
+    options->stats         = NULL;
+
     options->psfTrendMode  = PM_TREND_NONE;
     options->psfTrendNx    = 0;
     options->psfTrendNy    = 0;
+
+    options->poissonErrors = false;
 }
 
@@ -136 +146 @@
     }
     psf->params = psArrayAlloc(Nparams);
+    
+    // save the trend stats on the psf for use in pmPSFFromPSFtry
+    psf->psfTrendStats = psMemIncrRefCounter (options->stats);
 
     // the order of the PSF parameter (X,Y) fits is determined by the psfTrendMask polynomial
@@ -144 +157 @@
     // PM_PAR_XPOS, etc)
 
-    // XXX make this a user option
-    psStats *stats = psStatsAlloc (PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV);
-
-    // XXX define new structure to carry in the psf options
+    // define the parameter trends
     if (options->psfTrendMode != PM_TREND_NONE) {
         for (int i = 0; i < psf->params->n; i++) {
@@ -155 +165 @@
             if (i == PM_PAR_YPOS) continue;
 
-            // XXX need to set stats & image or else nXfine,nYfine
-            pmTrend2D *param = pmTrend2DAlloc (options->psfTrendMode, image, options->psfTrendNx, options->psfTrendNx, stats);
-            psf->params->data[i] = param;
+            psf->params->data[i] = pmTrend2DAlloc (options->psfTrendMode, options->image, options->psfTrendNx, options->psfTrendNx, options->stats);
         }
     }
-    
-    psFree (stats);
     return psf;
 }
@@ -287 +293 @@
 
 // generate a psf model of the requested type, with fixed shape
+// XXX update this.
 pmPSF *pmPSFBuildSimple (char *typeName, float sxx, float syy, float sxy, ...)
 {