Changeset 41515 for trunk/Ohana/src/opihi/cmd.astro/cgrid.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/cgrid.c (modified) (5 diffs)

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

@@ -40 +40 @@
   OnPic = FALSE;                                                        \
   First = TRUE;                                                         \
-  for (d = firstDEC; (d < 90 + dD) && (LOnPic || NorthPole || SouthPole); d += dD) { \
+  for (d = firstDEC; (d < 90 + dD) && (LOnPic || NorthPole || SouthPole || InvalidCorner); d += dD) { \
     D = MAX (-90, MIN(90, d));                                          \
     ADD_COORDINATE((RA), D);                                            \
@@ -47 +47 @@
   First = TRUE;                                                         \
   LOnPic = TRUE;                                                        \
-  for (d = firstDEC; (d > -90 - dD) && (LOnPic || NorthPole || SouthPole); d -= dD) { \
+  for (d = firstDEC; (d > -90 - dD) && (LOnPic || NorthPole || SouthPole || InvalidCorner); d -= dD) { \
     D = MAX (-90, MIN(90, d));                                          \
     ADD_COORDINATE((RA), D);                                            \
@@ -59 +59 @@
   First = TRUE;                                                         \
   lastRA = graphmode.coords.crval1 + 180.0;                             \
-  for (r = firstRA; (r < lastRA + dR) && (LOnPic || NorthPole || SouthPole); r += dR) { \
+  for (r = firstRA; (r < lastRA + dR) && (LOnPic || NorthPole || SouthPole || InvalidCorner); r += dR) { \
     R = MIN (r, lastRA);                                        \
     ADD_COORDINATE(R, D);                                               \
@@ -67 +67 @@
   LOnPic = TRUE;                                                        \
   lastRA = graphmode.coords.crval1 - 180.0;                             \
-  for (r = firstRA; (r > lastRA - dR) && (LOnPic || NorthPole || SouthPole); r -= dR) { \
+  for (r = firstRA; (r > lastRA - dR) && (LOnPic || NorthPole || SouthPole || InvalidCorner); r -= dR) { \
     R = MAX (r, lastRA);                                        \
     ADD_COORDINATE(R, D);                                               \
@@ -167 +167 @@
     SouthPole = TRUE;
 
+  // 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);
+  int InvalidCorner = FALSE;
+  if (mode == PROJ_MODE_PSEUDOCYL) {
+    // for PSEUDOCYL, the ra range is 360 if the corners are invalid 
+    InvalidCorner |= XY_to_RD (&r, &d, graphmode.xmin, graphmode.ymin, &graphmode.coords); 
+    InvalidCorner |= XY_to_RD (&r, &d, graphmode.xmax, graphmode.ymin, &graphmode.coords); 
+    InvalidCorner |= XY_to_RD (&r, &d, graphmode.xmax, graphmode.ymax, &graphmode.coords); 
+    InvalidCorner |= XY_to_RD (&r, &d, graphmode.xmin, graphmode.ymax, &graphmode.coords); 
+  }    
+
   range = MIN (fabs(graphmode.coords.cdelt1*(graphmode.xmax-graphmode.xmin)), fabs(graphmode.coords.cdelt2*(graphmode.ymax-graphmode.ymin)));
-  if (NorthPole || SouthPole) range = 360;
+  if (NorthPole || SouthPole || InvalidCorner) range = 360;
   dR = range * GRID_SPACING;
   dD = range * GRID_SPACING;