Changeset 19065 for trunk/Ohana/src/getstar

Timestamp:

Aug 14, 2008, 2:24:45 PM (18 years ago)

Author:

eugene

Message:

testing for NAXISi, fall-back on IMNAXISi

Location:

trunk/Ohana/src/getstar/src

Files:

• GetFileMode.c (modified) (1 diff)
• ReadImageHeader.c (modified) (2 diffs)

trunk/Ohana/src/getstar/src/GetFileMode.c

@@ -5 +5 @@
 
   char ctype[80];
-  int Naxis, Nx, Ny;
-  int simple, extend, haveNaxis, haveNx, haveNy, haveCTYPE;
+  int Naxis;
+  int simple, extend, haveNaxis, haveCTYPE;
 
   gfits_scan (header, "SIMPLE", "%t", 1, &simple);
   haveNaxis = gfits_scan (header, "NAXIS",  "%d", 1, &Naxis);
-  haveNx    = gfits_scan (header, "NAXIS1", "%d", 1, &Nx);
-  haveNy    = gfits_scan (header, "NAXIS2", "%d", 1, &Ny);
   haveCTYPE = gfits_scan (header, "CTYPE1", "%s", 1, ctype);
 

trunk/Ohana/src/getstar/src/ReadImageHeader.c

@@ -4 +4 @@
 int ReadImageHeader (Header *header, Image *image) {
 
-  int Nastro, Nx, Ny;
+  int Nastro, Nx, Ny, haveNx, haveNy;
   double tmp;
 
@@ -14 +14 @@
   // XXX currently, image uses an unsigned short for NX,XY. this is rather restrictive
   // and needs to be at least checked.
-  gfits_scan (header, "NAXIS1",   "%d", 1, &Nx);
-  gfits_scan (header, "NAXIS2",   "%d", 1, &Ny);
+  haveNx = gfits_scan (header, "NAXIS1",   "%d", 1, &Nx);
+  haveNy = gfits_scan (header, "NAXIS2",   "%d", 1, &Ny);
+
+  if (!haveNx && !haveNy) {
+      haveNx = gfits_scan (header, "IMNAXIS1",   "%d", 1, &Nx);
+      haveNy = gfits_scan (header, "IMNAXIS2",   "%d", 1, &Ny);
+  }
+
+  if (!haveNx || !haveNy) {
+      fprintf (stderr, "missing image dimensions in header\n");
+      return (FALSE);
+  }
+
   if ((Nx < 0) || (Nx > 0xffff)) {
     fprintf (stderr, "WARNING: NX, NY out of range : image boundary will be wrong\n");