Changeset 27608 for trunk/ppViz/src/ppCoord/ppCoordLoop.c

Timestamp:

Apr 5, 2010, 2:51:24 PM (16 years ago)

Author:

Paul Price

Message:

Only output the region file (no stdout).

File:

• trunk/ppViz/src/ppCoord/ppCoordLoop.c (modified) (2 diffs)

trunk/ppViz/src/ppCoord/ppCoordLoop.c

@@ -242 +242 @@
 
                 float x = pix->x, y = pix->y; // Pixel coordinates
-                if (!data->chipName && (x < 0 || x > numCols || y < 0 || y > numRows)) {
+                if ((x < 0 || x > numCols || y < 0 || y > numRows)) {
                     // Not on this chip
                     continue;
@@ -309 +309 @@
                 continue;
             }
-            fprintf(stdout, "%.10lf %.10lf --> %.3f %.3f %s%s%s\n",
-                    ra->data.F64[i], dec->data.F64[i], xPix->data.F32[i], yPix->data.F32[i],
-                    chipName ? chipName : "UNKNOWN",
-                    rawFile ? " " : "",
-                    rawFile && cellName ? cellName : (rawFile ? "UNKNOWN" : ""));
             if (!rawFile && data->ds9) {
                 // Region file is only appropriate if we're not mapping all the way back to cell coordinates
-                fprintf(data->ds9, "image;circle(%f,%f,%f) # color=%s",
+                fprintf(data->ds9, "image;circle(%f,%f,%f) # color=%s\n",
                         xPix->data.F32[i], yPix->data.F32[i], data->ds9radius, data->ds9color);
+            } else {
+                fprintf(stdout, "%.10lf %.10lf --> %.3f %.3f %s%s%s\n",
+                        ra->data.F64[i], dec->data.F64[i], xPix->data.F32[i], yPix->data.F32[i],
+                        chipName ? chipName : "UNKNOWN",
+                        rawFile ? " " : "",
+                        rawFile && cellName ? cellName : (rawFile ? "UNKNOWN" : ""));
             }
         }