Changeset 40662 for branches/eam_branches/ohana.20190329/src/opihi/mana/deimos_mkobj.c

Timestamp:

Mar 31, 2019, 8:47:40 AM (7 years ago)

Author:

eugene

Message:

add vwtmean, virls, medimage wtmean & irls options, spline print

File:

• branches/eam_branches/ohana.20190329/src/opihi/mana/deimos_mkobj.c (modified) (2 diffs)

branches/eam_branches/ohana.20190329/src/opihi/mana/deimos_mkobj.c

@@ -190 +190 @@
     if (psf) Npof -= Npsf;
 
+    // integral and fractional pixel offsets of PSF (none, by default)
+    int dxi = 0;
+    float dxf = 0.0, dxr = 1.0;
+    
     if (psf_trace) {
-      float dx = -spline_apply_dbl (psf_trace->xk, psf_trace->yk, psf_trace->y2, psf_trace->Nknots, iy);
-      Npof += dx;
-    }
+      float dx = spline_apply_dbl (psf_trace->xk, psf_trace->yk, psf_trace->y2, psf_trace->Nknots, iy);
+      dxi = floor(dx);
+      dxf = dx - dxi;  // -1.7 -> +0.3, -0.5 -> +0.5, +0.5 ->+0.5, +1.7 -> +0.7
+      dxr = 1 - dxf;
+      Npof += dxi;
+      if (iy % 200 == 0) { fprintf (stderr, "%d : %f : %d : %f %f\n", iy, dx, dxi, dxf, dxr); }
+    }
+
+    // if fractional offset is small, do not interpolate
+    int doInterp = fabs(dxf) < 1e-5 ? FALSE : TRUE;
 
     // flux = obj * PSF + sky
@@ -205 +216 @@
         // only add in the flux if we are in range of the PSF
         if ((n >= 0) && (n < NpsfFull)) {
-          value += objVy * psfV[n];
+          if (doInterp) {
+            if ((n > 0) && (n < NpsfFull)) {
+              value += objVy*psfV[n]*dxr + objVy*psfV[n-1]*dxf;
+            }
+            if (n == 0) {
+              value += objVy*psfV[n]*dxr;
+            }
+          } else {
+            value += objVy*psfV[n];
+          }
         }
       } else {