Changeset 19065

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

Files:

• addstar/src/GetFileMode.c (modified) (1 diff)
• addstar/src/ReadImageHeader.c (modified) (2 diffs)
• delstar/src/gimages.c (modified) (2 diffs)
• getstar/src/GetFileMode.c (modified) (1 diff)
• getstar/src/ReadImageHeader.c (modified) (2 diffs)

trunk/Ohana/src/addstar/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/addstar/src/ReadImageHeader.c

@@ -5 +5 @@
 int ReadImageHeader (Header *header, Image *image, int photcode) {
 
-  int Nastro, ccdnum, hour, min, Nx, Ny;
+  int Nastro, ccdnum, hour, min, Nx, Ny, haveNx, haveNy;
   double tmp, sec, Cerror, ZeroPt, FWHM_X, FWHM_Y;
   char *c, photname[64], line[80];
@@ -21 +21 @@
   gfits_scan (header, "NAXIS1",   "%d", 1, &Nx);
   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");
   }
+
   image[0].NX = Nx;
   image[0].NY = Ny;

trunk/Ohana/src/delstar/src/gimages.c

@@ -12 +12 @@
   double tmp;
   Image *image;
-  int Nc;
+  int Nc, haveNx, haveNy;
 
   ALLOCATE (image, Image, 1);
@@ -48 +48 @@
  
   /* get other header info */
-  gfits_scan (&header, "NAXIS1",   "%hd", 1, &image[0].NX); 
-  gfits_scan (&header, "NAXIS2",   "%hd", 1, &image[0].NY);
+  haveNx = gfits_scan (&header, "NAXIS1",   "%hd", 1, &image[0].NX); 
+  haveNy = gfits_scan (&header, "NAXIS2",   "%hd", 1, &image[0].NY);
+  if (!haveNx && !haveNy) {
+      haveNx = gfits_scan (&header, "IMNAXIS1",   "%hd", 1, &image[0].NX); 
+      haveNy = gfits_scan (&header, "IMNAXIS2",   "%hd", 1, &image[0].NY);
+  }      
+  if (!haveNx || !haveNy) {
+      Shutdown ("ERROR: missing image dimensions in header");
+  }
 
   gfits_scan (&header, "PHOTCODE", "%s", 1, photcode);

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");