Changeset 9771 for trunk/psphot/src/psphotChoosePSF.c

Timestamp:

Oct 28, 2006, 10:32:57 AM (20 years ago)

Author:

eugene

Message:

this is an important change. I have changed the way in which the psf
elliptical contour parameters are defined and fitted. SXX,SYY ->
1/SXX,1/SYY (ie, they are now ~ sigma, not ~1/sigma). SXY is now
fitted with the form SXY/(1/SXX^{2 + 1/SYY}2)²

also added some additional tests and checks

File:

• trunk/psphot/src/psphotChoosePSF.c (modified) (3 diffs)

trunk/psphot/src/psphotChoosePSF.c

@@ -163 +163 @@
 
     // make a model with unit central intensity at the image center
-    modelEXT->params->data.F32[0] = 0;
-    modelEXT->params->data.F32[1] = 1;
-    modelEXT->params->data.F32[2] = 0.5*image->numCols;
-    modelEXT->params->data.F32[3] = 0.5*image->numRows;
+    modelEXT->params->data.F32[PM_PAR_SKY] = 0;
+    modelEXT->params->data.F32[PM_PAR_I0] = 1;
+    modelEXT->params->data.F32[PM_PAR_XPOS] = 0.5*image->numCols;
+    modelEXT->params->data.F32[PM_PAR_YPOS] = 0.5*image->numRows;
 
     // construct a PSF model at this coordinate
@@ -178 +178 @@
     psF64 FWHM_X = 2*modelRadiusFunc (modelPSF->params, 0.5);
 
-    shape.sx  = modelPSF->params->data.F32[4];
-    shape.sy  = modelPSF->params->data.F32[5];
-    shape.sxy = modelPSF->params->data.F32[6];
+    // XXX make sure this is consistent with the re-definition of PM_PAR_SXX
+    shape.sx  = modelPSF->params->data.F32[PM_PAR_SXX];
+    shape.sy  = modelPSF->params->data.F32[PM_PAR_SYY];
+    shape.sxy = modelPSF->params->data.F32[PM_PAR_SXY];
     axes = psEllipseShapeToAxes (shape);
 
@@ -195 +196 @@
 }
 
+// XXX fix this wrt re-definition of PM_PAR_SXX
 bool psphotMomentsStats (pmReadout *readout, psMetadata *recipe, psArray *sources) {