Changeset 34772 for branches/czw_branch/20120906/Ohana/src/opihi/cmd.astro

Timestamp:

Dec 6, 2012, 6:32:19 PM (14 years ago)

Author:

watersc1

Message:

merge from trunk. Preliminary versions of stacktool/warptool updates and regenerate_background.pl script. The warp code is finished and tested, and I still need to get the stack version resolved.

Location:

branches/czw_branch/20120906/Ohana

Files:

• . (modified) (1 prop)
• src/opihi (modified) (1 prop)
• src/opihi/cmd.astro (modified) (1 prop)
• src/opihi/cmd.astro/cgrid.c (modified) (1 diff)
• src/opihi/cmd.astro/cplot.c (modified) (3 diffs)
• src/opihi/cmd.astro/czplot.c (modified) (1 diff)

branches/czw_branch/20120906/Ohana/src/opihi/cmd.astro/cgrid.c

@@ -279 +279 @@
   graphmode.ptype = 100; /* connect a pair */
   graphmode.etype = 0;
-  PlotVectorPair (kapa, &Xvec, &Yvec, &graphmode);
+  PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);
 
   free (Xvec.elements.Ptr);

branches/czw_branch/20120906/Ohana/src/opihi/cmd.astro/cplot.c

@@ -3 +3 @@
 int cplot (int argc, char **argv) {
   
+  double ra_prev = 0;
   int i, kapa, Npts, status, leftside;
   opihi_flt *x, *y, *r, *d, Rmin, Rmax, Rmid;
@@ -41 +42 @@
   Npts = 0;
   for (i = 0; i < Xvec.Nelements; i++, r++, d++) {
-    *r = ohana_normalize_angle (*r);
-    while (*r < Rmin) *r += 360.0;
-    while (*r > Rmax) *r -= 360.0;
+    double ra = ohana_normalize_angle (*r);
+    while (ra < Rmin) ra += 360.0;
+    while (ra > Rmax) ra -= 360.0;
 
     // for pair-by-pair connections, check on second point if we straddle the back midline
-    if ((graphmode.ptype == 100) && (i % 2)) {
-      leftside = (r[-1] < Rmid); // if first of the pair is left, second must be as well
-      if ( leftside && (r[0] > Rmid + 90)) { r[0] -= 360.0; }
-      if (!leftside && (r[0] < Rmid - 90)) { r[0] += 360.0; }
+    if (graphmode.ptype == 100) {
+      if (i % 2) {
+        leftside = (ra_prev < Rmid); // if first of the pair is left, second must be as well
+        if ( leftside && (ra > Rmid + 90)) { ra -= 360.0; }
+        if (!leftside && (ra < Rmid - 90)) { ra += 360.0; }
+      } else {
+        ra_prev = ra;
+      }
     }
-    status = RD_to_XY (x, y, *r, *d, &graphmode.coords);
+    status = RD_to_XY (x, y, ra, *d, &graphmode.coords);
 
     // if we fail on one of the points, drop the corresponding pair
@@ -78 +83 @@
 
   graphmode.etype = 0;
-  PlotVectorPair (kapa, &Xvec, &Yvec, &graphmode);
+  PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);
   
   free (Xvec.elements.Ptr);

branches/czw_branch/20120906/Ohana/src/opihi/cmd.astro/czplot.c

@@ -76 +76 @@
   graphmode.size = -1; /* point size determined by Zvec */
   graphmode.etype = 0;
-  PlotVectorTriplet (kapa, &Xvec, &Yvec, &Zvec, &graphmode);
+  PlotVectorTriplet (kapa, &Xvec, &Yvec, &Zvec, NULL, &graphmode);
 
   free (Xvec.elements.Flt);