Changeset 41515 for trunk/Ohana/src/opihi/cmd.astro/region.c

Timestamp:

Apr 2, 2021, 1:48:56 PM (5 years ago)

Author:

eugene

Message:

minor line-break cleanups; fix cgrid spacing for pseudocylindrical projections; some in-line initializations; allow projection center for pseudocylindrical projections to be non-zero for dec (changes projection center pixel)

File:

• trunk/Ohana/src/opihi/cmd.astro/region.c (modified) (1 diff)

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

@@ -165 +165 @@
 got_ctype:
   
-  graphmode.coords.crval1 = Ra;
-  graphmode.coords.crval2 = Dec;
-
-  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;
+  // set the rotation
+  {
+    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;
+  }
+
+  // determine central pixel for projection:
+  {
+    // PSEUDOCYL modes need center R,D to be 0,0 and center pixel to be adjusted
+    OhanaProjection proj = GetProjection (graphmode.coords.ctype);
+    OhanaProjectionMode mode = GetProjectionMode (proj);
+
+    graphmode.coords.crpix1 = 0.0;
+    graphmode.coords.crpix2 = 0.0;
+
+    if (mode == PROJ_MODE_PSEUDOCYL) {
+      graphmode.coords.crval1 = Ra;
+      graphmode.coords.crval2 = 0.0;
+    } else {
+      graphmode.coords.crval1 = Ra;
+      graphmode.coords.crval2 = Dec;
+    }
+
+    if (mode == PROJ_MODE_PSEUDOCYL) {
+      double Xc, Yc;
+      RD_to_XY (&Xc, &Yc, Ra, Dec, &graphmode.coords);
+      graphmode.coords.crpix2 = -Yc;
+      fprintf (stderr, "center pixel is %f, %f\n", Xc, Yc);
+    }
+  }
 
   // ask kapa for coordinate limits, to get the right aspect ratio