Changeset 35966 for branches/eam_branches/ipp-20130711/psModules/src/objects/models/pmModel_EXP.c

Timestamp:

Aug 19, 2013, 6:40:03 AM (13 years ago)

Author:

eugene

Message:

replace ad-hoc code for central pixel with pmModelCP call

File:

• branches/eam_branches/ipp-20130711/psModules/src/objects/models/pmModel_EXP.c (modified) (2 diffs)

branches/eam_branches/ipp-20130711/psModules/src/objects/models/pmModel_EXP.c

@@ -45 +45 @@
 #include "pmPSFtry.h"
 #include "pmDetections.h"
+#include "pmModel_CentralPixel.h"
 
 #include "pmModel_EXP.h"
@@ -124 +125 @@
     // only worry about the central 4 pixels at most
     psF32 radius = hypot(X, Y);
-    if (radius < 1.0) {
-      // subdivide the central 2,3,4 pixels by Nx,Ny 
-      float Npix = 0.0;
-      float Fpix = 0.0;
-      float Xpix = floor(pixcoord->data.F32[0]) - PAR[PM_PAR_XPOS];
-      float Ypix = floor(pixcoord->data.F32[1]) - PAR[PM_PAR_YPOS];
-      for (float ix = 0.1; ix < 1.0; ix += 0.2) {
-        for (float iy = 0.1; iy < 1.0; iy += 0.2) {
-          psF32 X  = Xpix + ix;
-          psF32 Y  = Ypix + iy;
-          psF32 px = X / PAR[PM_PAR_SXX];
-          psF32 py = Y / PAR[PM_PAR_SYY];
-          psF32 z  = PS_SQR(px) + PS_SQR(py) + PAR[PM_PAR_SXY]*X*Y;
-          
-          // sqrt(z) is r
-          float q = kappa*sqrt(z);
-          psF32 f0 = exp(-q);
-          
-          psF32 f1 = PAR[PM_PAR_I0]*f0;
-          psF32 fx = PAR[PM_PAR_SKY] + f1;
-          Fpix += fx;
-          Npix += 1.0;
-        }
-      }
-      f = Fpix / Npix;
+    if (radius <= 1.5) {
+        f0 = pmModelCP_SersicSubpix (X, Y, PAR[PM_PAR_SXX], PAR[PM_PAR_SXY], PAR[PM_PAR_SYY], 1.0, 51);
+        f1 = PAR[PM_PAR_I0]*f0;
+        f = PAR[PM_PAR_SKY] + f1;
     }