Changeset 41340 for trunk/Ohana/src/opihi/cmd.data/medimage_commands.c

Timestamp:

Apr 16, 2020, 1:54:47 PM (6 years ago)

Author:

tdeboer

Message:

revert to working Ohana build

File:

• trunk/Ohana/src/opihi/cmd.data/medimage_commands.c (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.data/medimage_commands.c

@@ -15 +15 @@
 int medimage_add (int argc, char **argv) {
 
-  int N;
   Buffer *image;
-  Buffer *var = NULL;
-
-  if ((N = get_argument (argc, argv, "-variance"))) {
-    remove_argument (N, &argc, argv);
-    if ((var = SelectBuffer (argv[N], OLDBUFFER, TRUE)) == NULL) return (FALSE);
-    remove_argument (N, &argc, argv);
-  }
-
-  if (argc != 3) {
-    gprint (GP_ERR, "USAGE: medimage add (name) (image) [-variance variance]\n");
+
+  if (argc != 3) {
+    gprint (GP_ERR, "USAGE: medimage add (name) (image)\n");
     gprint (GP_ERR, "       add the given image to the set of images to be medianed\n");
-    gprint (GP_ERR, "       optionally supply variance image (for weighted calculations)\n");
     return FALSE;
   }
 
   if ((image = SelectBuffer (argv[2], OLDBUFFER, TRUE)) == NULL) return (FALSE);
-
-  if (var) {
-    if ((var->matrix.Naxis[0] != image->matrix.Naxis[0]) ||
-        (var->matrix.Naxis[1] != image->matrix.Naxis[1])) {
-      gprint (GP_ERR, "variance buffer does not match image buffer dimensions\n");
-      return FALSE;
-    }
-  }
 
   MedImageType *median = FindMedImage (argv[1]);
@@ -63 +46 @@
   // new image should match existing medimage dimensions
 
-  // AddMedImage (median, image, var);
   int Ninput = median->Ninput;
   median->Ninput ++;
-  REALLOCATE (median->flx, float *, median->Ninput);
-  REALLOCATE (median->var, float *, median->Ninput);
-
-  ALLOCATE (median->flx[Ninput], float, median->Nx*median->Ny);
-  memcpy (median->flx[Ninput], image->matrix.buffer, sizeof(float)*median->Nx*median->Ny);
-
-  median->var[Ninput] = NULL;
-  if (var) {
-    ALLOCATE (median->var[Ninput], float, median->Nx*median->Ny);
-    memcpy (median->var[Ninput], var->matrix.buffer, sizeof(float)*median->Nx*median->Ny);
+  REALLOCATE (median->buffers, float *, median->Ninput);
+
+  ALLOCATE (median->buffers[Ninput], float, median->Nx*median->Ny);
+  memcpy (median->buffers[Ninput], image->matrix.buffer, sizeof(float)*median->Nx*median->Ny);
+
+  return TRUE;
+}
+
+int medimage_calc (int argc, char **argv) {
+
+  int ix, iy, n, N;
+  Buffer *output;
+
+  int CALC_MEAN = FALSE;
+  if ((N = get_argument (argc, argv, "-mean"))) {
+    CALC_MEAN = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
+  if (argc != 3) {
+    gprint (GP_ERR, "USAGE: medimage calc (name) (output) [-mean]\n");
+    gprint (GP_ERR, "       calculate the median image for the median image set\n");
+    return FALSE;
+  }
+
+  MedImageType *median = FindMedImage (argv[1]);
+  if (!median) {
+    gprint (GP_ERR, "median image %s not found\n", argv[1]);
+    return FALSE;
+  }
+
+  if ((output = SelectBuffer (argv[2], ANYBUFFER, TRUE)) == NULL) return (FALSE);
+
+  int Ninput = median->Ninput;
+  int Nx = median->Nx;
+  int Ny = median->Ny;
+
+  float *value = NULL;
+  ALLOCATE (value, float, Ninput);
+
+  gfits_free_matrix (&output->matrix);
+  gfits_free_header (&output->header);
+  if (!CreateBuffer (output, Nx, Ny, -32, 0.0, 1.0)) return FALSE;
+
+  float *outvalue = (float *) output->matrix.buffer;
+
+  for (iy = 0; iy < Ny; iy++) {
+    for (ix = 0; ix < Nx; ix++) {
+
+      int N = 0;
+      int Npix = ix + Nx*iy;
+      for (n = 0; n < Ninput; n++) {
+        float v = median->buffers[n][Npix];
+        if (!isfinite(v)) continue;
+        value[N] = v;
+        N++;
+      }
+      if (N == 0) continue;
+
+      if (CALC_MEAN) {
+        float sum = 0.0;
+        for (n = 0; n < N; n++) {
+          sum += value[n];
+        }
+        outvalue[Npix] = sum / (float) N;
+      } else {
+        fsort (value, N);
+        outvalue[Npix] = value[(int)(0.5*N)];
+      }
+    }
   }
 
@@ -82 +124 @@
 
 /* 
-   int medimage_save (int argc, char **argv) {
-
-   int N;
-
-   int APPEND = FALSE;
-   if ((N = get_argument (argc, argv, "-append"))) {
-   APPEND = TRUE;
-   remove_argument (N, &argc, argv);
-   }
-
-   if (argc != 3) {
-   gprint (GP_ERR, "USAGE: medimage save (name) (filename) [-append]\n");
-   return FALSE;
-   }
-
-   if (!SaveMedImage(argv[2], argv[1], APPEND)) {
-   gprint (GP_ERR, "failed to save medimage %s\n", argv[1]);
-   return (FALSE);
-   }
-   return TRUE;
-   }
-
-   int medimage_load (int argc, char **argv) {
-
-   if (argc != 3) {
-   gprint (GP_ERR, "USAGE: medimage load (name) (filename)\n");
-   return FALSE;
-   }
-
-   if (!LoadMedImage(argv[2], argv[1])) {
-   gprint (GP_ERR, "failed to load medimage %s\n", argv[1]);
-   return (FALSE);
-   }
-   return TRUE;
-   }
+int medimage_save (int argc, char **argv) {
+
+  int N;
+
+  int APPEND = FALSE;
+  if ((N = get_argument (argc, argv, "-append"))) {
+    APPEND = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
+  if (argc != 3) {
+    gprint (GP_ERR, "USAGE: medimage save (name) (filename) [-append]\n");
+    return FALSE;
+  }
+
+  if (!SaveMedImage(argv[2], argv[1], APPEND)) {
+    gprint (GP_ERR, "failed to save medimage %s\n", argv[1]);
+    return (FALSE);
+  }
+  return TRUE;
+}
+
+int medimage_load (int argc, char **argv) {
+
+  if (argc != 3) {
+    gprint (GP_ERR, "USAGE: medimage load (name) (filename)\n");
+    return FALSE;
+  }
+
+  if (!LoadMedImage(argv[2], argv[1])) {
+    gprint (GP_ERR, "failed to load medimage %s\n", argv[1]);
+    return (FALSE);
+  }
+  return TRUE;
+}
 */