Changeset 40830 for branches/eam_branches/ohana.20190329/src/opihi/cmd.data/cut.c

Timestamp:

Jul 9, 2019, 4:40:10 PM (7 years ago)

Author:

eugene

Message:

allow the extraction and the cut to extend beyond the valid image pixels (and fill with nan values)

File:

• branches/eam_branches/ohana.20190329/src/opihi/cmd.data/cut.c (modified) (7 diffs)

branches/eam_branches/ohana.20190329/src/opihi/cmd.data/cut.c

@@ -1 +1 @@
 # include "data.h"
 
-enum {SUM, MEAN, MEDIAN, INNER};
+enum {SUM, MEAN, MEDIAN, INNER, NGOOD};
 
 double cutstat (float *value, int Nvalue, int mode) {
@@ -50 +50 @@
     return output;
   }
+  if (mode == NGOOD) {
+    return Nvalue;
+  }
   if ((mode == MEAN) || (mode == SUM)) {
     for (int i = 0; i < Nvalue; i++) {
@@ -70 +73 @@
 
   Mode = SUM;
+  if ((N = get_argument (argc, argv, "-sum"))) {
+    remove_argument (N, &argc, argv);
+    Mode = SUM;
+  }
   if ((N = get_argument (argc, argv, "-median"))) {
     remove_argument (N, &argc, argv);
@@ -81 +88 @@
     remove_argument (N, &argc, argv);
     Mode = INNER;
+  }
+  if ((N = get_argument (argc, argv, "-ngood"))) {
+    remove_argument (N, &argc, argv);
+    Mode = NGOOD;
   }
 
@@ -98 +109 @@
   Ny = buf[0].matrix.Naxis[1];
 
-  if ((sx < 0) || (sy < 0) || (sx+nx > Nx) || (sy+ny > Ny)) {
-    gprint (GP_ERR, "region out of range\n");
+  // ny & nx do not need to be constrained by the buffer, but they do need to be sensible
+  if ((nx < 0) || (ny < 0) || (nx > 1e8) || (ny > 1e8)) {
+    gprint (GP_ERR, "warning : extraction size is crazy: %d,%d\n", nx, ny);
     return (FALSE);
   }
@@ -119 +131 @@
 
     for (i = 0; i < nx; i++) {
+      // for out-of-range areas, set the output pixels to NAN
+      if (i + sx < 0) {
+        yvec[0].elements.Flt[i] = NAN;
+        continue;
+      }
+      if (i + sx >= Nx) {
+        yvec[0].elements.Flt[i] = NAN;
+        continue;
+      }
+
       /* accumulate values */
+      // skip out-of-range areas in y
+      if (sy < 0) {
+        ny += sy;
+        sy = 0;
+      }
+      if (sy > Ny) sy = Ny;
+      if (sy + ny >= Ny) ny = Ny - sy;
+
       Vin = (float *)(buf[0].matrix.buffer) + sy*Nx + sx + i; 
       int Npix = 0;
       for (j = 0; j < ny; j++, Vin += Nx) {
         if (!isfinite(*Vin)) continue;
-        Vbuf[j] = *Vin;
+        Vbuf[Npix] = *Vin;
         Npix ++;
       }
@@ -143 +173 @@
 
     for (i = 0; i < ny; i++) {
+      // for out-of-range areas, set the output pixels to NAN
+      if (i + sy < 0) {
+        yvec[0].elements.Flt[i] = NAN;
+        continue;
+      }
+      if (i + sy >= Ny) {
+        yvec[0].elements.Flt[i] = NAN;
+        continue;
+      }
+
       /* accumulate values */
+      // skip out-of-range areas in x
+      if (sx < 0) {
+        nx += sx;
+        sx = 0;
+      }
+      if (sx > Nx) sx = Nx;
+      if (sx + nx >= Nx) nx = Nx - sx;
+
       Vin = (float *)(buf[0].matrix.buffer) + (sy + i)*Nx + sx; 
       int Npix = 0;
       for (j = 0; j < nx; j++, Vin ++) {
         if (!isfinite(*Vin)) continue;
-        Vbuf[j] = *Vin;
+        Vbuf[Npix] = *Vin;
         Npix ++;
       }