Changeset 14972 for branches/eam_branch_20070921/psModules/src/objects/pmPSF.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/pmPSF.c (modified) (5 diffs)

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

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.28.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-21 18:55:11 $
+ *  @version $Revision: 1.28.2.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-21 21:45:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -41 +41 @@
 
 /*****************************************************************************/
-/* DEFINE STATEMENTS                                                         */
-/*****************************************************************************/
-
-/*****************************************************************************/
-/* TYPE DEFINITIONS                                                          */
-/*****************************************************************************/
-
-/*****************************************************************************/
-/* GLOBAL VARIABLES                                                          */
-/*****************************************************************************/
-
-/*****************************************************************************/
-/* FILE STATIC VARIABLES                                                     */
-/*****************************************************************************/
-
-/*****************************************************************************/
-/* FUNCTION IMPLEMENTATION - LOCAL                                           */
-/*****************************************************************************/
-
-/*****************************************************************************/
 /* FUNCTION IMPLEMENTATION - PUBLIC                                          */
 /*****************************************************************************/
 
 static void pmPSFOptionsFree (pmPSFOptions *options) {
-
     return;
 }
@@ -72 +51 @@
 
     pmPSFOptions *options = (pmPSFOptions *) psAlloc(sizeof(pmPSFOptions));
+    psMemSetDeallocator(options, (psFreeFunc) pmPSFOptionsFree);
 
     options->type          = 0;
     options->poissonErrors = false;
-    options->psfTrendMode  = PM_TREND_MAP;
+    options->psfTrendMode  = PM_TREND_NONE;
     options->psfTrendNx    = 0;
     options->psfTrendNy    = 0;
@@ -115 +95 @@
 
     pmPSF *psf = (pmPSF *) psAlloc(sizeof(pmPSF));
+    psMemSetDeallocator(psf, (psFreeFunc) pmPSFFree);
 
     psf->type     = options->type;
@@ -163 +144 @@
     // 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
-    if (psfTrendMask) {
+    if (options->psfTrendMode != PM_TREND_NONE) {
         for (int i = 0; i < psf->params->n; i++) {
-            if (i == PM_PAR_SKY)
-                continue;
-            if (i == PM_PAR_I0)
-                continue;
-            if (i == PM_PAR_XPOS)
-                continue;
-            if (i == PM_PAR_YPOS)
-                continue;
-
-            // XXX need to set stats, image
+            if (i == PM_PAR_SKY) continue;
+            if (i == PM_PAR_I0) continue;
+            if (i == PM_PAR_XPOS) continue;
+            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;
         }
     }
-
-    psMemSetDeallocator(psf, (psFreeFunc) pmPSFFree);
-    return(psf);
+    
+    psFree (stats);
+    return psf;
 }