Changeset 15732

Timestamp:

Dec 4, 2007, 12:32:27 PM (18 years ago)

Author:

eugene

Message:

various changes to support the reworked dvo_catalog apis; most important is the better tracking of the disk and memory elements of each table

Location:

branches/eam_branch_20071130/Ohana/src

Files:

• addstar/src/SEDfit.c (modified) (1 diff)
• addstar/src/UpdateDatabase_Image.c (modified) (4 diffs)
• addstar/src/UpdateDatabase_Refcat.c (modified) (3 diffs)
• addstar/src/UpdateDatabase_Reflist.c (modified) (3 diffs)
• addstar/src/addstar.c (modified) (1 diff)
• addstar/src/find_matches.c (modified) (1 diff)
• addstar/src/find_matches_closest.c (modified) (1 diff)
• addstar/src/find_matches_refstars.c (modified) (1 diff)
• addstar/src/load2mass_catalog.c (modified) (1 diff)
• addstar/src/sedstar.c (modified) (1 diff)
• delstar/src/delete_imagefile.c (modified) (1 diff)
• delstar/src/delete_imagename.c (modified) (1 diff)
• delstar/src/delete_orphans.c (modified) (1 diff)
• delstar/src/delete_times.c (modified) (1 diff)
• delstar/src/find_matches.c (modified) (1 diff)
• dvosplit/src/split_averages.c (modified) (2 diffs)
• gastro/src/getptolemy.c (modified) (1 diff)
• gastro2/src/getptolemy.c (modified) (1 diff)
• getstar/src/getstar.c (modified) (2 diffs)
• getstar/src/select_by_region.c (modified) (1 diff)
• libdvo/src/dvo_catalog.c (modified) (2 diffs)
• libdvo/src/dvo_catalog_mef.c (modified) (3 diffs)
• libdvo/src/dvo_catalog_raw.c (modified) (1 diff)
• libdvo/src/dvo_catalog_split.c (modified) (21 diffs)
• libfits/include/gfitsio.h (modified) (1 diff)
• libfits/table/F_read_T.c (modified) (1 diff)
• markrock/src/markrock.c (modified) (1 diff)
• markstar/src/markstar.c (modified) (1 diff)
• mosastro/src/getptolemy.c (modified) (1 diff)
• photdbc/src/join_stars.c (modified) (2 diffs)
• photdbc/src/make_subcatalog.c (modified) (2 diffs)
• photdbc/src/photdbc.c (modified) (1 diff)
• relastro/src/bcatalog.c (modified) (2 diffs)
• relastro/src/load_catalogs.c (modified) (1 diff)
• relastro/src/reload_catalogs.c (modified) (1 diff)
• relphot/src/bcatalog.c (modified) (2 diffs)
• relphot/src/load_catalogs.c (modified) (1 diff)
• relphot/src/reload_catalogs.c (modified) (1 diff)
• uniphot/src/update.c (modified) (1 diff)

branches/eam_branch_20071130/Ohana/src/addstar/src/SEDfit.c

@@ -210 +210 @@
     }
   }
-  outcat[0].Naverage = Nave;
-  outcat[0].Nmeasure = Nmeas;
+  outcat[0].Naverage  = Nave;
+  outcat[0].Nmeasure  = Nmeas;
+  outcat[0].Nsecf_mem = Nave*Nsec;
   
   free (sourceValue.mags);

branches/eam_branch_20071130/Ohana/src/addstar/src/UpdateDatabase_Image.c

@@ -13 +13 @@
 
   catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
-  if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
+  if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
   
   // XXX this is probably not needed anymore
@@ -49 +49 @@
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
-    if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
+    if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
 
     // an error exit status here is a significant error
@@ -57 +57 @@
     }
 
-    // Nave_disk == 0 implies an empty catalog file
+    // Naves_disk == 0 implies an empty catalog file
     // for only_match, skip empty catalogs 
-    if ((catalog.Nave_disk == 0) && options[0].only_match) {
+    if ((catalog.Naves_disk == 0) && options[0].only_match) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);
@@ -73 +73 @@
     if (!options[0].only_images) {
       SetProtect (TRUE);
-      dvo_catalog_save (&catalog, VERBOSE);
+      if (options[0].update) {
+        dvo_catalog_update (&catalog, VERBOSE);
+      } else {
+        dvo_catalog_save (&catalog, VERBOSE);
+      }
       SetProtect (FALSE);
     }

branches/eam_branch_20071130/Ohana/src/addstar/src/UpdateDatabase_Refcat.c

@@ -37 +37 @@
     catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
-    if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
+    if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
   
     // an error exit status here is a significant error
@@ -45 +45 @@
     }
 
-    // Nave_disk == 0 implies an empty catalog file
+    // Naves_disk == 0 implies an empty catalog file
     // for only_match, skip empty catalogs
-    if ((catalog.Nave_disk == 0) && options[0].only_match) {
+    if ((catalog.Naves_disk == 0) && options[0].only_match) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);
@@ -62 +62 @@
     if (!options[0].only_images) {
       SetProtect (TRUE);
-      dvo_catalog_save (&catalog, VERBOSE);
+      if (options[0].update) {
+        dvo_catalog_update (&catalog, VERBOSE);
+      } else {
+        dvo_catalog_save (&catalog, VERBOSE);
+      }
       SetProtect (FALSE);
     }

branches/eam_branch_20071130/Ohana/src/addstar/src/UpdateDatabase_Reflist.c

@@ -37 +37 @@
     catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
-    if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
+    if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
 
     // an error exit status here is a significant error
@@ -46 +46 @@
 
     /* for only_match, skip empty catalogs XXX EAM : this leaves behind empty files */
-    if ((catalog.Nave_disk == 0) && options[0].only_match) {
+    if ((catalog.Naves_disk == 0) && options[0].only_match) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);
@@ -58 +58 @@
     if (!options[0].only_images) {
       SetProtect (TRUE);
-      dvo_catalog_save (&catalog, VERBOSE);
+      if (options[0].update) {
+        dvo_catalog_update (&catalog, VERBOSE);
+      } else {
+        dvo_catalog_save (&catalog, VERBOSE);
+      }
       SetProtect (FALSE);
     }

branches/eam_branch_20071130/Ohana/src/addstar/src/addstar.c

@@ -105 +105 @@
     }
 
-    // Nave_disk == 0 implies an empty catalog file
+    // Naves_disk == 0 implies an empty catalog file
     // for only_match, skip empty catalogs
-    if ((catalog.Nave_disk == 0) && options.only_match) {
+    if ((catalog.Naves_disk == 0) && options.only_match) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);

branches/eam_branch_20071130/Ohana/src/addstar/src/find_matches.c

@@ -361 +361 @@
   catalog[0].Naverage = Nave;
   catalog[0].Nmeasure = Nmeas;
+  catalog[0].Nsecf_mem = Nave*Nsecfilt;
   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %d %d %d, (%d matches)\n", Nstars, Nave, Nmeas, Nmatch);
 

branches/eam_branch_20071130/Ohana/src/addstar/src/find_matches_closest.c

@@ -362 +362 @@
   catalog[0].Naverage = Nave;
   catalog[0].Nmeasure = Nmeas;
+  catalog[0].Nsecf_mem = Nave*Nsecfilt;
   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %d %d %d, (%d matches)\n", Nstars, Nave, Nmeas, Nmatch);
 

branches/eam_branch_20071130/Ohana/src/addstar/src/find_matches_refstars.c

@@ -372 +372 @@
   catalog[0].Nmeasure = Nmeas;
   catalog[0].Nmissing = Nmiss;
+  catalog[0].Nsecf_mem = Nave*Nsecfilt;
   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas, Nmiss: %d %d %d %d, (%d matches)\n", Nstars, Nave, Nmeas, Nmiss, Nmatch);
   return (Nmatch);

branches/eam_branch_20071130/Ohana/src/addstar/src/load2mass_catalog.c

@@ -79 +79 @@
   catalog[0].Naverage = Nave;
   catalog[0].Nmeasure = Nmeas;
+  catalog[0].Nsecf_mem = Nave*Nsec;
   return (TRUE);
 }

branches/eam_branch_20071130/Ohana/src/addstar/src/sedstar.c

@@ -34 +34 @@
     }
 
-    // Nave_disk == 0 implies an empty catalog file
-    if ((incatalog.Nave_disk == 0) && options.only_match) {
+    // Naves_disk == 0 implies an empty catalog file
+    if ((incatalog.Naves_disk == 0) && options.only_match) {
       if (VERBOSE) fprintf (stderr, "skipping empty region\n");
       dvo_catalog_unlock (&incatalog);

branches/eam_branch_20071130/Ohana/src/delstar/src/delete_imagefile.c

@@ -33 +33 @@
       exit (2);
     }
-    if (!catalog.Nave_disk) {
+    if (!catalog.Naves_disk) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);

branches/eam_branch_20071130/Ohana/src/delstar/src/delete_imagename.c

@@ -44 +44 @@
         exit (2);
       }
-      if (!catalog.Nave_disk) {
+      if (!catalog.Naves_disk) {
         dvo_catalog_unlock (&catalog);
         dvo_catalog_free (&catalog);

branches/eam_branch_20071130/Ohana/src/delstar/src/delete_orphans.c

@@ -252 +252 @@
   catalog.Nmeasure = Nmeas;
   catalog.Nmissing = Nmiss;
+  catalog.Nsecf_mem = Nave*Nsecfilt;
+
   if (VERBOSE) fprintf (stderr, "  ending with Nave, Nmeas, Nmiss: %d %d %d\n", Nave, Nmeas, Nmiss);
 

branches/eam_branch_20071130/Ohana/src/delstar/src/delete_times.c

@@ -64 +64 @@
       exit (2);
     }
-    if (!catalog.Nave_disk) {
+    if (!catalog.Naves_disk) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);

branches/eam_branch_20071130/Ohana/src/delstar/src/find_matches.c

@@ -234 +234 @@
   catalog[0].Nmeasure = Nmeas;
   catalog[0].Nmissing = Nmiss;
+  catalog[0].Nsecf_mem = Nave*Nsecfilt;
+
   if (VERBOSE) fprintf (stderr, "  ending with Nave, Nmeas, Nmiss: %d %d %d\n", Nave, Nmeas, Nmiss);
 

branches/eam_branch_20071130/Ohana/src/dvosplit/src/split_averages.c

@@ -9 +9 @@
   AveLinks *avelinks;
 
-  ALLOCATE (outref, int, incatalog[0].Nave_disk);
-  ALLOCATE (outcat, int, incatalog[0].Nave_disk);
+  ALLOCATE (outref, int, incatalog[0].Naves_disk);
+  ALLOCATE (outcat, int, incatalog[0].Naves_disk);
 
   Nsecfilt = GetPhotcodeNsecfilt ();
@@ -23 +23 @@
   // split out the average & secfilt entries:
   incatalog[0].catflags = LOAD_AVES | LOAD_SECF;
-  Nblocks = incatalog[0].Nave_disk / NROWS;
+  Nblocks = incatalog[0].Naves_disk / NROWS;
   for (block = 0; block < Nblocks; block++) {
 

branches/eam_branch_20071130/Ohana/src/gastro/src/getptolemy.c

@@ -36 +36 @@
     dvo_catalog_unlock (&catalog);
 
-    // Nave_disk == 0 implies an empty catalog file
+    // Naves_disk == 0 implies an empty catalog file
     // for only_match, skip empty catalogs
-    if (!catalog.Nave_disk) {
+    if (!catalog.Naves_disk) {
       dvo_catalog_free (&catalog);
       continue;

branches/eam_branch_20071130/Ohana/src/gastro2/src/getptolemy.c

@@ -38 +38 @@
     dvo_catalog_unlock (&catalog);
 
-    // Nave_disk == 0 implies an empty catalog file
+    // Naves_disk == 0 implies an empty catalog file
     // for only_match, skip empty catalogs
-    if (!catalog.Nave_disk) {
+    if (!catalog.Naves_disk) {
       dvo_catalog_free (&catalog);
       continue;

branches/eam_branch_20071130/Ohana/src/getstar/src/getstar.c

@@ -47 +47 @@
           exit (2);
         }
-        if (!catalog.Nave_disk) {
+        if (!catalog.Naves_disk) {
           dvo_catalog_unlock (&catalog);
           dvo_catalog_free (&catalog);
@@ -78 +78 @@
         }
         /* skip empty catalogs */
-        if (!catalog.Nave_disk) continue;
+        if (!catalog.Naves_disk) continue;
         stars = select_by_image (&catalog, &image, 0, 0, stars, &Nstars);
       }

branches/eam_branch_20071130/Ohana/src/getstar/src/select_by_region.c

@@ -91 +91 @@
   output[0].Naverage = Nave;
   output[0].Nmeasure = Nmeas;
+  output[0].Nsecf_mem = Nave*Nsecfilt;
+
   fprintf (stderr, "output catalog has %d stars (%d measures, %d secfilt)\n",
            output[0].Naverage, output[0].Nmeasure, output[0].Nsecfilt);

branches/eam_branch_20071130/Ohana/src/libdvo/src/dvo_catalog.c

@@ -357 +357 @@
     catalog[0].secfilt = outsec;
     catalog[0].Nsecfilt = Nsecfilt;
+    catalog[0].Nsecf_mem = Nsecfilt * catalog[0].Naverage;
   }
   return (TRUE);
@@ -410 +411 @@
     case DVO_MODE_MEF:
       if (VERBOSE) fprintf (stderr, "reading catalog (mode DVO_MODE_MEF)\n");
-      dvo_catalog_load_segment_mef (catalog, VERBOSE, start, Nrows);
+      fprintf (stderr, "cannot do this in mef mode\n");
+      // dvo_catalog_load_segment_mef (catalog, VERBOSE, start, Nrows);
       break;
     case DVO_MODE_SPLIT:

branches/eam_branch_20071130/Ohana/src/libdvo/src/dvo_catalog_mef.c

@@ -59 +59 @@
     /* 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);
-    if (Naverage != catalog[0].Naverage) {
+    if (Naverage != catalog[0].Naves_disk) {
       fprintf (stderr, "Warning: mismatch between Naverage in PHU and Table headers (%d vs %d)\n", Naverage, catalog[0].Naves_disk);
     }
@@ -86 +86 @@
     }
     catalog[0].measure = FtableToMeasure (&ftable, &catalog[0].Nmeasure, &catalog[0].catformat);
-    if (Nmeasure != catalog[0].Nmeasure) {
-      fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers (%d vs %d)\n", Nmeasure, catalog[0].Nmeasure);
+    if (Nmeasure != catalog[0].Nmeas_disk) {
+      fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers (%d vs %d)\n", Nmeasure, catalog[0].Nmeas_disk);
     }
     catalog[0].Nmeasure = catalog[0].Nmeas_disk;
@@ -112 +112 @@
     /* no conversions currently defined */
     catalog[0].missing = gfits_table_get_Missing (&ftable, &catalog[0].Nmissing, NULL);
-    if (Nmissing != catalog[0].Nmissing) {
-      fprintf (stderr, "Warning: mismatch between Nmissing in PHU and Table headers (%d vs %d)\n", Nmissing, catalog[0].Nmissing);
+    if (Nmissing != catalog[0].Nmiss_disk) {
+      fprintf (stderr, "Warning: mismatch between Nmissing in PHU and Table headers (%d vs %d)\n", Nmissing, catalog[0].Nmiss_disk);
     }
     catalog[0].Nmissing = catalog[0].Nmiss_disk;

branches/eam_branch_20071130/Ohana/src/libdvo/src/dvo_catalog_raw.c

@@ -171 +171 @@
       }         
       catalog[0].Nsecfilt = Nsecfilt;
+      catalog[0].Nsecf_mem = Ntotal;
       free (primary);
     } 

branches/eam_branch_20071130/Ohana/src/libdvo/src/dvo_catalog_split.c

@@ -40 +40 @@
   *mySecfilt = secfilt;
   *myNsecfilt = Nsecfilt;
+}
+
+int dvo_catalog_primary_to_secfilt (Catalog *catalog, SecFilt *primary, int Naves) {
+
+  int Ntmpfilt, Nsecfilt, Ntotal, i, j;
+  SecFilt *tmpfilt;
+
+  tmpfilt  = catalog[0].secfilt;
+  Ntmpfilt = catalog[0].Nsecfilt;
+
+  // we do NOT modify Nsecf_disk; this operation only modifies in in-memory values
+
+  catalog[0].Nsecfilt ++;
+  Nsecfilt = catalog[0].Nsecfilt;
+  Ntotal = Nsecfilt * Naves;
+
+  catalog[0].Nsecf_mem = Ntotal;
+
+  ALLOCATE (catalog[0].secfilt, SecFilt, Ntotal);
+  for (i = 0; i < Naves; i++) {
+    catalog[0].secfilt[i*Nsecfilt + 0] = primary[i];
+    for (j = 0; j < Ntmpfilt; j++) {
+      catalog[0].secfilt[i*Nsecfilt + j + 1] = tmpfilt[i*Ntmpfilt + j];
+    }
+  }             
+  free (primary);
+  return (TRUE);
 }
 
@@ -279 +306 @@
       fprintf (stderr, "Warning: mismatch between Nsecfilt items in PHU and Table headers (%d vs %d)\n", Nitems, catalog[0].Nsecf_disk);
     }
+    catalog[0].Nsecf_mem = catalog[0].Nsecf_disk;
+    catalog[0].Nsecf_off = 0;
 
     /* if primary is defined, we were supplied with one additional average magnitude from Average
        we need to interleave these magnitudes with the secfilt entries just loaded */
     if (primary != NULL) {
-      int Ntmpfilt, Ntotal, i, j;
-      SecFilt *tmpfilt;
-      tmpfilt  = catalog[0].secfilt;
-      Ntmpfilt = catalog[0].Nsecfilt;
-
-      catalog[0].Nsecfilt ++;
-      catalog[0].Nsecf_disk = catalog[0].Nsecfilt * catalog[0].Naves_disk;
-      Nsecfilt = catalog[0].Nsecfilt;
-
-      ALLOCATE (catalog[0].secfilt, SecFilt, catalog[0].Nsecf_disk);
-      for (i = 0; i < catalog[0].Naves_disk; i++) {
-        catalog[0].secfilt[i*Nsecfilt + 0] = primary[i];
-        for (j = 0; j < Ntmpfilt; j++) {
-          catalog[0].secfilt[i*Nsecfilt + j + 1] = tmpfilt[i*Ntmpfilt + j];
-        }
-      }         
-      free (primary);
+      // this modifies catalog.Nsecf_mem,Nsecfilt
+      dvo_catalog_primary_to_secfilt (catalog, primary, catalog[0].Naves_disk);
     } 
-    catalog[0].Nsecf_mem = catalog[0].Nsecf_disk;
-    catalog[0].Nsecf_off = 0;
   } else {
     if (primary != NULL) {
       free (primary);
       catalog[0].Nsecfilt ++;
-      catalog[0].Nsecf_disk =  catalog[0].Nsecfilt * catalog[0].Naves_disk;
     }
     gfits_create_header (&catalog[0].secfilt_catalog[0].header);
@@ -326 +337 @@
   Header header;
   Matrix matrix;
-  VTable vtable;
+  FTable ftable;
   SecFilt *primary;
 
-  /* vtable header storage for below */
-  vtable.header = &header;
-  vtable.buffer = NULL;
+  /* ftable header storage for below */
+  ftable.header = &header;
+  ftable.buffer = NULL;
   header.buffer = NULL;
 
@@ -351 +362 @@
     }
     /* read Average table data : format is irrelevant here */
-    if (!gfits_fread_vtable_range (catalog[0].f, &vtable, start, Nrows)) {
+    if (!gfits_fread_ftable_range (catalog[0].f, &ftable, start, Nrows)) {
       if (VERBOSE) fprintf (stderr, "can't read table average data");
       return (FALSE);
@@ -359 +370 @@
      * 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 */
-
-    // XXX Vtable version is needed (merge Ftable and Vtable versions?)
-    catalog[0].average = VtableToAverage (&vtable, &Naverage, &catalog[0].catformat, &primary);
-
-    // XXX validate the sizes?  start + Nrows < Naves_disk (no other constraints)
+    catalog[0].average = FtableToAverage (&ftable, &Naverage, &catalog[0].catformat, &primary);
     if (Naverage != Nrows) {
+      // XXX this is only an error if Nrows or more are available...
+      // XXX allow Nrows to go beyond end of the data?
       fprintf (stderr, "Warning: mismatch between Naverage in PHU and Table headers (%d vs %d)\n", Naverage, Nrows);
     }
@@ -387 +396 @@
     }
     /* read Measure table data : format is irrelevant here */
-    if (!gfits_fread_vtable_range (subcat[0].f, &vtable, start, Nrows)) {
+    if (!gfits_fread_ftable_range (subcat[0].f, &ftable, start, Nrows)) {
       if (VERBOSE) fprintf (stderr, "can't read table measure data");
       return (FALSE);
@@ -393 +402 @@
 
     Nexpect = Nrows * Nsecfilt;
-    catalog[0].secfilt = VtableToSecFilt (&vtable, &Nitems, &catalog[0].catformat);
+    catalog[0].secfilt = FtableToSecFilt (&ftable, &Nitems, &catalog[0].catformat);
     if (Nitems != Nexpect) {
-      fprintf (stderr, "Warning: mismatch between Nsecfilt items in PHU and Table headers (%d vs %d)\n", Nitems, catalog[0].Nsecf_disk);
-    }
+      fprintf (stderr, "Warning: mismatch between Nsecfilt items in PHU and Table headers (%d vs %d)\n", Nitems, Nexpect);
+    }
+    catalog[0].Nsecf_mem = Nrows * Nsecfilt;
+    catalog[0].Nsecf_off = start * Nsecfilt;
 
     /* if primary is defined, we were supplied with one additional average magnitude from Average
        we need to interleave these magnitudes with the secfilt entries just loaded */
     if (primary != NULL) {
-      int Ntmpfilt, i, j;
-      SecFilt *tmpfilt;
-      tmpfilt  = catalog[0].secfilt;
-      Ntmpfilt = catalog[0].Nsecfilt;
-
-      catalog[0].Nsecfilt ++;
-      catalog[0].Nsecf_disk = catalog[0].Nsecfilt * catalog[0].Naves_disk;
-      Nsecfilt = catalog[0].Nsecfilt;
-
-      // the loaded average rows correspond to the loaded secfilt rows
-      // supplement with the loaded primary secfilt data
-      Nexpect = Nrows * Nsecfilt;
-      ALLOCATE (catalog[0].secfilt, SecFilt, Nexpect);
-      for (i = 0; i < Nrows; i++) {
-        catalog[0].secfilt[i*Nsecfilt + 0] = primary[i];
-        for (j = 0; j < Ntmpfilt; j++) {
-          catalog[0].secfilt[i*Nsecfilt + j + 1] = tmpfilt[i*Ntmpfilt + j];
-        }
-      }         
-      free (primary);
+      dvo_catalog_primary_to_secfilt (catalog, primary, Nrows);
     } 
     gfits_free_header (&header);
     gfits_free_matrix (&matrix);
-    catalog[0].Nsecf_mem = Nexpect;
-    catalog[0].Nsecf_off = start * Nsecfilt;
-
-    // CAREFUL: note that Nsecf_disk and Nsecf_off are set to the values if there were no primary data 
   }
 
@@ -448 +436 @@
     }
     /* read Measure table data : format is irrelevant here */
-    if (!gfits_fread_vtable_range (subcat[0].f, &vtable, start, Nrows)) {
+    if (!gfits_fread_ftable_range (subcat[0].f, &ftable, start, Nrows)) {
       if (VERBOSE) fprintf (stderr, "can't read table measure data");
       return (FALSE);
@@ -454 +442 @@
 
     /* convert data format to internal : returns number of row read in Nmeasure */
-    catalog[0].measure = VtableToMeasure (&vtable, &Nmeasure, &catalog[0].catformat);
+    catalog[0].measure = FtableToMeasure (&ftable, &Nmeasure, &catalog[0].catformat);
     if (Nmeasure != Nrows) {
       fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers (%d vs %d)\n", Nmeasure, Nrows);
@@ -482 +470 @@
     }
     /* read Missing table data : format is irrelevant here */
-    if (!gfits_fread_vtable_range (subcat[0].f, &vtable, start, Nrows)) {
+    if (!gfits_fread_ftable_range (subcat[0].f, &ftable, start, Nrows)) {
       if (VERBOSE) fprintf (stderr, "can't read table missing data");
       return (FALSE);
     }
 
-    /* convert data format to internal : returns number of row read in Nmissing */
-    catalog[0].missing = VtableToMissing (&vtable, &Nmissing, &catalog[0].catformat);
+    /* no conversions currently defined : this just does the byte swap */
+    catalog[0].missing = gfits_table_get_Missing (&ftable, &Nmissing, NULL);
     if (Nmissing != Nrows) {
       fprintf (stderr, "Warning: mismatch between Nmissing in PHU and Table headers (%d vs %d)\n", Nmissing, Nrows);
@@ -568 +556 @@
     }
 
-    if (!dvo_catalog_save_subset (catalog, ftable, start, Nrows, catalog[0].Naves_disk, Naves_disk_new)) {
+    if (!dvo_catalog_save_subcat (catalog, &ftable, start, Nrows, catalog[0].Naves_disk, Naves_disk_new)) {
       fprintf (stderr, "failure writing Average table\n");
       goto failure;
@@ -606 +594 @@
 
     // write out Measure table
-    if (!dvo_catalog_save_subset (catalog[0].measure_catalog, ftable, start, Nrows, catalog[0].Nmeas_disk, Nmeas_disk_new)) {
+    if (!dvo_catalog_save_subcat (catalog[0].measure_catalog, &ftable, start, Nrows, catalog[0].Nmeas_disk, Nmeas_disk_new)) {
       fprintf (stderr, "trouble writing Measure table\n");
       goto failure;
@@ -629 +617 @@
 
     // write out Missing table (must write out entire table)
-    if (!dvo_catalog_save_subset (catalog[0].missing_catalog, ftable, 0, catalog[0].Nmissing, catalog[0].Nmissing, catalog[0].Nmissing)) {
+    if (!dvo_catalog_save_subcat (catalog[0].missing_catalog, &ftable, 0, catalog[0].Nmissing, catalog[0].Nmissing, catalog[0].Nmissing)) {
       fprintf (stderr, "trouble writing Missing Table\n");
       goto failure;
@@ -649 +637 @@
     assert (first < Nitems);
     assert (catalog[0].Nsecf_disk >= catalog[0].Nsecf_off);
+    // XXX check these for consistency...
 
     // convert to external table format
@@ -654 +643 @@
 
     // write out SecFilt table
-    if (!dvo_catalog_save_subset (catalog[0].secfilt_catalog, ftable, start, Nrows, catalog[0].Nsecf_disk, Nsecf_disk_new)) {
+    if (!dvo_catalog_save_subcat (catalog[0].secfilt_catalog, &ftable, start, Nrows, catalog[0].Nsecf_disk, Nsecf_disk_new)) {
       fprintf (stderr, "failure writing SecFilt table\n");
       goto failure;
@@ -688 +677 @@
   Header header;
   FTable ftable;
-  VTable vtable;
   Catalog *catfile;
   SecFilt *primary, *secfilt;
@@ -750 +738 @@
     }
 
-    if (!dvo_catalog_save_subset (catalog, ftable, start, Nrows, catalog[0].Naves_disk, Naves_disk_new)) {
+    if (!dvo_catalog_save_subcat (catalog, &ftable, start, Nrows, catalog[0].Naves_disk, Naves_disk_new)) {
       fprintf (stderr, "failure writing Average table\n");
       goto failure;
@@ -788 +776 @@
 
     // write out Measure table
-    if (!dvo_catalog_save_subset (catalog[0].measure_catalog, ftable, start, Nrows, catalog[0].Nmeas_disk, Nmeas_disk_new)) {
+    if (!dvo_catalog_save_subcat (catalog[0].measure_catalog, &ftable, start, Nrows, catalog[0].Nmeas_disk, Nmeas_disk_new)) {
       fprintf (stderr, "trouble writing Measure table\n");
       goto failure;
@@ -815 +803 @@
 
     // write out Missing table (must write out entire table)
-    if (!dvo_catalog_save_subset (catalog[0].missing_catalog, ftable, 0, catalog[0].Nmissing, catalog[0].Nmissing, catalog[0].Nmissing)) {
+    if (!dvo_catalog_save_subcat (catalog[0].missing_catalog, &ftable, 0, catalog[0].Nmissing, catalog[0].Nmissing, catalog[0].Nmissing)) {
       fprintf (stderr, "trouble writing Missing Table\n");
       goto failure;
@@ -840 +828 @@
 
     // write out SecFilt table
-    if (!dvo_catalog_save_subset (catalog[0].secfilt_catalog, ftable, start, Nrows, catalog[0].Nsecf_disk, Nsecf_disk_new)) {
+    if (!dvo_catalog_save_subcat (catalog[0].secfilt_catalog, &ftable, start, Nrows, catalog[0].Nsecf_disk, Nsecf_disk_new)) {
       fprintf (stderr, "failure writing SecFilt table\n");
       goto failure;
@@ -875 +863 @@
 /* XXX EAM : update is not efficient.  MeasureToFtable should only 
    convert the new rows (Nmeas_disk to Nmeasure). the resulting
-   table represents the end rows of the vtable.  we need to define
+   table represents the end rows of the ftable.  we need to define
    the vtable based on the ftable, but with Ny = Nmeasure */  
   

branches/eam_branch_20071130/Ohana/src/libfits/include/gfitsio.h

@@ -172 +172 @@
 int     gfits_fread_ftable             PROTO((FILE *f, FTable *ftable, char *extname)); 
 int     gfits_fread_ftable_data        PROTO((FILE *f, FTable *ftable));
+int     gfits_fread_ftable_range       PROTO((FILE *f, FTable *ftable, int start, int Nrows));
 int     gfits_fread_vtable             PROTO((FILE *f, VTable *vtable, char *extname, int Nrow, int *row));
 int     gfits_fread_vtable_range       PROTO((FILE *f, VTable *vtable, int start, int Nrows));

branches/eam_branch_20071130/Ohana/src/libfits/table/F_read_T.c

@@ -63 +63 @@
   }
   table[0].size = Nbytes;
+  return (TRUE);
+}       
+
+/*********************** fits read ftable data ***********************************/
+int gfits_fread_ftable_range (FILE *f, FTable *table, int start, int Nrows) {
+
+  int Nbytes, Nread, Nskip, Nx, Ny;
+  char *buffer;
+
+  /* find disk table size */
+  Nx = table[0].header[0].Naxis[0];
+  Ny = table[0].header[0].Naxis[1];
+
+  if (start < 0) return (FALSE);
+  if (start + Nrows >= Ny) return (FALSE);
+  
+  Nskip = start * Nx;
+  Nbytes = Nrows * Nx;
+  ALLOCATE (table[0].buffer, char, MAX (Nbytes, 1));
+
+  fseek (f, Nskip, SEEK_CUR);
+  Nread = fread (buffer, sizeof (char), Nbytes, f);
+  if (Nread != Nbytes) {
+    free (buffer);
+    return (FALSE);
+  }
+
+  /* modify structure and header to match actual read rows Ny */
+  table[0].header[0].Naxis[1] = Nrows;
+  gfits_modify (table[0].header, "NAXIS2",  "%d", 1, Nrows);
+  table[0].size = gfits_data_size (table[0].header);
+
   return (TRUE);
 }       

branches/eam_branch_20071130/Ohana/src/markrock/src/markrock.c

@@ -45 +45 @@
     exit (2);
   }
-  if (catalog.Nave_disk) {
+  if (catalog.Naves_disk) {
     dvo_catalog_unlock (&catalog);
     dvo_catalog_free (&catalog);

branches/eam_branch_20071130/Ohana/src/markstar/src/markstar.c

@@ -48 +48 @@
     exit (2);
   }
-  if (!catalog.Nave_disk) {
+  if (!catalog.Naves_disk) {
     dvo_catalog_unlock (&catalog);
     dvo_catalog_free (&catalog);

branches/eam_branch_20071130/Ohana/src/mosastro/src/getptolemy.c

@@ -36 +36 @@
     dvo_catalog_unlock (&catalog);
 
-    // Nave_disk == 0 implies an empty catalog file
+    // Naves_disk == 0 implies an empty catalog file
     // for only_match, skip empty catalogs
-    if (!catalog.Nave_disk) {
+    if (!catalog.Naves_disk) {
       dvo_catalog_free (&catalog);
       continue;

branches/eam_branch_20071130/Ohana/src/photdbc/src/join_stars.c

@@ -172 +172 @@
   
   catalog[0].Naverage = Naves;
+  catalog[0].Nsecf_mem = Naves*catalog[0].Nsecfilt;
 }
 
@@ -181 +182 @@
    generates a new SecFilt table with empty values 
    does NOT update magnitudes 
+   output measure table is the same size as the input measure table
+   (measures are just moved around).  thus, catalog[0].Nmeasure does not change.
 */   
    

branches/eam_branch_20071130/Ohana/src/photdbc/src/make_subcatalog.c

@@ -10 +10 @@
 
   Nsecfilt = GetPhotcodeNsecfilt ();
+  assert (catalog[0].Nsecfilt == Nsecfilt);
 
   /* we are moving only the subset of measurements from catalog[0] to subcatalog[0] */
@@ -96 +97 @@
   subcatalog[0].Naverage = Naverage;
   subcatalog[0].Nmeasure = Nmeasure;
-  subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
+  subcatalog[0].Nsecfilt = Nsecfilt;
+  subcatalog[0].Nsecf_mem = Naverage * Nsecfilt;
 
   // XXX for now, don't copy the missing entries (these should be re-computed)

branches/eam_branch_20071130/Ohana/src/photdbc/src/photdbc.c

@@ -34 +34 @@
     }
     // skip empty input catalogs
-    if (!incatalog.Nave_disk) {
+    if (!incatalog.Naves_disk) {
       dvo_catalog_unlock (&incatalog);
       dvo_catalog_free (&incatalog);

branches/eam_branch_20071130/Ohana/src/relastro/src/bcatalog.c

@@ -6 +6 @@
   int NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm;
   float mag;
+
+  // XXX PhotNsec as a global is a bad idea; either get it from catalog
+  // or get it from:
+  // Nsecfilt = GetPhotcodeNsecfilt ();
+  // assert (catalog[0].Nsecfilt == Nsecfilt);
 
   /* we are moving only the subset of measurements from catalog[0] to subcatalog[0] */
@@ -104 +109 @@
   subcatalog[0].Nmeasure = Nmeasure;
   subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
+  subcatalog[0].Nsecf_mem = Naverage * PhotNsec;
+  assert (PhotNsec == catalog[0].Nsecfilt);
 
   if (VERBOSE) {

branches/eam_branch_20071130/Ohana/src/relastro/src/load_catalogs.c

@@ -26 +26 @@
       exit (1);
     }
-    if (VERBOSE && !pcatalog[0].Nave_disk) fprintf (stderr, "no data in %s, skipping\n", pcatalog[0].filename);
+    if (VERBOSE && !pcatalog[0].Naves_disk) fprintf (stderr, "no data in %s, skipping\n", pcatalog[0].filename);
 
     // select only the brighter stars

branches/eam_branch_20071130/Ohana/src/relastro/src/reload_catalogs.c

@@ -29 +29 @@
       exit (1);
     }
-    if (VERBOSE && (catalog.Nave_disk == 0)) {
+    if (VERBOSE && (catalog.Naves_disk == 0)) {
         fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
         dvo_catalog_unlock (&catalog);

branches/eam_branch_20071130/Ohana/src/relphot/src/bcatalog.c

@@ -6 +6 @@
   int NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm;
   float mag;
+
+  // XXX PhotNsec as a global is a bad idea; either get it from catalog
+  // or get it from:
+  // Nsecfilt = GetPhotcodeNsecfilt ();
+  // assert (catalog[0].Nsecfilt == Nsecfilt);
 
   /* we are moving only the subset of measurements from catalog[0] to subcatalog[0] */
@@ -105 +110 @@
   subcatalog[0].Nmeasure = Nmeasure;
   subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
+  subcatalog[0].Nsecf_mem = Naverage * catalog[0].Nsecfilt;
+  assert (PhotNsec == catalog[0].Nsecfilt);
 
   if (VERBOSE) {

branches/eam_branch_20071130/Ohana/src/relphot/src/load_catalogs.c

@@ -24 +24 @@
       exit (1);
     }
-    if (VERBOSE && !tcatalog.Nave_disk) fprintf (stderr, "no data in %s, skipping\n", tcatalog.filename);
+    if (VERBOSE && !tcatalog.Naves_disk) fprintf (stderr, "no data in %s, skipping\n", tcatalog.filename);
 
     // select only the brighter stars

branches/eam_branch_20071130/Ohana/src/relphot/src/reload_catalogs.c

@@ -30 +30 @@
       exit (1);
     }
-    if (VERBOSE && (catalog.Nave_disk == 0)) {
+    if (VERBOSE && (catalog.Naves_disk == 0)) {
         fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
         dvo_catalog_unlock (&catalog);

branches/eam_branch_20071130/Ohana/src/uniphot/src/update.c

@@ -52 +52 @@
       exit (2);
     }
-    if (!catalog.Nave_disk) {
+    if (!catalog.Naves_disk) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);