Changeset 19130

Timestamp:

Aug 19, 2008, 6:51:33 PM (18 years ago)

Author:

eugene

Message:

add support for IMNAXIS1,2

Location:

trunk/Ohana/src

Files:

• addstar/src/ReadImageHeader.c (modified) (1 diff)
• opihi/dvo/imbox.c (modified) (2 diffs)

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

@@ -19 +19 @@
   // 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) {

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

@@ -3 +3 @@
 int imbox (int argc, char **argv) {
   
-  int j, kapa, Nskip, status, InPic, flipped, N, SOLO_PHU;
+  int j, kapa, Nskip, status, InPic, flipped, N, haveNx, haveNy, Nx, Ny, SOLO_PHU;
   Vector Xvec, Yvec;
   double r, d, x[4], y[4], Rmin, Rmax, Rmid;
@@ -46 +46 @@
       goto skip;
     }
-    x[0] = 0;               y[0] = 0;
-    x[1] = header.Naxis[0]; y[1] = 0;
-    x[2] = header.Naxis[0]; y[2] = header.Naxis[1];
-    x[3] = 0;               y[3] = header.Naxis[1];
+
+    // XXX currently, image uses an unsigned short for NX,XY. this is rather restrictive
+    // and needs to be at least checked.
+    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");
+        goto skip;
+    }
+
+    x[0] = 0;  y[0] = 0;
+    x[1] = Nx; y[1] = 0;
+    x[2] = Ny; y[2] = Ny;
+    x[3] = 0;  y[3] = Ny;
     status = FALSE;
     flipped = FALSE;