Changeset 40661 for branches/eam_branches/ohana.20190329/src/opihi/cmd.data/medimage_commands.c

Timestamp:

Mar 29, 2019, 6:29:50 PM (7 years ago)

Author:

eugene

Message:

working on deimos

File:

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

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

@@ -17 +17 @@
   Buffer *image;
 
-  if (argc != 3) {
-    gprint (GP_ERR, "USAGE: medimage add (name) (image)\n");
+  Buffer *var = NULL;
+  if ((N = get_argument (argc, argv, "-var"))) {
+    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) [-var var]\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);
+
+XXX: match dimensions wit var image
 
   MedImageType *median = FindMedImage (argv[1]);
@@ -48 +58 @@
   int Ninput = median->Ninput;
   median->Ninput ++;
-  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);
+  REALLOCATE (median->sig, float *, median->Ninput);
+  REALLOCATE (median->var, float *, median->Ninput);
+
+  ALLOCATE (median->sig[Ninput], float, median->Nx*median->Ny);
+  memcpy (median->sig[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);
+  }
 
   return TRUE;
@@ -100 +117 @@
       int Npix = ix + Nx*iy;
       for (n = 0; n < Ninput; n++) {
-        float v = median->buffers[n][Npix];
+        float v = median->sig[n][Npix];
         if (!isfinite(v)) continue;
         value[N] = v;
@@ -106 +123 @@
       }
       if (N == 0) continue;
+
+    XXXX: add in calc options:
+      weighted mean
+      irls
 
       if (CALC_MEAN) {