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

Timestamp:

May 27, 2019, 8:42:23 AM (7 years ago)

Author:

eugene

Message:

coding trace analysis to handle bad edge cases; add red & blu sides for trace spline; adding variance to flat-field

File:

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

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

@@ -22 +22 @@
   int N;
   Buffer *image;
-  Buffer *sig = NULL;
-
-  if ((N = get_argument (argc, argv, "-sigma"))) {
-    remove_argument (N, &argc, argv);
-    if ((sig = SelectBuffer (argv[N], OLDBUFFER, TRUE)) == NULL) return (FALSE);
+  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) [-sigma sigma]\n");
+    gprint (GP_ERR, "USAGE: medimage add (name) (image) [-variance variance]\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");
@@ -39 +39 @@
   if ((image = SelectBuffer (argv[2], OLDBUFFER, TRUE)) == NULL) return (FALSE);
 
-  if (sig) {
-    if ((sig->matrix.Naxis[0] != image->matrix.Naxis[0]) ||
-        (sig->matrix.Naxis[1] != image->matrix.Naxis[1])) {
-      gprint (GP_ERR, "sigma buffer does not match image buffer dimensions\n");
+  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;
     }
@@ -68 +68 @@
   // new image should match existing medimage dimensions
 
-  // AddMedImage (median, image, sig);
+  // AddMedImage (median, image, var);
   int Ninput = median->Ninput;
   median->Ninput ++;
   REALLOCATE (median->flx, float *, median->Ninput);
-  REALLOCATE (median->sig, 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->sig[Ninput] = NULL;
-  if (sig) {
-    ALLOCATE (median->sig[Ninput], float, median->Nx*median->Ny);
-    memcpy (median->sig[Ninput], sig->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);
   }
 
@@ -105 +105 @@
     if (mode != CALC_MEDIAN) { gprint (GP_ERR, "supply only one of -mean, -irls, -wtmean\n"); return FALSE; }
     mode = CALC_WTMEAN;
+    remove_argument (N, &argc, argv);
+  }
+
+  Buffer *variance = NULL;
+  if ((N = get_argument (argc, argv, "-variance"))) {
+    remove_argument (N, &argc, argv);
+    if ((variance = SelectBuffer (argv[N], ANYBUFFER, TRUE)) == NULL) return (FALSE);
     remove_argument (N, &argc, argv);
   }
@@ -145 +152 @@
         val[N] = v;
         wgt[N] = 1.0;
-        if (median->sig[n]) {
-          float s = median->sig[n][Npix];
+        if (median->var[n]) {
+          float s = median->var[n][Npix];
           if (!isfinite(s)) continue;
           if (fabs(s) < 2*FLT_MIN) s = 2*FLT_MIN;
-          wgt[N] = 1.0 / SQ(s);
+          wgt[N] = 1.0 / s;
         }
         N++;