Changeset 39166

Timestamp:

Nov 19, 2015, 12:15:53 PM (11 years ago)

Author:

eugene

Message:

squash NAN values in drizzle; allow regions with an angle

Location:

branches/eam_branches/ipp-20151113/Ohana/src/opihi/cmd.astro

Files:

• drizzle.c (modified) (2 diffs)
• region.c (modified) (2 diffs)

branches/eam_branches/ipp-20151113/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] ++;

branches/eam_branches/ipp-20151113/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");
@@ -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 */