Changeset 38153 for trunk/Ohana/src/opihi/cmd.data

Timestamp:

Apr 18, 2015, 6:33:51 AM (11 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20150405: add R7 to lensing, fix R5,R6,R7 definitions and mean photometry; calculate E1,E2 in dvolens; fix precision for dvopsps FW objects; fix histograms at axis; new colormap options; require primary skycell in diff mean photometry

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana/src/opihi/cmd.data (modified) (1 prop)
• Ohana/src/opihi/cmd.data/imhist.c (modified) (6 diffs)

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

@@ -3 +3 @@
 int imhist (int argc, char **argv) {
   
-  int i, j, N, Nbins, Quiet;
-  int sx, sy, nx, ny, bin;
-  float *V, delta;
-  double max, min, dx;
+  int i, j, N, Nbins;
+  int bin;
+  float *V;
+  double dx;
   Vector *vec1, *vec2;
   Buffer *buf;
 
-  Quiet = FALSE;
+  int Quiet = FALSE;
   if ((N = get_argument (argc, argv, "-q"))) {
     Quiet = TRUE;
@@ -20 +20 @@
   }
 
-  delta = 0;
+  float delta = 0;
   if ((N = get_argument (argc, argv, "-delta"))) {
     remove_argument (N, &argc, argv);
@@ -27 +27 @@
   }
 
-  min = max = 0.0;
+  int ClipNAN = FALSE;
+  if ((N = get_argument (argc, argv, "-clip-nan"))) {
+    remove_argument (N, &argc, argv);
+    ClipNAN = TRUE;
+  }  
+
+  double min = 0.0, max = 0.0;
   if ((N = get_argument (argc, argv, "-range"))) {
     remove_argument (N, &argc, argv);
@@ -36 +42 @@
   }
 
-  sx = sy = 0.0;
-  nx = ny = 0.0;
+  int sx = 0, sy = 0;
+  int nx = 0, ny = 0;
   if ((N = get_argument (argc, argv, "-region"))) {
     remove_argument (N, &argc, argv);
@@ -84 +90 @@
       V = (float *)(buf[0].matrix.buffer) + j*buf[0].matrix.Naxis[0] + sx; 
       for (i = 0; i < nx; i++, V++) {
+        if (ClipNAN && isnan(*V)) continue;
         max = MAX (max, *V);
         min = MIN (min, *V);
@@ -113 +120 @@
     V = (float *)(buf[0].matrix.buffer) + j*buf[0].matrix.Naxis[0] + sx; 
     for (i = 0; i < nx; i++, V++) {
+      if (ClipNAN && isnan(*V)) continue;
       bin = MAX (MIN (Nbins, (*V - min) / dx), 0);
       vec2[0].elements.Flt[bin] += 1.0;