Changeset 36398 for branches/eam_branches/ipp-20131211/Ohana/src/opihi

Timestamp:

Dec 13, 2013, 10:31:05 AM (13 years ago)

Author:

eugene

Message:

make Coords.ctype consistently use the CTYPE2 value; cdensify generates WCS keywords

Location:

branches/eam_branches/ipp-20131211/Ohana/src/opihi

Files:

• cmd.astro/cdensify.c (modified) (3 diffs)
• cmd.astro/fitplx.c (modified) (1 diff)
• cmd.astro/region.c (modified) (1 diff)
• dvo/find_matches.c (modified) (1 diff)
• dvo/gimages.c (modified) (1 diff)
• dvo/showtile.c (modified) (1 diff)
• dvo/simage.c (modified) (1 diff)

branches/eam_branches/ipp-20131211/Ohana/src/opihi/cmd.astro/cdensify.c

@@ -76 +76 @@
   Ny = (Ymax - Ymin) / dY + 1;
   
+  Coords newcoords = graphmode.coords;
+  newcoords.cdelt1 *= dX;
+  newcoords.cdelt2 *= dY;
+  newcoords.crpix1 = (newcoords.crpix1 - Xmin) / dX;
+  newcoords.crpix2 = (newcoords.crpix2 - Ymin) / dY;
+
   gfits_free_matrix (&bf[0].matrix);
   gfits_free_header (&bf[0].header);
   CreateBuffer (bf, Nx, Ny, -32, 0.0, 1.0);
   strcpy (bf[0].file, "(empty)");
+  PutCoords (&newcoords, &bf[0].header);
   
   float scalescale = scale*scale;
@@ -96 +103 @@
   coords.pc1_2  = coords.pc2_1  = 0.0;
   coords.Npolyterms = 0;
-  strcpy (coords.ctype, "RA---TAN");
+  strcpy (coords.ctype, "DEC--TAN");
 
   r = vr[0].elements.Flt;
@@ -113 +120 @@
         Xb = (x - Xmin) / dX;
         Yb = (y - Ymin) / dY;
+
+        RD_to_XY (&x, &y, rn, *d, &newcoords);
+        Xb = (int) x;
+        Yb = (int) y;
         if (Xb >= Nx) continue;
         if (Yb >= Ny) continue;

branches/eam_branches/ipp-20131211/Ohana/src/opihi/cmd.astro/fitplx.c

@@ -112 +112 @@
   coords.pc1_2  = coords.pc2_1 = 0.0;
   coords.Npolyterms = 1;
-  strcpy (coords.ctype, "RA---SIN");
+  strcpy (coords.ctype, "DEC--SIN");
 
   double *X, *Y, *t, *pX, *pY, *dX, *dY;

branches/eam_branches/ipp-20131211/Ohana/src/opihi/cmd.astro/region.c

@@ -80 +80 @@
   if (!ohana_str_to_radec (&Ra, &Dec, argv[1], argv[2])) return (FALSE);
   Radius = atof (argv[3]);
-  strcpy (graphmode.coords.ctype, "RA---TAN");
+  strcpy (graphmode.coords.ctype, "DEC--TAN");
   if (argc == 5) {
     if (!strcasecmp (argv[4], "TAN")) 
-      strcpy (graphmode.coords.ctype, "RA---TAN");
+      strcpy (graphmode.coords.ctype, "DEC--TAN");
     if (!strcasecmp (argv[4], "SIN")) 
-      strcpy (graphmode.coords.ctype, "RA---SIN");
+      strcpy (graphmode.coords.ctype, "DEC--SIN");
     if (!strcasecmp (argv[4], "ARC")) 
-      strcpy (graphmode.coords.ctype, "RA---ARC");
+      strcpy (graphmode.coords.ctype, "DEC--ARC");
     if (!strcasecmp (argv[4], "STG")) 
-      strcpy (graphmode.coords.ctype, "RA---STG");
+      strcpy (graphmode.coords.ctype, "DEC--STG");
     if (!strcasecmp (argv[4], "ZEA"))
-      strcpy (graphmode.coords.ctype, "RA---ZEA");
+      strcpy (graphmode.coords.ctype, "DEC--ZEA");
     if (!strcasecmp (argv[4], "AIT")) 
-      strcpy (graphmode.coords.ctype, "RA---AIT");
+      strcpy (graphmode.coords.ctype, "DEC--AIT");
     if (!strcasecmp (argv[4], "GLS")) 
-      strcpy (graphmode.coords.ctype, "RA---GLS");
+      strcpy (graphmode.coords.ctype, "DEC--GLS");
     if (!strcasecmp (argv[4], "PAR")) 
-      strcpy (graphmode.coords.ctype, "RA---PAR");
+      strcpy (graphmode.coords.ctype, "DEC--PAR");
   }
 

branches/eam_branches/ipp-20131211/Ohana/src/opihi/dvo/find_matches.c

@@ -50 +50 @@
   tcoords.pc1_2 = tcoords.pc2_1 = 0.0;
   tcoords.Npolyterms = 1;
-  strcpy (tcoords.ctype, "RA---ARC");
+  strcpy (tcoords.ctype, "DEC--ARC");
 
   // this region includes a boundary layer of size RADIUS

branches/eam_branches/ipp-20131211/Ohana/src/opihi/dvo/gimages.c

@@ -136 +136 @@
       local.pc2_1 = local.pc1_2 = 0.0;
       local.Npolyterms = 1;
-      strcpy (local.ctype, "RA---TAN");
+      strcpy (local.ctype, "DEC--TAN");
 
       if (typehash == DistortImage) {

branches/eam_branches/ipp-20131211/Ohana/src/opihi/dvo/showtile.c

@@ -34 +34 @@
   coords.pc1_2  = coords.pc2_1  = 0.0;
   coords.Npolyterms = 0;
-  strcpy (coords.ctype, "RA---TAN");
+  strcpy (coords.ctype, "DEC--TAN");
   
   /* fill in top-left region */

branches/eam_branches/ipp-20131211/Ohana/src/opihi/dvo/simage.c

@@ -43 +43 @@
   /* get astrometry information */
   strcpy (coords.ctype, "NONE");
-  gfits_scan (&header, "CTYPE1",   "%s",  1, coords.ctype);
-  if (strcmp (coords.ctype, "RA---PLY")) {
+  gfits_scan (&header, "CTYPE2",   "%s",  1, coords.ctype);
+  if (strcmp (coords.ctype, "DEC--PLY")) {
     gprint (GP_ERR, "ERROR: wrong astrometric info in header\n");
     return (FALSE);