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

Timestamp:

Sep 21, 2007, 8:55:12 AM (19 years ago)

Author:

eugene

Message:

converting psf parameters to pmTrend2D

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 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-21 02:46:25 $
+ *  @version $Revision: 1.28.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-21 18:55:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -64 +64 @@
 /*****************************************************************************/
 
+static void pmPSFOptionsFree (pmPSFOptions *options) {
+
+    return;
+}
+
+pmPSFOptions *pmPSFOptionsAlloc () {
+
+    pmPSFOptions *options = (pmPSFOptions *) psAlloc(sizeof(pmPSFOptions));
+
+    options->type          = 0;
+    options->poissonErrors = false;
+    options->psfTrendMode  = PM_TREND_MAP;
+    options->psfTrendNx    = 0;
+    options->psfTrendNy    = 0;
+}
+
 /*****************************************************************************
 pmPSFFree(psf): function to free a pmPSF structure
@@ -94 +110 @@
  Object Normalization
  *****************************************************************************/
-pmPSF *pmPSFAlloc (pmModelType type, bool poissonErrors, psPolynomial2D *psfTrendMask)
+pmPSF *pmPSFAlloc (pmPSFOptions *options)
 {
     int Nparams;
@@ -100 +116 @@
     pmPSF *psf = (pmPSF *) psAlloc(sizeof(pmPSF));
 
-    psf->type     = type;
+    psf->type     = options->type;
     psf->chisq    = 0.0;
     psf->ApResid  = 0.0;
@@ -108 +124 @@
     psf->nPSFstars  = 0;
     psf->nApResid   = 0;
-    psf->poissonErrors = poissonErrors;
+    psf->poissonErrors = options->poissonErrors;
 
     // the ApTrend components are (x, y).  It may be represented with a polynomial or with a
@@ -147 +163 @@
     // PM_PAR_XPOS, etc)
 
+    // XXX define new structure to carry in the psf options
     if (psfTrendMask) {
         for (int i = 0; i < psf->params->n; i++) {
@@ -158 +175 @@
                 continue;
 
-            psPolynomial2D *param = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, psfTrendMask->nX, psfTrendMask->nY);
-            for (int nx = 0; nx < param->nX + 1; nx++) {
-                for (int ny = 0; ny < param->nY + 1; ny++) {
-                    param->mask[nx][ny] = psfTrendMask->mask[nx][ny];
-                }
-            }
+            // XXX need to set stats, image
+            pmTrend2D *param = pmTrend2DAlloc (options->psfTrendMode, image, options->psfTrendNx, options->psfTrendNx, stats);
             psf->params->data[i] = param;
         }