Changeset 31144

Timestamp:

Apr 4, 2011, 11:07:41 AM (15 years ago)

Author:

eugene

Message:

add -density to skycoverage; update fit1d,2d usage line

Location:

branches/eam_branches/ipp-20110213/Ohana/src/opihi

Files:

• cmd.data/fit1d.c (modified) (1 diff)
• cmd.data/fit2d.c (modified) (1 diff)
• dvo/skycoverage.c (modified) (7 diffs)

branches/eam_branches/ipp-20110213/Ohana/src/opihi/cmd.data/fit1d.c

@@ -42 +42 @@
 
   if (argc != 4) {
-    gprint (GP_ERR, "USAGE: fit x y order [-dy wt] [-quiet/-q] [-clip Nsigma Niter]\n");
+    gprint (GP_ERR, "USAGE: fit1d x y order [-dy wt] [-quiet/-q] [-clip Nsigma Niter]\n");
     return (FALSE);
   }

branches/eam_branches/ipp-20110213/Ohana/src/opihi/cmd.data/fit2d.c

@@ -48 +48 @@
 
   if (argc != 5) {
-    gprint (GP_ERR, "USAGE: fit x y z order [-dz wt]\n");
+    gprint (GP_ERR, "USAGE: fit2d x y z order [-dz wt] [-quiet/-q] [-clip Nsigma Niter]\n");
     return (FALSE);
   }

branches/eam_branches/ipp-20110213/Ohana/src/opihi/dvo/skycoverage.c

@@ -5 +5 @@
 int skycoverage (int argc, char **argv) {
 
-  int WITH_MOSAIC, SOLO_MOSAIC;
+  int WITH_MOSAIC, SOLO_MOSAIC, ShowDensity;
   off_t i, Nimage;
   int N, status, TimeSelect, ByName, xs, ys;
@@ -60 +60 @@
   }
 
+  ShowDensity = FALSE;
+  if ((N = get_argument (argc, argv, "-density"))) {
+    remove_argument (N, &argc, argv);
+    ShowDensity = TRUE;
+  }
+
   ByName = FALSE;
   if ((N = get_argument (argc, argv, "-name"))) {
@@ -141 +147 @@
   if (argc != 3) {
     gprint (GP_ERR, "USAGE: skycoverage (buffer) (Npts)\n");
-    gprint (GP_ERR, "  options: [-scale pixscale] [-center ra dec] [-size Nx Nx] [-proj projection] [-time start range] [-trange start stop] [-name name] [-photcode name] [+mosaic] [-mosaic]\n");
+    gprint (GP_ERR, "  options: [-scale pixscale] [-center ra dec] [-size Nx Nx] [-proj projection] [-time start range] [-trange start stop] [-name name] [-photcode name] [+mosaic] [-mosaic] [-density]\n");
     gprint (GP_ERR, "       (buffer) saves bitmapped image\n");
     gprint (GP_ERR, "       (Npts) gives the number of test points per image in each dimension\n");
@@ -148 +154 @@
     gprint (GP_ERR, "       -size (Nx) (Ny)    : specifies the size of the image [360/scale, 180/scale]\n");
     gprint (GP_ERR, "       -proj (projection) : specifies the projection choice [AIT]\n");
+    gprint (GP_ERR, "       -density           : create image with relative density (else binary on/off)\n");
     gprint (GP_ERR, "       note: we need 64800 / (pixscale)^2 pixels to represent the sky\n");
     return (FALSE);
@@ -186 +193 @@
 
   V = (float *)buf[0].matrix.buffer;
-  bzero (V, Nx*Ny*sizeof(float));
 
   for (ys = 0; ys < Ny; ys++) {
@@ -194 +200 @@
       status &= (r <= 360);
       if (status) {
-        V[ys*Nx + xs] = 2;
+        V[ys*Nx + xs] = ShowDensity ?  0 : 2;
+      } else {
+        V[ys*Nx + xs] = ShowDensity ? -1 : 0;
       }
     }
@@ -249 +257 @@
           xs = (int)Xs;
           ys = (int)Ys;
-          V[ys*Nx + xs] = 1;
+          if (ShowDensity) {
+              V[ys*Nx + xs] += 1;
+          } else {
+              V[ys*Nx + xs] = 1;
+          }
         }
       }