Changeset 37901

Timestamp:

Feb 6, 2015, 12:11:09 PM (11 years ago)

Author:

eugene

Message:

add new functions tdhistogram and squash3d

Location:

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

Files:

• cmd.astro/cdhistogram.c (modified) (1 diff)
• cmd.data/Makefile (modified) (2 diffs)
• cmd.data/init.c (modified) (4 diffs)
• cmd.data/read_vectors.c (modified) (6 diffs)
• cmd.data/squash3d.c (added)
• cmd.data/tdhistogram.c (added)

branches/eam_branches/ipp-20150112/Ohana/src/opihi/cmd.astro/cdhistogram.c

@@ -2 +2 @@
 
 # define CHECKVAL(ARG) if (!isfinite(ARG)) { gprint (GP_ERR, "illegal value for %s: %f\n", #ARG, ARG); return (FALSE); }
-enum {IS_DOT, IS_SQUARE, IS_CIRCLE, IS_GAUSS};
 
 int cdhistogram (int argc, char **argv) {

branches/eam_branches/ipp-20150112/Ohana/src/opihi/cmd.data/Makefile

@@ -61 +61 @@
 $(SRC)/ungridify.$(ARCH).o     \
 $(SRC)/histogram.$(ARCH).o      \
+$(SRC)/tdhistogram.$(ARCH).o    \
 $(SRC)/hermitian1d.$(ARCH).o    \
 $(SRC)/hermitian2d.$(ARCH).o    \
@@ -131 +132 @@
 $(SRC)/imspline_apply.$(ARCH).o \
 $(SRC)/imspline_construct.$(ARCH).o \
+$(SRC)/squash3d.$(ARCH).o          \
 $(SRC)/imstats.$(ARCH).o           \
 $(SRC)/style.$(ARCH).o             \

branches/eam_branches/ipp-20150112/Ohana/src/opihi/cmd.data/init.c

@@ -51 +51 @@
 int ungridify        PROTO((int, char **));
 int histogram        PROTO((int, char **));
+int tdhistogram      PROTO((int, char **));
 int hermitian1d      PROTO((int, char **));
 int hermitian2d      PROTO((int, char **));
@@ -118 +119 @@
 int imspline_apply   PROTO((int, char **));
 int imspline_construct PROTO((int, char **));
+int squash3d         PROTO((int, char **));
 int stats            PROTO((int, char **));
 int imstats          PROTO((int, char **));
@@ -218 +220 @@
   {1, "header",       header,           "print image header"},
   {1, "histogram",    histogram,        "generate histogram from vector"},
+  {1, "tdhistogram",  tdhistogram,      "generate 2D histogram image from vector set"},
   {1, "hermitian1d",  hermitian1d,      "generate 1-D Hermitian Polynomial"},
   {1, "hermitian2d",  hermitian2d,      "generate 2-D Hermitian Polynomial"},
@@ -291 +294 @@
   {1, "imspline.apply", imspline_apply, "apply spline fit to generate an image"},
   {1, "imspline.const", imspline_construct, "create spline 2nd deriv. terms"},
+  {1, "squash3d",     squash3d,         "squash 3d buffer to 2d"},
   {1, "stats",        imstats,          "statistics on a portion of an image"},
   {1, "style",        style,            "set the style for graph plots"},

branches/eam_branches/ipp-20150112/Ohana/src/opihi/cmd.data/read_vectors.c

@@ -372 +372 @@
   }
 
+  int VERBOSE = FALSE;
+  if ((N = get_argument (argc, argv, "-v"))) {
+    remove_argument (N, &argc, argv);
+    VERBOSE = TRUE;
+  }
+
   int start = 0;
   int Nrows = -1; // -1 : read entire table
@@ -399 +405 @@
   // }
 
-  if (argc < 2) ESCAPE ("USAGE: read -fits extension [-extnum] [-keyword key] name name ...\n");
+  if ((argc < 2) && !getSizes) ESCAPE ("USAGE: read -fits extension [-extnum] [-keyword key] name name ...\n");
+  if ((argc != 1) && getSizes) ESCAPE ("USAGE: read -sizes -fits extension [-extnum] (does not read data values)\n");
 
   if (f == NULL) ESCAPE ("file not found\n");
@@ -436 +443 @@
     if (start >= header.Naxis[1]) ESCAPE ("invalid range: start >= Ny (%d)\n", header.Naxis[1]);
     if (Nrows < 0) ESCAPE ("invalid range: Nrows < 0\n");
-    if (start + Nrows > header.Naxis[1]) ESCAPE ("invalid range: start + Nrows > Ny (%d)\n", header.Naxis[1]);
+
+    // just a warning:
+    if (start + Nrows > header.Naxis[1]) {
+      if (VERBOSE) gprint (GP_ERR, "NOTE: reading last block will return only %d rows\n", header.Naxis[1] - start);
+    }
 
     // Ny = 100, start = 0, Nrows = -1 -> Nrows => 100
@@ -472 +483 @@
       }
 
+      if (getSizes) {
+        read_table_sizes (&header);
+        if (CCDKeyword != NULL) free (CCDKeyword); 
+        gfits_free_header (&header); 
+        return TRUE;
+      }
+
       if (Nrows == -1) {
         Nrows = header.Naxis[1] - start;
@@ -478 +496 @@
       if (start >= header.Naxis[1]) ESCAPE ("invalid range: start >= Ny (%d)\n", header.Naxis[1]);
       if (Nrows < 0) ESCAPE ("invalid range: Nrows < 0\n");
-      if (start + Nrows > header.Naxis[1]) ESCAPE ("invalid range: start + Nrows > Ny (%d)\n", header.Naxis[1]);
+
+      // just a warning:
+      if (start + Nrows > header.Naxis[1]) {
+        if (VERBOSE) gprint (GP_ERR, "NOTE: reading last block will return only %d rows\n", header.Naxis[1] - start);
+      }
 
       if (!gfits_fread_ftable_range (f, padIfShort, &table, start, Nrows)) ESCAPE ("error reading table for extension %d\n", Nextend);
@@ -603 +625 @@
 
   set_int_variable ("table:Nx", header->Naxis[0]);
-  set_int_variable ("table:Nx", header->Naxis[0]);
+  set_int_variable ("table:Ny", header->Naxis[1]);
   set_int_variable ("table:Nfields", Nfields);