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

Timestamp:

Dec 3, 2015, 4:16:29 PM (11 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20151113

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/cmd.astro (modified) (1 prop)
• Ohana/src/opihi/cmd.astro/Makefile (modified) (2 diffs)
• Ohana/src/opihi/cmd.astro/cneedles.c (copied) (copied from branches/eam_branches/ipp-20151113/Ohana/src/opihi/cmd.astro/cneedles.c )
• Ohana/src/opihi/cmd.astro/drizzle.c (modified) (2 diffs)
• Ohana/src/opihi/cmd.astro/init.c (modified) (4 diffs)
• Ohana/src/opihi/cmd.astro/region.c (modified) (2 diffs)
• Ohana/src/opihi/cmd.astro/wcs.c (copied) (copied from branches/eam_branches/ipp-20151113/Ohana/src/opihi/cmd.astro/wcs.c )

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

@@ -23 +23 @@
 $(SRC)/cdot.$(ARCH).o              \
 $(SRC)/cline.$(ARCH).o             \
+$(SRC)/cneedles.$(ARCH).o                  \
 $(SRC)/cplot.$(ARCH).o             \
 $(SRC)/csystem.$(ARCH).o           \
@@ -76 +77 @@
 $(SRC)/vshimage.$(ARCH).o         \
 $(SRC)/shimage.$(ARCH).o         \
+$(SRC)/wcs.$(ARCH).o         \
 $(SRC)/imsub.$(ARCH).o             \
 $(SRC)/imfit.$(ARCH).o             \

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

@@ -141 +141 @@
 
           if (Vmk && Vmk[Ni]) continue;
+          if (!isfinite(Vin[Ni])) continue;
+
           Vout[No] += Vin[Ni];
           Vwt[No] ++;
@@ -195 +197 @@
 
           if (Vmk && Vmk[Ni]) continue;
+          if (!isfinite(Vin[Ni])) continue;
           Vout[No] += Vin[Ni];
           Vwt[No] ++;

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

@@ -7 +7 @@
 int cdot                    PROTO((int, char **));
 int cline                   PROTO((int, char **));
+int cneedles                PROTO((int, char **));
 int cplot                   PROTO((int, char **));
 int csystem                 PROTO((int, char **));
@@ -66 +67 @@
 int vshimage                PROTO((int, char **));
 int shimage                 PROTO((int, char **));
+int wcs                     PROTO((int, char **));
 
 static Command cmds[] = {  
@@ -74 +76 @@
   {1, "cdot",        cdot,         "plot point in sky coordinates"},
   {1, "cline",       cline,        "plot line connecting two sky coordinates"},
+  {1, "cneedles",    cneedles,     "plot vectors in sky coordinates"},
   {1, "cplot",       cplot,        "plot vectors in sky coordinates"},
   {1, "csystem",     csystem,      "convert between coordinate systems"},
@@ -131 +134 @@
   {1, "vshimage",    vshimage,     "generate images for vector spherical harmonic terms"},
   {1, "shimage",     shimage,      "generate images for spherical harmonic terms"},
+  {1, "wcs",         wcs,          "set the wcs for the given image"},
 }; 
 

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

@@ -74 +74 @@
   }
 
+  float Angle = 0.0;
+  if ((N = get_argument (argc, argv, "-angle"))) {
+    remove_argument (N, &argc, argv);
+    Angle = atof(argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
   if ((argc != 4) && (argc != 5)) {
     gprint (GP_ERR, "USAGE: region Ra Dec Radius [projection] [orientation]\n");
-    gprint (GP_ERR, "  [-image] [-ew] [+ew] [-ns] [+ns] [-no-clear]\n");
+    gprint (GP_ERR, "  [-image] [-ew] [+ew] [-ns] [+ns] [-no-clear] [-angle theta]\n");
     gprint (GP_ERR, " current: %f %f (%f x %f) (%s)\n", 
              graphmode.coords.crval1, graphmode.coords.crval2, 
@@ -111 +118 @@
   graphmode.coords.crval2 = Dec;
 
-  graphmode.coords.pc1_1 = (graphmode.flipeast) ? -1 : 1;
-  graphmode.coords.pc2_2 = (graphmode.flipnorth) ? -1 : 1;
+  float pc1_1 = (graphmode.flipeast)  ? -1 : 1;
+  float pc2_2 = (graphmode.flipnorth) ? -1 : 1;
+
+  graphmode.coords.pc1_1 =  cos(Angle*RAD_DEG)*pc1_1;
+  graphmode.coords.pc1_2 =  sin(Angle*RAD_DEG)*pc2_2;
+  graphmode.coords.pc2_1 = -sin(Angle*RAD_DEG)*pc1_1;
+  graphmode.coords.pc2_2 =  cos(Angle*RAD_DEG)*pc2_2;
 
   /* ask kapa for coordinate limits, to get the right aspect ratio */