Changeset 37807 for trunk/Ohana/src/opihi/dvo/simage.c

Timestamp:

Jan 11, 2015, 2:14:39 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140904

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/dvo/simage.c (modified) (1 diff)

trunk/Ohana/src/opihi/dvo/simage.c

@@ -42 +42 @@
   }
   /* get astrometry information */
-  strcpy (coords.ctype, "NONE");
-  gfits_scan (&header, "CTYPE2",   "%s",  1, coords.ctype);
-  if (strcmp (coords.ctype, "DEC--PLY")) {
-    gprint (GP_ERR, "ERROR: wrong astrometric info in header\n");
+  if (!GetCoords (&coords, &header)) {
+    gprint (GP_ERR, "ERROR: can't get coord info from header\n");
     return (FALSE);
   }
-  gfits_scan (&header, "CDELT1",   "%f", 1, &coords.cdelt1); 
-  gfits_scan (&header, "CDELT2",   "%f", 1, &coords.cdelt2);
-  gfits_scan (&header, "CRVAL1",   "%lf", 1, &coords.crval1);
-  gfits_scan (&header, "CRVAL2",   "%lf", 1, &coords.crval2);  
-  gfits_scan (&header, "CRPIX1",   "%f", 1, &coords.crpix1);
-  gfits_scan (&header, "CRPIX2",   "%f", 1, &coords.crpix2);
-  gfits_scan (&header, "PC001001", "%f", 1, &coords.pc1_1);
-  gfits_scan (&header, "PC001002", "%f", 1, &coords.pc1_2);
-  gfits_scan (&header, "PC002001", "%f", 1, &coords.pc2_1);
-  gfits_scan (&header, "PC002002", "%f", 1, &coords.pc2_2);
-  /* RA Terms */
-  gfits_scan (&header, "PCA1X2Y0", "%f", 1, &coords.polyterms[0][0]);
-  gfits_scan (&header, "PCA1X1Y1", "%f", 1, &coords.polyterms[1][0]);
-  gfits_scan (&header, "PCA1X0Y2", "%f", 1, &coords.polyterms[2][0]);
-  gfits_scan (&header, "PCA1X3Y0", "%f", 1, &coords.polyterms[3][0]);
-  gfits_scan (&header, "PCA1X2Y1", "%f", 1, &coords.polyterms[4][0]);
-  gfits_scan (&header, "PCA1X1Y2", "%f", 1, &coords.polyterms[5][0]);
-  gfits_scan (&header, "PCA1X0Y3", "%f", 1, &coords.polyterms[6][0]);
-  /* Dec Terms */                           
-  gfits_scan (&header, "PCA2X2Y0", "%f", 1, &coords.polyterms[0][1]);
-  gfits_scan (&header, "PCA2X1Y1", "%f", 1, &coords.polyterms[1][1]);
-  gfits_scan (&header, "PCA2X0Y2", "%f", 1, &coords.polyterms[2][1]);
-  gfits_scan (&header, "PCA2X3Y0", "%f", 1, &coords.polyterms[3][1]);
-  gfits_scan (&header, "PCA2X2Y1", "%f", 1, &coords.polyterms[4][1]);
-  gfits_scan (&header, "PCA2X1Y2", "%f", 1, &coords.polyterms[5][1]);
-  gfits_scan (&header, "PCA2X0Y3", "%f", 1, &coords.polyterms[6][1]);
-  coords.Npolyterms = 2; /* how many do we use? */
 
   /* find number of stars */