Changeset 38062 for trunk/Ohana/src/opihi/cmd.astro

Timestamp:

Mar 29, 2015, 6:52:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from ipp-20150112

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/cmd.astro/Makefile (modified) (1 diff)
• Ohana/src/opihi/cmd.astro/cdensify.c (modified) (1 diff)
• Ohana/src/opihi/cmd.astro/cdhistogram.c (copied) (copied from branches/eam_branches/ipp-20150112/Ohana/src/opihi/cmd.astro/cdhistogram.c )
• Ohana/src/opihi/cmd.astro/init.c (modified) (2 diffs)

trunk/Ohana/src/opihi/cmd.astro/Makefile

@@ -29 +29 @@
 $(SRC)/czplot.$(ARCH).o    \
 $(SRC)/cdensify.$(ARCH).o          \
+$(SRC)/cdhistogram.$(ARCH).o       \
 $(SRC)/drizzle.$(ARCH).o           \
 $(SRC)/flux.$(ARCH).o              \

trunk/Ohana/src/opihi/cmd.astro/cdensify.c

@@ -111 +111 @@
     switch (PSFTYPE) {
       case IS_DOT:
-        RD_to_XY (&x, &y, rn, *d, &graphmode.coords);
-        Xb = (x - Xmin) / dX;
-        Yb = (y - Ymin) / dY;
-
         RD_to_XY (&x, &y, rn, *d, &newcoords);
         Xb = (int) x;

trunk/Ohana/src/opihi/cmd.astro/init.c

@@ -14 +14 @@
 int czcplot                 PROTO((int, char **));
 int cdensify                PROTO((int, char **));
+int cdhistogram             PROTO((int, char **));
 int drizzle                 PROTO((int, char **));
 int flux                    PROTO((int, char **));
@@ -77 +78 @@
   {1, "czplot",      czplot,       "plot scaled vectors in sky coordinates"},
   {1, "czcplot",     czcplot,      "plot color-scaled vectors in sky coordinates"},
-  {1, "cdensify",    cdensify,      "vectors to density history on projection"},
+  {1, "cdensify",    cdensify,     "vectors to density history on projection"},
+  {1, "cdhistogram", cdhistogram,  "vectors to 3D histogram on projection"},
   {1, "drizzle",     drizzle,      "transform image to image"},
   {1, "flux",        flux,         "flux in a convex contour"},