Changeset 31239

Timestamp:

Apr 7, 2011, 3:46:32 PM (15 years ago)

Author:

bills

Message:

add parameter -skyparity which causes the skycells to be created with
East to the left

Location:

trunk/Ohana/src/addstar

Files:

• include/skycells.h (modified) (1 diff)
• src/args_skycells.c (modified) (2 diffs)
• src/sky_tessalation.c (modified) (5 diffs)

trunk/Ohana/src/addstar/include/skycells.h

@@ -65 +65 @@
 int    NMAX;
 int    NX_SUB, NY_SUB;
+int    X_PARITY;
 double SCALE;
 double PADDING;

trunk/Ohana/src/addstar/src/args_skycells.c

@@ -188 +188 @@
     remove_argument (N, &argc, argv);
     OVERLAP_DEC  = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+  X_PARITY = 1;
+  if ((N = get_argument (argc, argv, "-skyparity"))) {
+    X_PARITY = -1;
     remove_argument (N, &argc, argv);
   }
@@ -224 +229 @@
   fprintf (stderr, "  -nx Nx                      : subdivide skycell projection in x by Nx\n");
   fprintf (stderr, "  -ny Ny                      : subdivide skycell projection in y by Ny\n");
+  fprintf (stderr, "  -overlap Or Od              : overlap between skycells (arcseconds)\n");
   fprintf (stderr, "  -projection-number Np       : set projection-number (local mode only)\n");
+  fprintf (stderr, "  -skyparity                  : set wcs for skycells so that east is to the left\n");
   fprintf (stderr, "  -help                       : this list\n");
   fprintf (stderr, "  -h                          : this list\n\n");

trunk/Ohana/src/addstar/src/sky_tessalation.c

@@ -318 +318 @@
   memset (image, 0, sizeof(Image));
   image[0].coords = *refcoords;
-  image[0].coords.pc1_1 = image[0].coords.pc2_2 = 1.0;
+  image[0].coords.pc1_1 = 1.0 * X_PARITY;
+  image[0].coords.pc2_2 = 1.0;
   image[0].coords.pc1_2 = image[0].coords.pc2_1 = 0.0;
 
@@ -468 +469 @@
 
   if (FIX_NS) {
-    rectangle[0].coords.pc1_1 = +1.0;
+    rectangle[0].coords.pc1_1 = +1.0 * X_PARITY;
     rectangle[0].coords.pc1_2 = +0.0;
     rectangle[0].coords.pc2_1 = -0.0;
@@ -475 +476 @@
     ycr = yc*cos(angle) + xc*sin(angle); 
   } else {
-    rectangle[0].coords.pc1_1 = +cos(angle);
+    rectangle[0].coords.pc1_1 = +cos(angle) * X_PARITY;
     rectangle[0].coords.pc1_2 = +sin(angle);
-    rectangle[0].coords.pc2_1 = -sin(angle);
+    rectangle[0].coords.pc2_1 = -sin(angle) * X_PARITY;
     rectangle[0].coords.pc2_2 = +cos(angle);
     xcr = xc;
@@ -514 +515 @@
   angle = 0.0;
   if (FIX_NS) {
-    rectangle[0].coords.pc1_1 = +1.0;
+    rectangle[0].coords.pc1_1 = +1.0 * X_PARITY;
     rectangle[0].coords.pc1_2 = +0.0;
     rectangle[0].coords.pc2_1 = -0.0;
     rectangle[0].coords.pc2_2 = +1.0;
   } else {
-    rectangle[0].coords.pc1_1 = +cos(angle);
+    rectangle[0].coords.pc1_1 = +cos(angle) * X_PARITY;
     rectangle[0].coords.pc1_2 = +sin(angle);
-    rectangle[0].coords.pc2_1 = -sin(angle);
+    rectangle[0].coords.pc2_1 = -sin(angle) * X_PARITY;
     rectangle[0].coords.pc2_2 = +cos(angle);
   }
@@ -626 +627 @@
     ring[i].coords.crval2 = dec;
 
-    ring[i].coords.pc1_1 = +1.0;
+    ring[i].coords.pc1_1 = +1.0 * X_PARITY;
     ring[i].coords.pc1_2 = +0.0;
     ring[i].coords.pc2_1 = -0.0;