Changeset 40659 for trunk/Ohana/src/opihi/mana/deimos_mkobj.c

Timestamp:

Mar 29, 2019, 4:23:48 PM (7 years ago)

Author:

eugene

Message:

fix some fitting details (slit tilt interpolation)

File:

• trunk/Ohana/src/opihi/mana/deimos_mkobj.c (modified) (3 diffs)

trunk/Ohana/src/opihi/mana/deimos_mkobj.c

@@ -208 +208 @@
 
   float sin_stilt = sin(stilt*RAD_DEG);
-  int Nyk = ceil(Nx * fabs(sin_stilt));
+  int Nyk = ceil(Nx * fabs(sin_stilt)) + 1; // one extra pixel buffer
   if (Nyk < 3) Nyk = 3; // minimum of 3 pixels (or kernel assumption below fails)
   Nyk += NlsfFull;
@@ -260 +260 @@
       myAssert (Nkpix_i < Nkpix, "oops");
       kernel[Nkpix_i] = dyf;
-      // fprintf (stderr, "%d, %d: %f %f\n", ix, (dyi + Nyk2), kernel[ix + (dyi + Nyk2 + 0)*Nx], kernel[ix + (dyi + Nyk2 + 1)*Nx]);
+      fprintf (stderr, "%d, %d: %f %f\n", ix, (dyi + Nyk2), kernel[ix + (dyi + Nyk2 + 0)*Nx], kernel[ix + (dyi + Nyk2 + 1)*Nx]);
     }
   }
@@ -280 +280 @@
         opihi_flt g = 0.0, s = 0.0;
         for (int n = -Nyk2; n <= Nyk2; n++) {
-          if (iy + n < 0) continue; // bottom edge of full image
-          if (iy + n >= Ny) continue; // top edge of full image
+          if (iy - n < 0) continue; // bottom edge of full image
+          if (iy - n >= Ny) continue; // top edge of full image
           int Nkpix_i = ix + (n + Nyk2)*Nx;
           myAssert (Nkpix_i < Nkpix, "oops");
-          s += kernel[Nkpix_i]*s1[ix + (iy + n)*Nx];
+          s += kernel[Nkpix_i]*s1[ix + (iy - n)*Nx];
           g += kernel[Nkpix_i];
         }