Changeset 15487 for trunk/Ohana/src/libdvo

Timestamp:

Nov 6, 2007, 5:09:52 PM (19 years ago)

Author:

eugene

Message:

merging changes from eam_branch_20071015 (read compressed images, clean addstar I/O, other minor issues)

Location:

trunk/Ohana/src/libdvo/src

Files:

• dvo_catalog_mef.c (modified) (4 diffs)
• dvo_catalog_split.c (modified) (4 diffs)
• dvo_convert.c (modified) (3 diffs)
• dvo_convert_elixir.c (modified) (1 diff)
• dvo_image_raw.c (modified) (1 diff)
• fits_db.c (modified) (1 diff)

trunk/Ohana/src/libdvo/src/dvo_catalog_mef.c

@@ -51 +51 @@
     }
   } else {
-    Nbytes = gfits_matrix_size (&header);
+    Nbytes = gfits_data_size (&header);
     fseek (f, Nbytes, SEEK_CUR);
   }
@@ -73 +73 @@
     }
   } else {
-    Nbytes = gfits_matrix_size (&header);
+    Nbytes = gfits_data_size (&header);
     fseek (f, Nbytes, SEEK_CUR);
   }
@@ -94 +94 @@
     }
   } else {
-    Nbytes = gfits_matrix_size (&header);
+    Nbytes = gfits_data_size (&header);
     fseek (f, Nbytes, SEEK_CUR);
   }
@@ -139 +139 @@
   } else {
     /* no real need to skip the data array here... */
-    Nbytes = gfits_matrix_size (&header);
+    Nbytes = gfits_data_size (&header);
     fseek (f, Nbytes, SEEK_CUR);
     if (primary != NULL) free (primary);

trunk/Ohana/src/libdvo/src/dvo_catalog_split.c

@@ -585 +585 @@
 
     /* skip past matrix (already at end of header) */
-    Nskip = gfits_matrix_size (&catalog[0].header);
+    Nskip = gfits_data_size (&catalog[0].header);
     fseek (catalog[0].f, Nskip, SEEK_CUR);
 
@@ -615 +615 @@
 
     /* skip past PHU header and matrix */
-    Nskip = catfile[0].header.size + gfits_matrix_size (&catfile[0].header);
+    Nskip = catfile[0].header.size + gfits_data_size (&catfile[0].header);
     fseek (catfile[0].f, Nskip, SEEK_SET);
 
@@ -642 +642 @@
     header.Naxis[1] = Nlines;
 
-    vtable.size = gfits_matrix_size (&header);
+    vtable.size = gfits_data_size (&header);
     vtable.Nrow = Nout;
     vtable.pad = vtable.size - Nx*Ny;
@@ -705 +705 @@
 
     /* skip past PHU header and matrix */
-    Nskip = catfile[0].header.size + gfits_matrix_size (&catfile[0].header);
+    Nskip = catfile[0].header.size + gfits_data_size (&catfile[0].header);
     fseek (catfile[0].f, Nskip, SEEK_SET);
 

trunk/Ohana/src/libdvo/src/dvo_convert.c

@@ -245 +245 @@
     gfits_modify (theader, "NAXIS2", "%d", 1, Nimage);
     theader[0].Naxis[1] = Nimage;
-    ftable[0].size = gfits_matrix_size (theader);
+    ftable[0].size = gfits_data_size (theader);
     return (TRUE);
   }
@@ -266 +266 @@
     gfits_modify (theader, "NAXIS2", "%d", 1, Nimage); \
     theader[0].Naxis[1] = Nimage; \
-    ftable[0].size = gfits_matrix_size (theader); \
+    ftable[0].size = gfits_data_size (theader); \
     return (TRUE); }
 
@@ -344 +344 @@
       gfits_modify (theader, "NAXIS2", "%d", 1, Nimage); \
       theader[0].Naxis[1] = Nimage; \
-      vtable[0].size = gfits_matrix_size (theader); \
+      vtable[0].size = gfits_data_size (theader); \
       return (TRUE); }
 

trunk/Ohana/src/libdvo/src/dvo_convert_elixir.c

@@ -63 +63 @@
     out[i].dD      = in[i].dD * 100.0;
     out[i].M       = in[i].M  * 1000.0;
+    if (out[i].M < 0) {
+        fprintf (stderr, ".");
+    }
     out[i].dM      = in[i].dM * 1000.0;
     out[i].dt      = in[i].dt * 1000.0;

trunk/Ohana/src/libdvo/src/dvo_image_raw.c

@@ -88 +88 @@
   gfits_modify (&db[0].theader, "NAXIS2", "%d", 1, Nimage);
   db[0].theader.Naxis[1] = Nimage;
-  db[0].ftable.size = gfits_matrix_size (&db[0].theader);
+  db[0].ftable.size = gfits_data_size (&db[0].theader);
   db[0].swapped = FALSE;  /* table does not have internal byte-order */
   return (TRUE);

trunk/Ohana/src/libdvo/src/fits_db.c

@@ -126 +126 @@
     }
   } else {
-    Nskip = gfits_matrix_size (&db[0].header);
+    Nskip = gfits_data_size (&db[0].header);
     Fseek (db[0].f, Nskip, SEEK_CUR);
   }