Changeset 14992

Timestamp:

Sep 23, 2007, 5:02:22 PM (19 years ago)

Author:

eugene

Message:

converted pmPSF to use pmTrend2D to represent psf parameters

Location:

branches/eam_branch_20070921/psphot/src

Files:

• models/pmModel_STRAIL.c (modified) (2 diffs)
• models/pmModel_TEST1.c (modified) (2 diffs)
• psphotChoosePSF.c (modified) (2 diffs)

branches/eam_branch_20070921/psphot/src/models/pmModel_STRAIL.c

@@ -530 +530 @@
  
     for (int i = 4; i < 7; i++) { 
-      psPolynomial2D *poly = psf->params->data[i-4]; 
-        out[i] = psPolynomial2DEval (poly, out[2], out[3]); 
+      pmTrend2D *trend = psf->params->data[i-4]; 
+        out[i] = pmTrend2DEval (trend, out[2], out[3]); 
     } 
     return(true); 
@@ -554 +554 @@
     for (int i = 0; i < psf->params->n; i++) {
         if (i == PM_PAR_SKY) continue;
-        psPolynomial2D *poly = psf->params->data[i];
-        assert (poly);
-        PAR[i] = psPolynomial2DEval(poly, Xo, Yo);
+        pmTrend2D *trend = psf->params->data[i];
+        PAR[i] = pmTrend2DEval(trend, Xo, Yo);
     }
 

branches/eam_branch_20070921/psphot/src/models/pmModel_TEST1.c

@@ -217 +217 @@
             out[i] = in[i];
         } else {            
-            psPolynomial2D *poly = psf->params->data[i];
-            out[i] = psPolynomial2DEval(poly, in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
+            pmTrend2D *trend = psf->params->data[i];
+            out[i] = pmTrend2DEval(trend, in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
         }
     }
@@ -246 +246 @@
     for (int i = 0; i < psf->params->n; i++) {
         if (i == PM_PAR_SKY) continue;
-        psPolynomial2D *poly = psf->params->data[i];
-        assert (poly);
-        PAR[i] = psPolynomial2DEval(poly, Xo, Yo);
+        pmTrend2D *trend = psf->params->data[i];
+        PAR[i] = pmTrend2DEval(trend, Xo, Yo);
     }
 

branches/eam_branch_20070921/psphot/src/psphotChoosePSF.c

@@ -54 +54 @@
 
     options->stats = psStatsAlloc (PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV);
-    options->image = psMemIncrRefCounter (readout->image);
+
+    // dimensions of the field for which the PSF is defined
+    options->psfFieldNx = readout->image->numCols;
+    options->psfFieldNy = readout->image->numRows;
+    options->psfFieldXo = readout->image->col0;
+    options->psfFieldYo = readout->image->row0;
 
     pmSourceFitModelInit (15, 0.01, PS_SQR(SKY_SIG), options->poissonErrorsPhotLMM);
@@ -309 +314 @@
     psLogMsg ("psphot.pspsf", PS_LOG_INFO, "psf model %s, ApResid: %f +/- %f\n", modelName, psf->ApResid, psf->dApResid);
 
+    psFree (options);
     return (psf);
 }