Changeset 36239 for branches/eam_branches/ipp-20130904/psModules/src/objects/pmModel_CentralPixel.c

Timestamp:

Oct 25, 2013, 4:52:31 PM (13 years ago)

Author:

eugene

Message:

fixed floor / int problem and failure to hit central pixel

File:

• branches/eam_branches/ipp-20130904/psModules/src/objects/pmModel_CentralPixel.c (modified) (1 diff)

branches/eam_branches/ipp-20130904/psModules/src/objects/pmModel_CentralPixel.c

@@ -704 +704 @@
 
     float delta = 1.0 / (float) Nsub;
-    float off = -Nsub2 * delta;
-    for (float ix = off; ix < 0.5; ix += delta) {
-        for (float iy = off; iy < 0.5; iy += delta) {
-
-            float dX = dx + ix;
-            float dY = dy + iy;
+    // float off = -Nsub2 * delta;
+
+    int Sx = (int) floor(dx / delta);
+    int Sy = (int) floor(dy / delta);
+
+    for (int ix = -Nsub2; ix <= Nsub2; ix++) {
+      float dX = delta * (Sx + ix);
+      for (int iy = -Nsub2; iy <= Nsub2; iy++) {
+        float dY = delta * (Sy + iy);
             float z = PS_SQR(dX / Rxx) + PS_SQR(dY / Ryy) + dX * dY * Rxy;
 
             float q = pow (z, rindex);
             float f = exp(-kappa*q);
+
+            // if ((ix == 0) && (iy == 0)) {
+            //   // fprintf (stderr, "this: %f  %f  %f  --  full : %f %f\n", z, q, f, flux, (float) npix);
+            // }
 
             flux += f;