Changeset 20184

Timestamp:

Oct 16, 2008, 9:10:52 AM (18 years ago)

Author:

eugene

Message:

adding ZNAXIS1,2 as an allowed source of the image size

Location:

trunk/Ohana/src

Files:

• addstar/src/ReadImageHeader.c (modified) (1 diff)
• delstar/src/gimages.c (modified) (1 diff)
• getstar/src/ReadImageHeader.c (modified) (1 diff)
• opihi/dvo/imbox.c (modified) (1 diff)

trunk/Ohana/src/addstar/src/ReadImageHeader.c

@@ -25 +25 @@
       haveNx = gfits_scan (header, "IMNAXIS1",   "%d", 1, &Nx);
       haveNy = gfits_scan (header, "IMNAXIS2",   "%d", 1, &Ny);
+  }
+
+  if (!haveNx && !haveNy) {
+      haveNx = gfits_scan (header, "ZNAXIS1",   "%d", 1, &Nx);
+      haveNy = gfits_scan (header, "ZNAXIS2",   "%d", 1, &Ny);
   }
 

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

@@ -52 +52 @@
       haveNy = gfits_scan (&header, "IMNAXIS2",   "%hd", 1, &image[0].NY);
   }      
+  if (!haveNx && !haveNy) {
+      haveNx = gfits_scan (&header, "ZNAXIS1",   "%d", 1, &image[0].NX);
+      haveNy = gfits_scan (&header, "ZNAXIS2",   "%d", 1, &image[0].NY);
+  }
   if (!haveNx || !haveNy) {
       Shutdown ("ERROR: missing image dimensions in header");

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

@@ -20 +20 @@
       haveNx = gfits_scan (header, "IMNAXIS1",   "%d", 1, &Nx);
       haveNy = gfits_scan (header, "IMNAXIS2",   "%d", 1, &Ny);
+  }
+
+  if (!haveNx && !haveNy) {
+      haveNx = gfits_scan (header, "ZNAXIS1",   "%d", 1, &Nx);
+      haveNy = gfits_scan (header, "ZNAXIS2",   "%d", 1, &Ny);
   }
 

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

@@ -55 +55 @@
         haveNx = gfits_scan (&header, "IMNAXIS1",   "%d", 1, &Nx);
         haveNy = gfits_scan (&header, "IMNAXIS2",   "%d", 1, &Ny);
+    }
+
+    if (!haveNx && !haveNy) {
+        haveNx = gfits_scan (header, "ZNAXIS1",   "%d", 1, &Nx);
+        haveNy = gfits_scan (header, "ZNAXIS2",   "%d", 1, &Ny);
     }