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

Timestamp:

Sep 23, 2007, 5:00:44 PM (19 years ago)

Author:

eugene

Message:

converted pmPSF to use pmTrend2D to represent psf parameters; updated PSF I/O to handle full 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.2.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-22 13:47:28 $
+ *  @version $Revision: 1.28.2.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-24 03:00:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -48 +48 @@
     if (!options) return;
 
-    psFree (options->image);
     psFree (options->stats);
     return;
@@ -60 +59 @@
     options->type          = 0;
 
-    options->image         = NULL;
     options->stats         = NULL;
 
@@ -66 +64 @@
     options->psfTrendNx    = 0;
     options->psfTrendNy    = 0;
+    options->psfFieldNx    = 0;
+    options->psfFieldNy    = 0;
+    options->psfFieldXo    = 0;
+    options->psfFieldYo    = 0;
 
     options->poissonErrorsPhotLMM = true;
@@ -84 +86 @@
 
     psFree (psf->ChiTrend);
+    psFree (psf->psfTrendStats);
     psFree (psf->ApTrend);
     psFree (psf->FluxScale);
@@ -164 +167 @@
     // PM_PAR_XPOS, etc)
 
-    psf->Nx = options->image->numCols;
-    psf->Ny = options->image->numRows;
+    psImageBinning *binning = psImageBinningAlloc();
+    binning->nXruff = options->psfTrendNx;
+    binning->nYruff = options->psfTrendNy;
+    binning->nXfine = options->psfFieldNx;
+    binning->nYfine = options->psfFieldNy;
+    psImageBinningSetSkipByOffset (binning, options->psfFieldXo, options->psfFieldYo);
+
+    psf->fieldNx = options->psfFieldNx;
+    psf->fieldNy = options->psfFieldNy;
+    psf->fieldXo = options->psfFieldXo;
+    psf->fieldYo = options->psfFieldYo;
 
     // define the parameter trends
@@ -175 +187 @@
             if (i == PM_PAR_YPOS) continue;
 
-            psf->params->data[i] = pmTrend2DAlloc (options->psfTrendMode, options->image, options->psfTrendNx, options->psfTrendNx, options->stats);
+            psf->params->data[i] = pmTrend2DNoImageAlloc (options->psfTrendMode, binning, options->stats);
         }
     }
+    psFree (binning);
     return psf;
 }