Changeset 38344

Timestamp:

Jun 1, 2015, 8:56:11 AM (11 years ago)

Author:

eugene

Message:

extending gfits_table_get_ APIs to allow separate scaling from swapping, in prep of using compression on tables

Location:

branches/eam_branches/ohana.20150429/src

Files:

• addstar/src/ReadStarsFITS.c (modified) (11 diffs)
• addstar/src/findskycell.c (modified) (2 diffs)
• addstar/src/skycells_to_mdc.c (modified) (1 diff)
• checkastro/src/load_images.c (modified) (1 diff)
• delstar/src/delete_duplicate_images.c (modified) (1 diff)
• delstar/src/delete_image_photcodes.c (modified) (1 diff)
• delstar/src/delete_imagename.c (modified) (1 diff)
• delstar/src/delete_times.c (modified) (1 diff)
• delstar/src/delstar.c (modified) (2 diffs)
• delstar/src/find_image_db.c (modified) (3 diffs)
• dvomerge/src/LoadImages.c (modified) (1 diff)
• dvomerge/src/dvo_image_merge_dbs.c (modified) (3 diffs)
• dvomerge/src/dvoconvert.c (modified) (1 diff)
• dvomerge/src/dvorepairFixImages.c (modified) (1 diff)
• dvomerge/src/dvoutils_load_image_index.c (modified) (1 diff)
• dvomerge/src/dvoverify_utils.c (modified) (1 diff)
• fakeastro/src/load_template_images.c (modified) (1 diff)
• gastro2/src/rfits.c (modified) (1 diff)
• getstar/src/dvoImageExtract.c (modified) (1 diff)
• getstar/src/dvoImageOverlaps.c (modified) (1 diff)
• getstar/src/dvoImagesAtCoords.c (modified) (1 diff)
• imregister/src/detsearch.c (modified) (1 diff)
• imregister/src/imphotsearch.c (modified) (1 diff)
• imregister/src/imregtable.c (modified) (1 diff)
• imregister/src/imsearch.c (modified) (1 diff)
• imregister/src/imstatreg.c (modified) (2 diffs)
• imregister/src/photsearch.c (modified) (2 diffs)
• imregister/src/spsearch.c (modified) (1 diff)
• libautocode/def/autocode.c (modified) (2 diffs)
• libautocode/def/autocode.h (modified) (1 diff)
• libdvo/Makefile (modified) (2 diffs)
• libdvo/include/dvo.h (modified) (3 diffs)
• libdvo/src/AstromOffsetMapIO.c (modified) (1 diff)
• libdvo/src/LoadImages.c (modified) (1 diff)
• libdvo/src/LoadPhotcodesFITS.c (modified) (1 diff)
• libdvo/src/dvo_catalog_mef.c (modified) (2 diffs)
• libdvo/src/dvo_catalog_split.c (modified) (4 diffs)
• libdvo/src/dvo_convert.c (modified) (21 diffs)
• libdvo/src/dvo_image.c (modified) (5 diffs)
• libdvo/src/dvo_image_raw.c (modified) (1 diff)
• libdvo/src/dvo_util.c (modified) (1 diff)
• libdvo/src/fits_db.c (modified) (2 diffs)
• libdvo/src/flatcorr_io.c (modified) (2 diffs)
• libdvo/src/skyregion_io.c (modified) (1 diff)
• markstar/src/find_images.c (modified) (1 diff)
• mosastro/src/rfits.c (modified) (1 diff)
• opihi/dvo/cmpReadFile.c (modified) (1 diff)
• photdbc/src/copy_images.c (modified) (1 diff)
• photdbc/src/find_images.c (modified) (1 diff)
• photdbc/src/flag_measures.c (modified) (1 diff)
• relastro/src/ImageTable.c (modified) (1 diff)
• relastro/src/assign_images.c (modified) (1 diff)
• relastro/src/load_images.c (modified) (1 diff)
• relphot/src/ImageTable.c (modified) (1 diff)
• relphot/src/assign_images.c (modified) (1 diff)
• relphot/src/load_images.c (modified) (1 diff)
• relphot/src/relphot_images.c (modified) (1 diff)
• uniphot/src/find_image_sgroups.c (modified) (1 diff)
• uniphot/src/find_image_tgroups.c (modified) (1 diff)
• uniphot/src/load_images.c (modified) (1 diff)
• uniphot/src/load_images_fiximids.c (modified) (1 diff)
• uniphot/src/load_images_fixstkids.c (modified) (1 diff)
• uniphot/src/load_images_setphot.c (modified) (1 diff)
• uniphot/src/load_images_setposangle.c (modified) (1 diff)
• uniphot/src/subset_images.c (modified) (1 diff)
• uniphot/src/update_dvo_uniphot.c (modified) (1 diff)

branches/eam_branches/ohana.20150429/src/addstar/src/ReadStarsFITS.c

@@ -153 +153 @@
   off_t Nstars;
   unsigned int i;
-  char swapped;
   double ZeroPt;
   Stars *stars = NULL;
   SMPData *smpdata = NULL;
 
-  swapped = FALSE;
-  smpdata = gfits_table_get_SMPData (table, &Nstars, &swapped);
+  smpdata = gfits_table_get_SMPData (table, &Nstars, NULL, NULL);
   if (!smpdata) {
     fprintf (stderr, "skipping inconsistent entry\n");
@@ -229 +227 @@
   PS1_DEV_0 *ps1data;
 
-  ps1data = gfits_table_get_PS1_DEV_0 (table, &Nstars, NULL);
+  ps1data = gfits_table_get_PS1_DEV_0 (table, &Nstars, NULL, NULL);
   if (!ps1data) {
     fprintf (stderr, "skipping inconsistent entry\n");
@@ -300 +298 @@
   PS1_DEV_1 *ps1data;
 
-  ps1data = gfits_table_get_PS1_DEV_1 (table, &Nstars, NULL);
+  ps1data = gfits_table_get_PS1_DEV_1 (table, &Nstars, NULL, NULL);
   if (!ps1data) {
     fprintf (stderr, "skipping inconsistent entry\n");
@@ -383 +381 @@
   }
 
-  ps1data = gfits_table_get_CMF_PS1_V1 (table, &Nstars, NULL);
+  ps1data = gfits_table_get_CMF_PS1_V1 (table, &Nstars, NULL, NULL);
   if (!ps1data) {
     fprintf (stderr, "skipping inconsistent entry\n");
@@ -545 +543 @@
   CMF_PS1_V2 *ps1data;
 
-  ps1data = gfits_table_get_CMF_PS1_V2 (table, &Nstars, NULL);
+  ps1data = gfits_table_get_CMF_PS1_V2 (table, &Nstars, NULL, NULL);
   if (!ps1data) {
     fprintf (stderr, "skipping inconsistent entry\n");
@@ -622 +620 @@
   CMF_PS1_V3 *ps1data;
 
-  ps1data = gfits_table_get_CMF_PS1_V3 (table, &Nstars, NULL);
+  ps1data = gfits_table_get_CMF_PS1_V3 (table, &Nstars, NULL, NULL);
   if (!ps1data) {
     fprintf (stderr, "skipping inconsistent entry\n");
@@ -706 +704 @@
   CMF_PS1_V4 *ps1data;
 
-  ps1data = gfits_table_get_CMF_PS1_V4 (table, &Nstars, NULL);
+  ps1data = gfits_table_get_CMF_PS1_V4 (table, &Nstars, NULL, NULL);
   if (!ps1data) {
     fprintf (stderr, "skipping inconsistent entry\n");
@@ -1259 +1257 @@
   }
 
-  ps1data = gfits_table_get_CMF_PS1_SV1 (table, &Nstars, NULL);
+  ps1data = gfits_table_get_CMF_PS1_SV1 (table, &Nstars, NULL, NULL);
   if (!ps1data) {
     fprintf (stderr, "skipping inconsistent entry\n");
@@ -1423 +1421 @@
   CMF_PS1_SV2 *ps1data;
 
-  ps1data = gfits_table_get_CMF_PS1_SV2 (table, &Nstars, NULL);
+  ps1data = gfits_table_get_CMF_PS1_SV2 (table, &Nstars, NULL, NULL);
   if (!ps1data) {
     fprintf (stderr, "skipping inconsistent entry\n");
@@ -1753 +1751 @@
   CMF_PS1_DV4 *ps1data;
 
-  ps1data = gfits_table_get_CMF_PS1_DV4 (table, &Nstars, NULL);
+  ps1data = gfits_table_get_CMF_PS1_DV4 (table, &Nstars, NULL, NULL);
   if (!ps1data) {
     fprintf (stderr, "skipping inconsistent entry\n");
@@ -1839 +1837 @@
   CMF_PS1_DV5 *ps1data;
 
-  ps1data = gfits_table_get_CMF_PS1_DV5 (table, &Nstars, NULL);
+  ps1data = gfits_table_get_CMF_PS1_DV5 (table, &Nstars, NULL, NULL);
   if (!ps1data) {
     fprintf (stderr, "skipping inconsistent entry\n");

branches/eam_branches/ohana.20150429/src/addstar/src/findskycell.c

@@ -183 +183 @@
   // convert database table to internal structure (binary to Image)
   // 'image' points to the same memory as db->ftable->buffer
-  image = gfits_table_get_Image (&db.ftable, &Nimage, &db.swapped);
+  image = gfits_table_get_Image (&db.ftable, &Nimage, &db.scaledValue, &db.nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");
@@ -567 +567 @@
   // convert database table to internal structure (binary to Image)
   // 'image' points to the same memory as db->ftable->buffer
-  image = gfits_table_get_Image (&db.ftable, &Nimage, &db.swapped);
+  image = gfits_table_get_Image (&db.ftable, &Nimage, &db.scaledValue, &db.nativeOrder);
   if (!image) {
     fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/addstar/src/skycells_to_mdc.c

@@ -5 +5 @@
     // Convert FITS_DB to images structure
     off_t NdbImages;
-    Image *dbImages = gfits_table_get_Image(&db->ftable, &NdbImages, &db->swapped);
+    Image *dbImages = gfits_table_get_Image(&db->ftable, &NdbImages, &db->scaledValue, &db->nativeOrder);
 
     // If tess_id was not supplied assume that it is the basename of the CATDIR

branches/eam_branches/ohana.20150429/src/checkastro/src/load_images.c

@@ -10 +10 @@
 
   // convert database table to internal structure
-  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/delstar/src/delete_duplicate_images.c

@@ -16 +16 @@
   Image *image, *outimage;
 
-  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
     fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/delstar/src/delete_image_photcodes.c

@@ -12 +12 @@
   PhotCode **photcodes = ParsePhotcodeList (PHOTCODE_LIST, &Nphotcodes, FALSE);
 
-  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
     fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/delstar/src/delete_imagename.c

@@ -18 +18 @@
   SkyTableSetFilenames (sky, CATDIR, "cpt");
 
-  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
     fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/delstar/src/delete_times.c

@@ -25 +25 @@
   skylist[0].ownElements = FALSE; // free these elements when freeing the list
 
-  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
     fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/delstar/src/delstar.c

@@ -30 +30 @@
     case MODE_FIX_LAP: {
         off_t Nimage;
-        Image *image = gfits_table_get_Image (&db.ftable, &Nimage, &db.swapped);
+        Image *image = gfits_table_get_Image (&db.ftable, &Nimage, &db.scaledValue, &db.nativeOrder);
         if (!image) {
           fprintf (stderr, "ERROR: failed to read images\n");
@@ -67 +67 @@
     case MODE_FIX_LAP_STATS: {
         off_t Nimage;
-        Image *image = gfits_table_get_Image (&db.ftable, &Nimage, &db.swapped);
+        Image *image = gfits_table_get_Image (&db.ftable, &Nimage, &db.scaledValue, &db.nativeOrder);
         if (!image) {
           fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/delstar/src/find_image_db.c

@@ -16 +16 @@
   }
 
-  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
     fprintf (stderr, "ERROR: failed to read images\n");
@@ -46 +46 @@
   int code;
 
-  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
 
   start = timage[0].tzero - MAX(0.01*timage[0].trate*timage[0].NY, 1);
@@ -76 +76 @@
   Image *image;
 
-  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
 
   Nlist = 0;

branches/eam_branches/ohana.20150429/src/dvomerge/src/LoadImages.c

@@ -34 +34 @@
   }
 
-  image = gfits_table_get_Image (&db->ftable, Nimage, &db->swapped);
+  image = gfits_table_get_Image (&db->ftable, Nimage, &db->scaledValue, &db->nativeOrder);
   if (!image) {
     fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/dvomerge/src/dvo_image_merge_dbs.c

@@ -16 +16 @@
   short  *TgtCodes;
  
-  imagesSrc = gfits_table_get_Image (&src[0].ftable, &NimagesSrc, &src[0].swapped);
+  imagesSrc = gfits_table_get_Image (&src[0].ftable, &NimagesSrc, &src[0].scaledValue, &src[0].nativeOrder);
   if (!imagesSrc) {
     fprintf (stderr, "ERROR: failed to read images from src\n");
@@ -22 +22 @@
   }
 
-  imagesTgt = gfits_table_get_Image (&tgt[0].ftable, &NimagesTgt, &tgt[0].swapped);
+  imagesTgt = gfits_table_get_Image (&tgt[0].ftable, &NimagesTgt, &tgt[0].scaledValue, &tgt[0].nativeOrder);
   if (!imagesTgt) {
     fprintf (stderr, "ERROR: failed to read images from tgt\n");
@@ -83 +83 @@
   }
 
-  images = gfits_table_get_Image (&in[0].ftable, &Nimages, &in[0].swapped);
+  images = gfits_table_get_Image (&in[0].ftable, &Nimages, &in[0].scaledValue, &in[0].nativeOrder);
   if (!images) {
     fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoconvert.c

@@ -149 +149 @@
 
   // convert the raw image table to Image type (byteswap if needed)
-  images = gfits_table_get_Image (&inDB.ftable, &Nimages, &inDB.swapped);
+  images = gfits_table_get_Image (&inDB.ftable, &Nimages, &inDB.scaledValue, &inDB.nativeOrder);
   if (!images) {
     fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairFixImages.c

@@ -280 +280 @@
   memset (&db.ftable.buffer[Nx*Nout], ' ', nbytes - Nx*Nout);
 
-  db.swapped = TRUE; // internal representation
+  db.nativeOrder = TRUE; // internal representation
+  db.scaledValue = TRUE; // internal representation
 
   gfits_modify (&db.header, "NIMAGES", OFF_T_FMT, 1,  Nout);

branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoutils_load_image_index.c

@@ -87 +87 @@
 
   off_t Nimage;
-  Image *image = gfits_table_get_Image (&db.ftable, &Nimage, &db.swapped);
+  Image *image = gfits_table_get_Image (&db.ftable, &Nimage, &db.scaledValue, &db.nativeOrder);
   if (!image) {
     fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoverify_utils.c

@@ -484 +484 @@
   }
 
-  images = gfits_table_get_Image (&inDB.ftable, &Nimages, &inDB.swapped);
+  images = gfits_table_get_Image (&inDB.ftable, &Nimages, &inDB.scaledValue, &inDB.nativeOrder);
   if (!images) {
     fprintf (stderr, "ERROR: failed to read images from src\n");

branches/eam_branches/ohana.20150429/src/fakeastro/src/load_template_images.c

@@ -24 +24 @@
 
   off_t Nimage;
-  Image *image = gfits_table_get_Image (&db.ftable, &Nimage, &db.swapped);
+  Image *image = gfits_table_get_Image (&db.ftable, &Nimage, &db.scaledValue, &db.nativeOrder);
   if (!image) {
     fprintf (stderr, "ERROR: no template images in %s (though db exists)\n", IMAGES_INPUT);

branches/eam_branches/ohana.20150429/src/gastro2/src/rfits.c

@@ -14 +14 @@
   if (!gfits_fread_ftable (f, &table, "SMPFILE")) goto escape;
 
-  stars = gfits_table_get_SMPData (&table, &Nstars, NULL);
+  stars = gfits_table_get_SMPData (&table, &Nstars, NULL, NULL);
   if (!stars) {
     fprintf (stderr, "ERROR: failed to read stars\n");

branches/eam_branches/ohana.20150429/src/getstar/src/dvoImageExtract.c

@@ -31 +31 @@
 
   // convert database table to internal structure
-  images = gfits_table_get_Image (&db.ftable, &Nimages, &db.swapped);
+  images = gfits_table_get_Image (&db.ftable, &Nimages, &db.scaledValue, &db.nativeOrder);
   if (!images) {
     fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/getstar/src/dvoImageOverlaps.c

@@ -34 +34 @@
 
   // convert database table to internal structure
-  dbImages = gfits_table_get_Image (&db.ftable, &NdbImages, &db.swapped);
+  dbImages = gfits_table_get_Image (&db.ftable, &NdbImages, &db.scaledValue, &db.nativeOrder);
   if (!dbImages) {
     fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/getstar/src/dvoImagesAtCoords.c

@@ -60 +60 @@
 
     // convert database table to internal structure
-    dbImages = gfits_table_get_Image (&db.ftable, &NdbImages, &db.swapped);
+    dbImages = gfits_table_get_Image (&db.ftable, &NdbImages, &db.scaledValue, &db.nativeOrder);
     if (!dbImages) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/imregister/src/detsearch.c

@@ -35 +35 @@
 
   if (!output.Modify && !output.Delete && !output.Altpath) gfits_db_close (&db);
-  detrend = gfits_table_get_DetReg (&db.ftable, &Ndetrend, &db.swapped);
+  detrend = gfits_table_get_DetReg (&db.ftable, &Ndetrend, &db.scaledValue, &db.nativeOrder);
   if (!detrend) {
     fprintf (stderr, "ERROR: failed to read detrend info\n");

branches/eam_branches/ohana.20150429/src/imregister/src/imphotsearch.c

@@ -32 +32 @@
   if (!options.modify) gfits_db_close (&db);
 
-  image = gfits_table_get_Image (&db.ftable, &Nimage, &db.swapped);
+  image = gfits_table_get_Image (&db.ftable, &Nimage, &db.scaledValue, &db.nativeOrder);
   if (!image) {
     fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/imregister/src/imregtable.c

@@ -33 +33 @@
   gfits_read_ftable  (infile, &ftable, "IMAGE_DATABASE");
 
-  image = gfits_table_get_RegImage (&ftable, &Nimage, NULL);
+  image = gfits_table_get_RegImage (&ftable, &Nimage, NULL, NULL);
   if (!image) {
     fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/imregister/src/imsearch.c

@@ -29 +29 @@
   if (!output.modify && !output.delete) gfits_db_close (&db);
 
-  image = gfits_table_get_RegImage (&db.ftable, &Nimage, &db.swapped);
+  image = gfits_table_get_RegImage (&db.ftable, &Nimage, &db.scaledValue, &db.nativeOrder);
   if (!image) {
     fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/imregister/src/imstatreg.c

@@ -66 +66 @@
       exit (1);
     }
-    subset = gfits_table_get_RegImage (&temp_db.ftable, &Nsubset, &temp_db.swapped);
+    subset = gfits_table_get_RegImage (&temp_db.ftable, &Nsubset, &temp_db.scaledValue, &temp_db.nativeOrder);
     if (!subset) {
       fprintf (stderr, "ERROR: failed to read images\n");
@@ -96 +96 @@
          we will just drop the temp db data */
     }
-    image = gfits_table_get_RegImage (&image_db.ftable, &Nimage, &image_db.swapped);
+    image = gfits_table_get_RegImage (&image_db.ftable, &Nimage, &image_db.scaledValue, &image_db.nativeOrder);
     if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/imregister/src/photsearch.c

@@ -41 +41 @@
   /* add test to EXTNAME? */
   if (output.convert) {
-    photpars_old = gfits_table_get_PhotParsOld (&db.ftable, &Nphotpars, &db.swapped);
+    photpars_old = gfits_table_get_PhotParsOld (&db.ftable, &Nphotpars, &db.scaledValue, &db.nativeOrder);
     if (!photpars_old) {
       fprintf (stderr, "ERROR: failed to read photometry parameters\n");
@@ -48 +48 @@
     photpars = PhotParsOld_to_PhotPars (photpars_old, Nphotpars);
   } else {
-    photpars = gfits_table_get_PhotPars (&db.ftable, &Nphotpars, &db.swapped);
+    photpars = gfits_table_get_PhotPars (&db.ftable, &Nphotpars, &db.scaledValue, &db.nativeOrder);
     if (!photpars) {
       fprintf (stderr, "ERROR: failed to read photometry parameters\n");

branches/eam_branches/ohana.20150429/src/imregister/src/spsearch.c

@@ -29 +29 @@
   if (!output.modify && !output.delete) gfits_db_close (&db);
 
-  spectrum = gfits_table_get_Spectrum (&db.ftable, &Nspectrum, &db.swapped);
+  spectrum = gfits_table_get_Spectrum (&db.ftable, &Nspectrum, &db.scaledValue, &db.nativeOrder);
   if (!spectrum) {
     fprintf (stderr, "ERROR: failed to read spectrum\n");

branches/eam_branches/ohana.20150429/src/libautocode/def/autocode.c

@@ -27 +27 @@
 /*** add test of EXTNAME and header-defined columns? ***/
 /* return internal structure representation */
-$STRUCT *gfits_table_get_$STRUCT (FTable *ftable, off_t *Ndata, char *swapped) {
+/* scaledData & nativeBytes describe the current state of the ftable.buffer */
+$STRUCT *gfits_table_get_$STRUCT (FTable *ftable, off_t *Ndata, char *scaledValue, char *nativeOrder) {
 
   int Ncols;
@@ -40 +41 @@
   *Ndata = ftable[0].header[0].Naxis[1];
   data = ($STRUCT *) ftable[0].buffer;
-  if ((swapped == NULL) || (*swapped == FALSE)) {
+
+  // if the pointer is not passed, we need to swap
+  if (!nativeOrder || !*nativeOrder) {
     if (!gfits_convert_$STRUCT (data, sizeof ($STRUCT), *Ndata)) {
       return NULL;
     }
+    if (nativeOrder) *nativeOrder = TRUE;
+  }
+  // if the pointer is not passed, we need to scale
+  if (!scaledValue || !*scaledValue) {
     gfits_table_scale_data (ftable);
-    if (swapped != NULL) *swapped = TRUE;
+    if (scaledValue) *scaledValue = TRUE;
   }
   return (data);

branches/eam_branches/ohana.20150429/src/libautocode/def/autocode.h

@@ -2 +2 @@
 /** STRUCT DEFINITION **/
 
-$STRUCT *gfits_table_get_$STRUCT (FTable *table, off_t *Ndata, char *swapped);
+$STRUCT *gfits_table_get_$STRUCT (FTable *table, off_t *Ndata, char *scaledValue, char *nativeOrder);
 int      gfits_table_set_$STRUCT (FTable *ftable, $STRUCT *data, off_t Ndata);
 int      gfits_table_mkheader_$STRUCT (Header *header);

branches/eam_branches/ohana.20150429/src/libdvo/Makefile

@@ -10 +10 @@
 MAN     =       $(HOME)/doc
 INC     =       $(HOME)/include
+TEST    =       $(HOME)/test
+TESTBIN =       $(HOME)/test
 ASRC    =       $(AUTO)/src
 AINC    =       $(AUTO)/include
@@ -153 +155 @@
         rm -f $@
         cp $< $@
+        echo "done making autocode.h"
 
 $(AINC)/autocode.h: $(AINCS) $(ADEF)/autocode.h $(ADEF)/common.h

branches/eam_branches/ohana.20150429/src/libdvo/include/dvo.h

@@ -230 +230 @@
   char   format;        /* what data format is used for disk file? */
   char   virtual;       /* is table in ftable or vtable? */
-  char   swapped;       /* is table in internal byte-order? */
+  char   nativeOrder;   /* is table in internal byte-order? */
+  char   scaledValue;   /* is table in internal byte-order? */
 } FITS_DB;
 
@@ -966 +967 @@
 DVOTableFormat FtableGetFormat (FTable *ftable);
 
-Average *FtableToAverage (FTable *ftable, off_t *Naverage, char *format, SecFilt **primary);
+Average *FtableToAverage (FTable *ftable, off_t *Naverage, char *format, SecFilt **primary, char nativeBytes);
 Measure *FtableToMeasure (FTable *ftable, Average *average, off_t *Nmeasure, char *format);
 SecFilt *FtableToSecFilt (FTable *ftable, off_t *Nsecfilt, char *format);
@@ -1017 +1018 @@
 int gfits_table_set_Image (FTable *ftable);
 int gfits_table_mkheader_Image (Header *header);
-Image *gfits_table_get_Image (FTable *ftable, off_t *Ndata, char *swapped);
+Image *gfits_table_get_Image (FTable *ftable, off_t *Ndata, char *scaledValue, char *nativeOrder);
 
 /* flatcorr APIs */

branches/eam_branches/ohana.20150429/src/libdvo/src/AstromOffsetMapIO.c

@@ -39 +39 @@
     return (NULL);
   }
-  AstromOffsetMap_Disk_6x6 *map_disk = gfits_table_get_AstromOffsetMap_Disk_6x6 (&ftable, &Nmap, NULL);
+  AstromOffsetMap_Disk_6x6 *map_disk = gfits_table_get_AstromOffsetMap_Disk_6x6 (&ftable, &Nmap, NULL, NULL);
   if (!map_disk) {
     fprintf (stderr, "ERROR: failed to read Astrom Offset Map\n");

branches/eam_branches/ohana.20150429/src/libdvo/src/LoadImages.c

@@ -65 +65 @@
   }
 
-  image = gfits_table_get_Image (&db.ftable, Nimage, &db.swapped);
+  image = gfits_table_get_Image (&db.ftable, Nimage, &db.scaledValue, &db.nativeOrder);
   if (!image) {
     fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/libdvo/src/LoadPhotcodesFITS.c

@@ -43 +43 @@
 # define CONVERT_FORMAT(NAME, FORMAT)                                   \
   if (!strcmp (extname, NAME)) {                                        \
-    PhotCode_##FORMAT *photcode_input = gfits_table_get_PhotCode_##FORMAT (&db.ftable, &Ncode, &db.swapped); \
+    PhotCode_##FORMAT *photcode_input = gfits_table_get_PhotCode_##FORMAT (&db.ftable, &Ncode, &db.scaledValue, &db.nativeOrder); \
     if (!photcode_input) {                                                      \
       fprintf (stderr, "ERROR: failed to read photcodes in LoadPhotcodesFITS.c\n");             \

branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_catalog_mef.c

@@ -77 +77 @@
     }
     /* old versions of DVO stored one of the average magnitudes in Average. we save this if needed */
-    catalog[0].average = FtableToAverage (&ftable, &Naverage, &catalog[0].catformat, &primary);
+    catalog[0].average = FtableToAverage (&ftable, &Naverage, &catalog[0].catformat, &primary, FALSE);
     if (Naverage != catalog[0].Naves_disk) {
       fprintf (stderr, "Warning: mismatch between Naverage in PHU and Table headers ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Naverage,  catalog[0].Naves_disk);
@@ -131 +131 @@
     }
     /* no conversions currently defined */
-    catalog[0].missing = gfits_table_get_Missing (&ftable, &catalog[0].Nmissing, NULL);
+    catalog[0].missing = gfits_table_get_Missing (&ftable, &catalog[0].Nmissing, NULL, NULL);
     if (!catalog[0].missing) {
       fprintf (stderr, "ERROR: failed to read missing\n");

branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_catalog_split.c

@@ -311 +311 @@
   /* read Average table header */
   if (!gfits_fread_header (catalog[0].f, &header)) { 
-    if (VERBOSE) fprintf (stderr, "can't read table average header");
+    if (VERBOSE) fprintf (stderr, "can't read table average header\n");
     return (FALSE);
   }
   if (catalog[0].catflags & LOAD_AVES) {
+    Header rawheader;
+    FTable rawtable;
+    rawtable.header = &rawheader;
+    FTable *outtable = &ftable;
+    char nativeOrder = FALSE;
+
     /* read Average table data : format is irrelevant here */
     if (!gfits_fread_ftable_data (catalog[0].f, &ftable, FALSE)) { 
-      if (VERBOSE) fprintf (stderr, "can't read table average data");
-      return (FALSE);
-    }
+      if (VERBOSE) fprintf (stderr, "can't read table average data\n");
+      return (FALSE);
+    }
+    if (gfits_extension_is_compressed_table (ftable.header)) {
+      if (!gfits_uncompress_table (&ftable, &rawtable)) {
+        if (VERBOSE) fprintf (stderr, "failed to uncompress table\n");
+        return (FALSE);
+      }
+      gfits_free_table (&ftable);
+      outtable = &rawtable;
+      nativeOrder = TRUE;
+    }
+    // NOTE: fread_ftable returns an unswapped table; uncompress swaps the bytes into native order
+
     /* convert the saved version of the table to the internal version.  Old versions of DVO stored
      * one of the average magnitudes in Average.  We save this in case it is needed below.  NOTE:
      * primary is only used if we read in the secfilt table, otherwise it should be freed */
-    catalog[0].average = FtableToAverage (&ftable, &Naverage, &catalog[0].catformat, &primary);
+    catalog[0].average = FtableToAverage (outtable, &Naverage, &catalog[0].catformat, &primary, nativeOrder);
     if (Naverage != catalog[0].Naves_disk) {
       fprintf (stderr, "Warning: mismatch between Naverage in PHU and Table headers ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Naverage,  catalog[0].Naves_disk);
@@ -393 +410 @@
     }
     /* no conversions currently defined : this just does the byte swap */
-    catalog[0].missing = gfits_table_get_Missing (&ftable, &Nmissing, NULL);
+    catalog[0].missing = gfits_table_get_Missing (&ftable, &Nmissing, NULL, NULL);
     if (!catalog[0].missing) {
       fprintf (stderr, "ERROR: failed to read missing\n");
@@ -652 +669 @@
      * one of the average magnitudes in Average.  We save this in case it is needed below.  NOTE:
      * primary is only used if we read in the secfilt table, otherwise it should be freed */
-    catalog[0].average = FtableToAverage (&ftable, &Naverage, &catalog[0].catformat, &primary);
+    catalog[0].average = FtableToAverage (&ftable, &Naverage, &catalog[0].catformat, &primary, FALSE);
     if (Naverage != Nrows) {
       // XXX this condition denotes the eof has been reached; not an error or a warning
@@ -747 +764 @@
 
     /* no conversions currently defined : this just does the byte swap */
-    catalog[0].missing = gfits_table_get_Missing (&ftable, &Nmissing, NULL);
+    catalog[0].missing = gfits_table_get_Missing (&ftable, &Nmissing, NULL, NULL);
     if (!catalog[0].missing) {
       fprintf (stderr, "ERROR: failed to read missing\n");

branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_convert.c

@@ -52 +52 @@
 /*** Average / FTable conversion functions ***/
 
-Average *FtableToAverage (FTable *ftable, off_t *Naverage, char *format, SecFilt **primary) {
+Average *FtableToAverage (FTable *ftable, off_t *Naverage, char *format, SecFilt **primary, char nativeBytes) {
 
   Average *average;
@@ -98 +98 @@
   if (!strcmp (extname, NAME)) { \
     Average_##TYPE *tmpAverage; \
-    tmpAverage = gfits_table_get_Average_##TYPE (ftable, Naverage, NULL); \
+      tmpAverage = gfits_table_get_Average_##TYPE (ftable, Naverage, NULL, &nativeBytes); \
     if (!tmpAverage) { \
       fprintf (stderr, "ERROR: failed to read averages\n"); \
@@ -109 +109 @@
 
   if (!strcmp (extname, "DVO_AVERAGE")) {
-    average = gfits_table_get_Average (ftable, Naverage, NULL);
+    average = gfits_table_get_Average (ftable, Naverage, NULL, NULL);
     if (!average) {
       fprintf (stderr, "ERROR: failed to read averages\n");
@@ -226 +226 @@
   if (!strcmp (extname, NAME)) {                                        \
     Measure_##TYPE *tmpMeasure;                                         \
-    tmpMeasure = gfits_table_get_Measure_##TYPE (ftable, Nmeasure, NULL); \
-    if (!tmpMeasure) {                                                  \
-      fprintf (stderr, "ERROR: failed to read measures\n");             \
-      exit (2);                                                         \
-    }                                                                   \
-    myAssert (ABS_COORDS || average, "conversion to internal needs average table"); \
+      tmpMeasure = gfits_table_get_Measure_##TYPE (ftable, Nmeasure, NULL, NULL); \
+        if (!tmpMeasure) {                                              \
+          fprintf (stderr, "ERROR: failed to read measures\n");         \
+          exit (2);                                                     \
+        }                                                               \
+        myAssert (ABS_COORDS || average, "conversion to internal needs average table"); \
     measure = Measure_##TYPE##_ToInternal (average, tmpMeasure, *Nmeasure); \
     free (tmpMeasure);                                                  \
@@ -238 +238 @@
 
   if (!strcmp (extname, "DVO_MEASURE")) {
-    measure = gfits_table_get_Measure (ftable, Nmeasure, NULL);
+    measure = gfits_table_get_Measure (ftable, Nmeasure, NULL, NULL);
     if (!measure) {
       fprintf (stderr, "ERROR: failed to read measures\n");
@@ -339 +339 @@
   if (!strcmp (extname, NAME)) { \
     SecFilt_##TYPE *tmpSecFilt; \
-    tmpSecFilt = gfits_table_get_SecFilt_##TYPE (ftable, Nsecfilt, NULL); \
+    tmpSecFilt = gfits_table_get_SecFilt_##TYPE (ftable, Nsecfilt, NULL, NULL); \
     if (!tmpSecFilt) { \
       fprintf (stderr, "ERROR: failed to read secfilts\n"); \
@@ -350 +350 @@
 
   if (!strcmp (extname, "DVO_SECFILT")) {
-    secfilt = gfits_table_get_SecFilt (ftable, Nsecfilt, NULL);
+    secfilt = gfits_table_get_SecFilt (ftable, Nsecfilt, NULL, NULL);
     if (!secfilt) {
       fprintf (stderr, "ERROR: failed to read secfilts\n");
@@ -433 +433 @@
   if (!strcmp (extname, "DVO_LENSING_PS1_V5") && (ftable[0].header[0].Naxis[0] == 128)) {
     Lensing_PS1_V5_R0 *tmpLensing;                                              
-    tmpLensing = gfits_table_get_Lensing_PS1_V5_R0 (ftable, Nlensing, NULL); 
+    tmpLensing = gfits_table_get_Lensing_PS1_V5_R0 (ftable, Nlensing, NULL, NULL); 
     if (!tmpLensing) {                                                  
       fprintf (stderr, "ERROR: failed to read lensings\n");             
@@ -445 +445 @@
   if (!strcmp (extname, "DVO_LENSING_PS1_V5") && (ftable[0].header[0].Naxis[0] == 136)) {
     Lensing_PS1_V5_R1 *tmpLensing;                                              
-    tmpLensing = gfits_table_get_Lensing_PS1_V5_R1 (ftable, Nlensing, NULL); 
+    tmpLensing = gfits_table_get_Lensing_PS1_V5_R1 (ftable, Nlensing, NULL, NULL); 
     if (!tmpLensing) {                                                  
       fprintf (stderr, "ERROR: failed to read lensings\n");             
@@ -457 +457 @@
   if (!strcmp (extname, "DVO_LENSING_PS1_V5") && (ftable[0].header[0].Naxis[0] == 144)) {
     Lensing_PS1_V5_R2 *tmpLensing;                                              
-    tmpLensing = gfits_table_get_Lensing_PS1_V5_R2 (ftable, Nlensing, NULL); 
+    tmpLensing = gfits_table_get_Lensing_PS1_V5_R2 (ftable, Nlensing, NULL, NULL); 
     if (!tmpLensing) {                                                  
       fprintf (stderr, "ERROR: failed to read lensings\n");             
@@ -477 +477 @@
   if (!strcmp (extname, NAME)) {                                        \
     Lensing_##TYPE *tmpLensing;                                         \
-    tmpLensing = gfits_table_get_Lensing_##TYPE (ftable, Nlensing, NULL); \
+    tmpLensing = gfits_table_get_Lensing_##TYPE (ftable, Nlensing, NULL, NULL); \
     if (!tmpLensing) {                                                  \
       fprintf (stderr, "ERROR: failed to read lensings\n");             \
@@ -488 +488 @@
 
   if (!strcmp (extname, "DVO_LENSING")) {
-    lensing = gfits_table_get_Lensing (ftable, Nlensing, NULL);
+    lensing = gfits_table_get_Lensing (ftable, Nlensing, NULL, NULL);
     if (!lensing) {
       fprintf (stderr, "ERROR: failed to read lensings\n");
@@ -572 +572 @@
   if (!strcmp (extname, "DVO_LENSOBJ_PS1_V5") && (ftable[0].header[0].Naxis[0] == 136)) {
     Lensobj_PS1_V5_R0 *tmpLensobj;                                              
-    tmpLensobj = gfits_table_get_Lensobj_PS1_V5_R0 (ftable, Nlensobj, NULL); 
+    tmpLensobj = gfits_table_get_Lensobj_PS1_V5_R0 (ftable, Nlensobj, NULL, NULL); 
     if (!tmpLensobj) {                                                  
       fprintf (stderr, "ERROR: failed to read lensobjs\n");             
@@ -592 +592 @@
   if (!strcmp (extname, NAME)) {                                        \
     Lensobj_##TYPE *tmpLensobj;                                         \
-    tmpLensobj = gfits_table_get_Lensobj_##TYPE (ftable, Nlensobj, NULL); \
+    tmpLensobj = gfits_table_get_Lensobj_##TYPE (ftable, Nlensobj, NULL, NULL); \
     if (!tmpLensobj) {                                                  \
       fprintf (stderr, "ERROR: failed to read lensobjs\n");             \
@@ -603 +603 @@
 
   if (!strcmp (extname, "DVO_LENSOBJ")) {
-    lensobj = gfits_table_get_Lensobj (ftable, Nlensobj, NULL);
+    lensobj = gfits_table_get_Lensobj (ftable, Nlensobj, NULL, NULL);
     if (!lensobj) {
       fprintf (stderr, "ERROR: failed to read lensobjs\n");
@@ -695 +695 @@
   if (!strcmp (extname, NAME)) {                                        \
     StarPar_##TYPE *tmpStarPar;                                         \
-    tmpStarPar = gfits_table_get_StarPar_##TYPE (ftable, Nstarpar, NULL); \
+    tmpStarPar = gfits_table_get_StarPar_##TYPE (ftable, Nstarpar, NULL, NULL); \
     if (!tmpStarPar) {                                                  \
       fprintf (stderr, "ERROR: failed to read starpar\n");              \
@@ -706 +706 @@
 
   if (!strcmp (extname, "DVO_STARPAR")) {
-    starpar = gfits_table_get_StarPar (ftable, Nstarpar, NULL);
+    starpar = gfits_table_get_StarPar (ftable, Nstarpar, NULL, NULL);
     if (!starpar) {
       fprintf (stderr, "ERROR: failed to read starpar\n");
@@ -799 +799 @@
   if (!strcmp (extname, NAME)) {                                        \
     GalShape_##TYPE *tmpGalShape;                                               \
-    tmpGalShape = gfits_table_get_GalShape_##TYPE (ftable, Ngalshape, NULL); \
+    tmpGalShape = gfits_table_get_GalShape_##TYPE (ftable, Ngalshape, NULL, NULL); \
     if (!tmpGalShape) {                                                 \
       fprintf (stderr, "ERROR: failed to read galshapes\n");            \
@@ -810 +810 @@
 
   if (!strcmp (extname, "DVO_GALSHAPE")) {
-    galshape = gfits_table_get_GalShape (ftable, Ngalshape, NULL);
+    galshape = gfits_table_get_GalShape (ftable, Ngalshape, NULL, NULL);
     if (!galshape) {
       fprintf (stderr, "ERROR: failed to read galshapes\n");
@@ -891 +891 @@
   if (*format == DVO_FORMAT_ELIXIR) {             // special case for ELIXIR
     Image_Elixir *tmpimage;
-    tmpimage = gfits_table_get_Image_Elixir (ftable, &Nimage, NULL);
+    tmpimage = gfits_table_get_Image_Elixir (ftable, &Nimage, NULL, NULL);
     if (!tmpimage) {
       fprintf (stderr, "ERROR: failed to read images\n");
@@ -917 +917 @@
     Image_##TYPE *tmpimage; \
     *format = DVO_FORMAT_##FORMAT; \
-    tmpimage = gfits_table_get_Image_##TYPE (ftable, &Nimage, NULL); \
+    tmpimage = gfits_table_get_Image_##TYPE (ftable, &Nimage, NULL, NULL); \
     if (!tmpimage) { \
       fprintf (stderr, "ERROR: failed to read images\n"); \

branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_image.c

@@ -89 +89 @@
   // so when we later do a gfits_copy_ftable, we stomp on bad memory
   FtableToImage (&db[0].ftable, &db[0].theader, &db[0].format);
-  db[0].swapped = TRUE;  /* table has internal byte-order */
+  db[0].nativeOrder = TRUE;  /* table has internal byte-order */
+  db[0].scaledValue = TRUE;  /* table has internal byte-order */
   return (TRUE);
 }
@@ -100 +101 @@
   /* convert from internal to requested external format */
   ImageToFtable (&db[0].ftable, &db[0].theader, db[0].format);
-  db[0].swapped = FALSE;
+  db[0].nativeOrder = FALSE;
+  db[0].scaledValue = FALSE;
 
   /* write data in appropriate mode */
@@ -149 +151 @@
   /* theader is modified to match output format */
   ImageToVtable (&db[0].vtable, &db[0].theader, db[0].format);
-  db[0].swapped = FALSE;
+  db[0].scaledValue = FALSE;
+  db[0].nativeOrder = FALSE;
 
   /* write data in appropriate mode */
@@ -363 +366 @@
 
 /* return internal structure representation */
-Image *gfits_table_get_Image (FTable *ftable, off_t *Ndata, char *swapped) {
+Image *gfits_table_get_Image (FTable *ftable, off_t *Ndata, char *scaledValue, char *nativeOrder) {
 
   int Ncols;
@@ -377 +380 @@
   data = (Image *) ftable[0].buffer;
 
-  if (!swapped) {
-    myAbort ("invalid to call this without suppying 'swapped'");
-  }
-  if (*swapped == FALSE) {
-    myAbort ("invalid for table to be swapped");
+  if (!scaledValue) {
+    myAbort ("invalid to call this without suppying 'scaledValue'");
+  }
+  if (*scaledValue == FALSE) {
+    myAbort ("invalid for table NOT to be scaledValue");
+  }
+  if (!nativeOrder) {
+    myAbort ("invalid to call this without suppying 'nativeOrder'");
+  }
+  if (*nativeOrder == FALSE) {
+    myAbort ("invalid for table NOT to be nativeOrder");
   }
     

branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_image_raw.c

@@ -107 +107 @@
   db[0].theader.Naxis[1] = Nimage;
   db[0].ftable.datasize = gfits_data_size (&db[0].theader);
-  db[0].swapped = FALSE;  /* table does not have internal byte-order */
+
+  db[0].nativeOrder = FALSE;  /* table does not have internal byte-order */
+  db[0].scaledValue = FALSE;  /* table does not have internal byte-order */
   return (TRUE);
 }

branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_util.c

@@ -127 +127 @@
     }
 
-    dvoConfig->images = gfits_table_get_Image (&dvoConfig->imageDB.ftable, &dvoConfig->nImages, &dvoConfig->imageDB.swapped);
+    dvoConfig->images = gfits_table_get_Image (&dvoConfig->imageDB.ftable, &dvoConfig->nImages, &dvoConfig->imageDB.scaledValue, &dvoConfig->imageDB.nativeOrder);
     if (!dvoConfig->images) {
         fprintf (stderr, "problem loading images\n");

branches/eam_branches/ohana.20150429/src/libdvo/src/fits_db.c

@@ -6 +6 @@
   db[0].f             = NULL;
   db[0].filename      = NULL;
+  db[0].dbstate       = 0;
+  db[0].lockstate     = 0;
+  db[0].mode          = 0;
+  db[0].format        = 0;
+  db[0].virtual       = 0;
+  db[0].nativeOrder   = 0;
+  db[0].scaledValue   = 0;
   
-# if (1)
   gfits_init_header (&db->header);
   gfits_init_matrix (&db->matrix);
   gfits_init_header (&db->theader);
-  gfits_init_table (&db->ftable);
+  gfits_init_table  (&db->ftable);
   db->ftable.header = &db->theader;
   gfits_init_vtable (&db->vtable);
-# else  
-  db[0].header.buffer = NULL;
-  db[0].matrix.buffer = NULL;
-  db[0].theader.buffer = NULL;
-  db[0].ftable.buffer = NULL;
-  db[0].ftable.header = &db[0].theader;
-  db[0].vtable.header = NULL;
-  db[0].vtable.buffer = NULL;
-  db[0].vtable.row    = NULL;
-# endif
   return (TRUE);
 }
@@ -97 +93 @@
     return (FALSE);
   }
-  db[0].swapped = FALSE;  /* table does not have internal byte-order */
+  db[0].nativeOrder = FALSE;  /* table does not have internal byte-order */
+  db[0].scaledValue = FALSE;  /* table has not been scaled by BZERO,BSCALE */
   return (TRUE);
 }

branches/eam_branches/ohana.20150429/src/libdvo/src/flatcorr_io.c

@@ -49 +49 @@
     return (NULL);
   }
-  flatcorrTable->image = gfits_table_get_FlatCorrectionImage (&ftable, &flatcorrTable->Nimage, NULL);
+  flatcorrTable->image = gfits_table_get_FlatCorrectionImage (&ftable, &flatcorrTable->Nimage, NULL, NULL);
   if (!flatcorrTable->image) {
     fprintf (stderr, "ERROR: failed to read Flat Correction Images\n");
@@ -64 +64 @@
     return (NULL);
   }
-  flatcorrTable->corr = gfits_table_get_FlatCorrection (&ftable, &flatcorrTable->Ncorr, NULL);
+  flatcorrTable->corr = gfits_table_get_FlatCorrection (&ftable, &flatcorrTable->Ncorr, NULL, NULL);
   if (!flatcorrTable->corr) {
     fprintf (stderr, "ERROR: failed to read Flat Corrections\n");

branches/eam_branches/ohana.20150429/src/libdvo/src/skyregion_io.c

@@ -40 +40 @@
   ALLOCATE (skytable, SkyTable, 1);
   memset (skytable->hosts, 0, 80);
-  skytable[0].regions = gfits_table_get_SkyRegion (&ftable, &skytable[0].Nregions, NULL);
+  skytable[0].regions = gfits_table_get_SkyRegion (&ftable, &skytable[0].Nregions, NULL, NULL);
   if (!skytable[0].regions) {
     fprintf (stderr, "ERROR: failed to read sky regions\n");

branches/eam_branches/ohana.20150429/src/markstar/src/find_images.c

@@ -25 +25 @@
   }
 
-  timage = gfits_table_get_Image (&db[0].ftable, &Ntimage, &db[0].swapped);
+  timage = gfits_table_get_Image (&db[0].ftable, &Ntimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!timage) {
     fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/mosastro/src/rfits.c

@@ -31 +31 @@
 
   off_t Nstars;
-  stars = gfits_table_get_SMPData (&table, &Nstars, NULL);
+  stars = gfits_table_get_SMPData (&table, &Nstars, NULL, NULL);
   if (!stars) {
     fprintf (stderr, "ERROR: failed to read stars\n");

branches/eam_branches/ohana.20150429/src/opihi/dvo/cmpReadFile.c

@@ -19 +19 @@
   if (!gfits_fread_ftable (f, &table, "SMPFILE")) goto escape;
 
-  smpdata = gfits_table_get_SMPData (&table, &Nstars, NULL);
+  smpdata = gfits_table_get_SMPData (&table, &Nstars, NULL, NULL);
   if (!smpdata) {
     fprintf (stderr, "ERROR: failed to read stars\n");

branches/eam_branches/ohana.20150429/src/photdbc/src/copy_images.c

@@ -46 +46 @@
   dvo_image_create (&out, ZERO_POINT);
     
-  image = gfits_table_get_Image (&in.ftable, &Nimage, &in.swapped);
+  image = gfits_table_get_Image (&in.ftable, &Nimage, &in.scaledValue, &in.nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/photdbc/src/find_images.c

@@ -24 +24 @@
   tcoords.cdelt1 = tcoords.cdelt2 = 1.0 / 3600.0;
 
-  timage = gfits_table_get_Image (&db[0].ftable, &Ntimage, &db[0].swapped);
+  timage = gfits_table_get_Image (&db[0].ftable, &Ntimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!timage) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/photdbc/src/flag_measures.c

@@ -15 +15 @@
   if (VERBOSE) fprintf (stderr, "flagging bad measurements\n");
 
-  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/relastro/src/ImageTable.c

@@ -27 +27 @@
   // convert database table to internal structure (binary to Image)
   // 'image' points to the same memory as db->ftable->buffer
-  Image *image = gfits_table_get_Image (&db.ftable, &Nimage, &db.swapped);
+  Image *image = gfits_table_get_Image (&db.ftable, &Nimage, &db.scaledValue, &db.nativeOrder);
   if (!image) {
     Shutdown ("ERROR: failed to read images");

branches/eam_branches/ohana.20150429/src/relastro/src/assign_images.c

@@ -11 +11 @@
   // convert database table to internal structure (binary to Image)
   // 'image' points to the same memory as db->ftable->buffer
-  Image *image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  Image *image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/relastro/src/load_images.c

@@ -16 +16 @@
 
   // convert database table to internal structure
-  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/relphot/src/ImageTable.c

@@ -27 +27 @@
   // convert database table to internal structure (binary to Image)
   // 'image' points to the same memory as db->ftable->buffer
-  Image *image = gfits_table_get_Image (&db.ftable, &Nimage, &db.swapped);
+  Image *image = gfits_table_get_Image (&db.ftable, &Nimage, &db.scaledValue, &db.nativeOrder);
   if (!image) {
     Shutdown ("ERROR: failed to read images");

branches/eam_branches/ohana.20150429/src/relphot/src/assign_images.c

@@ -11 +11 @@
   // convert database table to internal structure (binary to Image)
   // 'image' points to the same memory as db->ftable->buffer
-  Image *image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  Image *image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/relphot/src/load_images.c

@@ -21 +21 @@
   // convert database table to internal structure (binary to Image)
   // 'image' points to the same memory as db->ftable->buffer
-  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/relphot/src/relphot_images.c

@@ -185 +185 @@
       // convert database table to internal structure (binary to Image)
       // 'image' points to the same memory as db->ftable->buffer
-      image = gfits_table_get_Image (&db.ftable, &Nimage, &db.swapped);
+      image = gfits_table_get_Image (&db.ftable, &Nimage, &db.scaledValue, &db.nativeOrder);
       if (!image) {
         fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/uniphot/src/find_image_sgroups.c

@@ -12 +12 @@
 
   imlink = *Imlink;
-  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/uniphot/src/find_image_tgroups.c

@@ -11 +11 @@
   ImageLink *imlink;
 
-  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/uniphot/src/load_images.c

@@ -21 +21 @@
 
   /* use a vtable to keep the images to be calibrated */
-  image = gfits_table_get_Image (&db[0].ftable, Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/uniphot/src/load_images_fiximids.c

@@ -20 +20 @@
 
   /* use a vtable to keep the images to be calibrated */
-  image = gfits_table_get_Image (&db[0].ftable, Nimage_load, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, Nimage_load, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/uniphot/src/load_images_fixstkids.c

@@ -19 +19 @@
 
   /* use a vtable to keep the images to be calibrated */
-  image = gfits_table_get_Image (&db[0].ftable, Nimage_load, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, Nimage_load, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/uniphot/src/load_images_setphot.c

@@ -11 +11 @@
 
   /* use a vtable to keep the images to be calibrated */
-  image = gfits_table_get_Image (&db[0].ftable, Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/uniphot/src/load_images_setposangle.c

@@ -19 +19 @@
 
   /* use a vtable to keep the images to be calibrated */
-  image = gfits_table_get_Image (&db[0].ftable, Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/uniphot/src/subset_images.c

@@ -8 +8 @@
 
   // convert from the binary I/O format to the internal structure (Image)
-  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");

branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_uniphot.c

@@ -14 +14 @@
   Coords coords;
 
-  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");