Changeset 8386 for trunk/Ohana/src

Timestamp:

Aug 16, 2006, 10:12:55 AM (20 years ago)

Author:

eugene

Message:

updating to new DVO APIs

Location:

trunk/Ohana/src

Files:

• addstar/src/addstar.c (modified) (3 diffs)
• delstar/Makefile (modified) (1 diff)
• delstar/src/RegionOps.c (deleted)
• delstar/src/delete_imagefile.c (modified) (2 diffs)
• delstar/src/delete_imagename.c (modified) (2 diffs)
• delstar/src/delete_orphans.c (modified) (1 diff)
• delstar/src/delete_times.c (modified) (1 diff)
• delstar/src/gcatalog.c (deleted)
• delstar/src/gregion_image.c (deleted)
• delstar/src/gregion_patch.c (deleted)
• delstar/src/image-db.c (deleted)
• delstar/src/missed.c (deleted)
• delstar/src/orphans.c (deleted)
• delstar/src/wcatalog.c (deleted)
• libdvo/include/dvo.h (modified) (1 diff)
• libdvo/src/dvo_catalog.c (modified) (8 diffs)
• libdvo/src/dvo_catalog_create.c (modified) (1 diff)
• libdvo/src/dvo_catalog_split.c (modified) (11 diffs)
• libdvo/src/skyregion_gsc.c (modified) (9 diffs)
• markrock/src/aregion.c (deleted)
• markrock/src/check_lockfile.c (deleted)
• markrock/src/check_permissions.c (deleted)
• markrock/src/gcatalog.c (deleted)
• markrock/src/gregions.c (deleted)
• markrock/src/load_gsc_data.c (deleted)
• markrock/src/markrock.c (modified) (2 diffs)
• markrock/src/wcatalog.c (deleted)
• markstar/src/aregion.c (deleted)
• markstar/src/check_lockfile.c (deleted)
• markstar/src/check_permissions.c (deleted)
• markstar/src/find_bright_stars.c (modified) (1 diff)
• markstar/src/find_ghosts.c (modified) (1 diff)
• markstar/src/gcatalog.c (deleted)
• markstar/src/gregions.c (deleted)
• markstar/src/load_gsc_data.c (deleted)
• markstar/src/load_gsc_data_ghost.c (deleted)
• markstar/src/markstar.c (modified) (3 diffs)
• markstar/src/wcatalog.c (deleted)
• relphot/Makefile (modified) (2 diffs)
• relphot/src/gcatalog.c (deleted)
• relphot/src/load_catalogs.c (modified) (2 diffs)
• relphot/src/misc.c (deleted)
• relphot/src/reload_catalogs.c (modified) (3 diffs)
• relphot/src/relphot.c (modified) (1 diff)
• relphot/src/sort.c (added)

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

@@ -104 +104 @@
       exit (2);
     }
+    dvo_catalog_test (&catalog, TRUE);
 
     // Nave_disk == 0 implies an empty catalog file
@@ -142 +143 @@
         break;
     }
+    dvo_catalog_test (&catalog, TRUE);
 
     // write out catalog, if appropriate
@@ -149 +151 @@
       SetProtect (FALSE);
     }
+    dvo_catalog_test (&catalog, TRUE);
     dvo_catalog_unlock (&catalog);
     dvo_catalog_free (&catalog);

trunk/Ohana/src/delstar/Makefile

@@ -28 +28 @@
 $(SRC)/delete_times.$(ARCH).o     \
 $(SRC)/gimages.$(ARCH).o          \
-$(SRC)/gcatalog.$(ARCH).o         \
-$(SRC)/wcatalog.$(ARCH).o         \
 $(SRC)/find_image_db.$(ARCH).o    \
 $(SRC)/find_matches.$(ARCH).o     \

trunk/Ohana/src/delstar/src/delete_imagefile.c

@@ -23 +23 @@
 
   for (i = 0; i < skylist[0].Nregions; i++) {
+
     if (VERBOSE) fprintf (stderr, "deleting from %s\n", skylist[0].filename[i]);
     catalog.filename = skylist[0].filename[i];  /* don't free region before catalog! */
-    switch (lock_catalog (&catalog, LCK_XCLD)) {
-      case 0:
-        fprintf (stderr, "ERROR: can't lock file %s\n", catalog.filename);
-        exit (1);
-      case 1:
-        gcatalog (&catalog);
-        break;
-      case 2:
-        if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
-        unlock_catalog (&catalog);
-        continue;
-      default:
-        fprintf (stderr, "weird lock_catalog exit state\n");
-        exit (1);
+    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
+    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+
+    // an error exit status here is a significant error
+    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "u")) {
+      fprintf (stderr, "ERROR: failure to open catalog file %s\n", catalog.filename);
+      exit (2);
     }
+    if (!catalog.Nave_disk) {
+      dvo_catalog_unlock (&catalog);
+      dvo_catalog_free (&catalog);
+      continue;
+    }
+
     /* pad exposure time by 1 sec to require a valid time */
     /* trate is in 0.1 msec / row  - stop is the latest exposure end time */
@@ -46 +46 @@
     stop  = image[0].tzero + trange;
     find_matches (&catalog, image[0].source, start, stop);
-    wcatalog (&catalog);
-    unlock_catalog (&catalog);
+
+    dvo_catalog_save (&catalog, VERBOSE);
+    dvo_catalog_unlock (&catalog);
+    dvo_catalog_free (&catalog);
   }
 

trunk/Ohana/src/delstar/src/delete_imagename.c

@@ -35 +35 @@
       if (VERBOSE) fprintf (stderr, "deleting from %s\n", skylist[0].filename[i]);
       catalog.filename = skylist[0].filename[i];  /* don't free region before catalog! */
-      switch (lock_catalog (&catalog, LCK_XCLD)) {
-        case 0:
-          fprintf (stderr, "ERROR: can't lock file %s\n", catalog.filename);
-          exit (1);
-        case 1:
-          gcatalog (&catalog);
-          break;
-        case 2:
-          if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
-          unlock_catalog (&catalog);
-          continue;
-        default:
-          fprintf (stderr, "weird lock_catalog exit state\n");
-          exit (1);
+      catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
+      catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+
+      // an error exit status here is a significant error
+      if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "u")) {
+        fprintf (stderr, "ERROR: failure to open catalog file %s\n", catalog.filename);
+        exit (2);
+      }
+      if (!catalog.Nave_disk) {
+        dvo_catalog_unlock (&catalog);
+        dvo_catalog_free (&catalog);
+        continue;
       }
 
@@ -57 +55 @@
       stop  = image[j].tzero + trange;
       find_matches (&catalog, image[j].source, start, stop);
-      wcatalog (&catalog);
-      unlock_catalog (&catalog);
+
+      dvo_catalog_save (&catalog, VERBOSE);
+      dvo_catalog_unlock (&catalog);
+      dvo_catalog_free (&catalog);
     }
   }

trunk/Ohana/src/delstar/src/delete_orphans.c

@@ -15 +15 @@
   /* find and load catalog file */
   catalog.filename = name;
-  gcatalog (&catalog);
+  dvo_catalog_load (&catalog);
   gcatstats (&catalog, &catstats);
 

trunk/Ohana/src/delstar/src/delete_times.c

@@ -55 +55 @@
     if (VERBOSE) fprintf (stderr, "deleting from %s\n", skylist[0].filename[i]);
     catalog.filename = skylist[0].filename[i];  /* don't free region before catalog! */
-    switch (lock_catalog (&catalog, LCK_XCLD)) {
-      case 0:
-        fprintf (stderr, "ERROR: can't lock file\n");
-        exit (1);
-      case 1:
-        gcatalog (&catalog);
-        break;
-      case 2:
-        fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
-        unlock_catalog (&catalog);
-        continue;
-      default:
-        fprintf (stderr, "weird lock_catalog exit state\n");
-        exit (1);
+    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
+    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+
+    // an error exit status here is a significant error
+    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "u")) {
+      fprintf (stderr, "ERROR: failure to open catalog file %s\n", catalog.filename);
+      exit (2);
+    }
+    if (!catalog.Nave_disk) {
+      dvo_catalog_unlock (&catalog);
+      dvo_catalog_free (&catalog);
+      continue;
     }
 
     find_matches (&catalog, code, START, END);
-    wcatalog (&catalog);
-    unlock_catalog (&catalog);
+    dvo_catalog_save (&catalog, VERBOSE);
+    dvo_catalog_unlock (&catalog);
+    dvo_catalog_free (&catalog);
   }
 

trunk/Ohana/src/libdvo/include/dvo.h

@@ -280 +280 @@
 int dvo_catalog_catformat (char *catformat);
 int dvo_catalog_catmode (char *catmode);
+void dvo_catalog_test (Catalog *catalog, int halt);
 
 /* catmode-specific APIs */

trunk/Ohana/src/libdvo/src/dvo_catalog.c

@@ -1 +1 @@
 # include <dvo.h>
 # define DEBUG 1
+
+void dvo_catalog_test (Catalog *catalog, int halt) {
+
+  Catalog *subcat;
+
+  // fprintf (stderr, "catalog: Naverage = %d, average = %zx\n", catalog[0].Naverage, (size_t) catalog[0].average);
+  // fprintf (stderr, "catalog: Nmeasure = %d, measure = %zx\n", catalog[0].Nmeasure, (size_t) catalog[0].measure);
+  // fprintf (stderr, "catalog: Nmissing = %d, missing = %zx\n", catalog[0].Nmissing, (size_t) catalog[0].missing);
+  // fprintf (stderr, "catalog: Nsecfilt = %d, secfilt = %zx\n", catalog[0].Nsecfilt, (size_t) catalog[0].secfilt);
+
+  if (!catalog[0].measure || !catalog[0].secfilt) {
+    fprintf (stderr, "error: %s\n", catalog[0].filename);
+    if (halt) abort ();
+  }
+
+  // XXX test that things are correctly initialized
+  if (catalog[0].catmode != DVO_MODE_SPLIT) return;
+
+  subcat = catalog[0].measure_catalog;
+  if (subcat) {
+    if (subcat[0].measure_catalog || subcat[0].secfilt_catalog || subcat[0].missing_catalog) {
+      fprintf (stderr, "error in init\n");
+      abort ();
+    }
+  }
+  subcat = catalog[0].missing_catalog;
+  if (subcat) {
+    if (subcat[0].measure_catalog || subcat[0].secfilt_catalog || subcat[0].missing_catalog) {
+      fprintf (stderr, "error in init\n");
+      abort ();
+    }
+  }
+  subcat = catalog[0].secfilt_catalog;
+  if (subcat) {
+    if (subcat[0].measure_catalog || subcat[0].secfilt_catalog || subcat[0].missing_catalog) {
+      fprintf (stderr, "error in init\n");
+      abort ();
+    }
+  }
+}
 
 int dvo_catalog_catformat (char *catformat) {
@@ -35 +75 @@
     catalog[0].catflags = 0;
     catalog[0].sorted = 0;
-
-    gfits_init_header (&catalog[0].header);
-  }
+  }
+
+  gfits_init_header (&catalog[0].header);
 
   // the following describe the catalog files on disk
@@ -102 +142 @@
   // attempt to unlink an empty file
   fd = fileno (catalog[0].f);
-  if (fstat (fd, &filestat)) {
+  if (!fstat (fd, &filestat)) {
     if (filestat.st_size == 0) {
       unlink (catalog[0].filename);
@@ -121 +161 @@
 // returns FALSE if a catalog could not be opened
 // returns TRUE if the catalog was empty
+enum {DVO_OPEN_NONE, DVO_OPEN_READ, DVO_OPEN_WRITE, DVO_OPEN_UPDATE);
 int dvo_catalog_open (Catalog *catalog, SkyRegion *region, int VERBOSE, char *iomode) {
 
-  int Nsecfilt;
-  int readonly;
-
-  readonly = -1;
-  if (!strcasecmp (iomode, "r")) readonly = TRUE;
-  if (!strcasecmp (iomode, "w")) readonly = FALSE;
-  if (readonly == -1) return (FALSE);
+  int Nsecfilt, mode;
+
+  mode = DVO_OPEN_NONE;
+  if (!strcasecmp (iomode, "r")) mode = DVO_OPEN_READ;
+  if (!strcasecmp (iomode, "w")) mode = DVO_OPEN_WRITE;
+  if (!strcasecmp (iomode, "a")) mode = DVO_OPEN_UPDATE;
+  if (mode == DVO_OPEN_NONE) return (FALSE);
 
   catalog[0].lockmode  = LCK_XCLD;
-  if (readonly) catalog[0].lockmode  = LCK_SOFT;
+  if (mode == DVO_OPEN_READ) catalog[0].lockmode  = LCK_SOFT;
 
   // XXX make a backup?  always?
@@ -161 +202 @@
     break;
   case 2:
-    if (readonly) return (TRUE);
+    if (DVO_OPEN_READ || DVO_OPEN_UPDATE) return (TRUE);
     dvo_catalog_create (region, catalog, Nsecfilt); /* fills in new header info */
     if (VERBOSE) fprintf (stderr, "creating new file %s\n", catalog[0].filename);
@@ -177 +218 @@
   char measure[80];
 
+  dvo_catalog_init (catalog, FALSE);
+
   // load the main catalog header, determine characteristics
   if (!gfits_fread_header (catalog[0].f, &catalog[0].header)) {
@@ -200 +243 @@
   catalog[0].catformat = DVO_FORMAT_UNDEF;
 
-  catalog[0].average = NULL;
-  catalog[0].secfilt = NULL;
-  catalog[0].measure = NULL;
-  catalog[0].missing = NULL;
-
   switch (catalog[0].catmode) {
     case DVO_MODE_RAW:
@@ -217 +255 @@
       if (VERBOSE) fprintf (stderr, "reading catalog (mode DVO_MODE_SPLIT)\n");
       dvo_catalog_load_split (catalog, VERBOSE);
+      dvo_catalog_test (catalog, TRUE);
       break;
     default:

trunk/Ohana/src/libdvo/src/dvo_catalog_create.c

@@ -1 +1 @@
 # include <dvo.h>
-# define DEBUG 1
+# define DEBUG 0
 
 // create a new dvo catalog file (if split, lock extra files as well?)

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

@@ -60 +60 @@
     gfits_free_header (&header);
   } 
+  dvo_catalog_test (catalog, FALSE);
 
   /*** Measure Table ***/
@@ -68 +69 @@
   if (catalog[0].catflags & LOAD_MEAS) {
     ALLOCATE (measure, Catalog, 1);
-    measure[0].measure_catalog = NULL;
-    measure[0].missing_catalog = NULL;
-    measure[0].secfilt_catalog = NULL;
+    dvo_catalog_init (measure, TRUE);
 
     /* get split filename from main header (paths relative to cpt file) */
@@ -90 +89 @@
     /* matrix should be empty */
     if (!gfits_fread_matrix (measure[0].f, &matrix, &measure[0].header)) {
-      if (VERBOSE) fprintf (stderr, "can't read primary matrix");
+      if (VERBOSE) fprintf (stderr, "can't read primary matrix\n");
       return (FALSE);
     }
     /* read Measure table header */
     if (!gfits_fread_header (measure[0].f, &header)) {
-      if (VERBOSE) fprintf (stderr, "can't read measure PHU header");
+      if (VERBOSE) fprintf (stderr, "can't read measure PHU header\n");
       return (FALSE);
     }
     /* read Measure table data */
     if (!gfits_fread_ftable_data (measure[0].f, &ftable)) {
-      if (VERBOSE) fprintf (stderr, "can't read table measure data");
+      if (VERBOSE) fprintf (stderr, "can't read table measure data\n");
       return (FALSE);
     }
@@ -112 +111 @@
     gfits_free_matrix (&matrix);
   }
+  dvo_catalog_test (catalog, FALSE);
 
   /* (Meta Load) */
   if (catalog[0].catflags & LOAD_MEAS_META) {
     ALLOCATE (measure, Catalog, 1);
+    dvo_catalog_init (measure, TRUE);
 
     /* get split filename from main header (paths relative to cpt file) */
@@ -142 +143 @@
   }
   catalog[0].measure_catalog = measure;
+  dvo_catalog_test (catalog, FALSE);
 
   /*** Missing Table ***/
@@ -148 +150 @@
   if (catalog[0].catflags & LOAD_MISS) {
     ALLOCATE (missing, Catalog, 1);
-    missing[0].measure_catalog = NULL;
-    missing[0].missing_catalog = NULL;
-    missing[0].secfilt_catalog = NULL;
+    dvo_catalog_init (missing, TRUE);
 
     /* get split filename from main header (paths relative to cpt file) */
@@ -170 +170 @@
     /* matrix should be empty */
     if (!gfits_fread_matrix (missing[0].f, &matrix, &missing[0].header)) {
-      if (VERBOSE) fprintf (stderr, "can't read primary matrix");
+      if (VERBOSE) fprintf (stderr, "can't read primary matrix\n");
       return (FALSE);
     }
     /* read Missing table header */
     if (!gfits_fread_header (missing[0].f, &header)) {
-      if (VERBOSE) fprintf (stderr, "can't read table missing header");
+      if (VERBOSE) fprintf (stderr, "can't read table missing header\n");
       return (FALSE);
     }
     /* read Missing table data */
     if (!gfits_fread_ftable_data (missing[0].f, &ftable)) {
-      if (VERBOSE) fprintf (stderr, "can't read table missing data");
+      if (VERBOSE) fprintf (stderr, "can't read table missing data\n");
       return (FALSE);
     }
@@ -192 +192 @@
   } 
   catalog[0].missing_catalog = missing;
+  dvo_catalog_test (catalog, FALSE);
 
   /*** Secfilt Table ***/
@@ -198 +199 @@
   if (catalog[0].catflags & LOAD_SECF) {
     ALLOCATE (secfilt, Catalog, 1);
-    secfilt[0].measure_catalog = NULL;
-    secfilt[0].missing_catalog = NULL;
-    secfilt[0].secfilt_catalog = NULL;
+    dvo_catalog_init (secfilt, TRUE);
 
     /* get split filename from main header (paths relative to cpt file) */
@@ -220 +219 @@
     /* matrix should be empty */
     if (!gfits_fread_matrix (secfilt[0].f, &matrix, &secfilt[0].header)) {
-      if (VERBOSE) fprintf (stderr, "can't read primary matrix");
+      if (VERBOSE) fprintf (stderr, "can't read primary matrix\n");
       return (FALSE);
     }
     /* read secfilt table header */
     if (!gfits_fread_header (secfilt[0].f, &header)) {
-      if (VERBOSE) fprintf (stderr, "can't read table secfilt header");
+      if (VERBOSE) fprintf (stderr, "can't read table secfilt header\n");
       return (FALSE);
     }
     /* read secfilt table data */
     if (!gfits_fread_ftable_data (secfilt[0].f, &ftable)) {
-      if (VERBOSE) fprintf (stderr, "can't read table secfilt data");
+      if (VERBOSE) fprintf (stderr, "can't read table secfilt data\n");
       return (FALSE);
     }
@@ -242 +241 @@
   } 
   catalog[0].secfilt_catalog = secfilt;
+  dvo_catalog_test (catalog, FALSE);
 
   /* save the current number so we can do partial updates */

trunk/Ohana/src/libdvo/src/skyregion_gsc.c

@@ -2 +2 @@
 # define NDECBANDS 24
 # define NDIV 4
+# define DEBUG 0
 
 static int DecLines[] = {593, 584, 551, 530, 522, 465, 406, 362, 280, 198, 123, 25, 597, 578, 574, 577, 534, 499, 442, 376, 294, 212, 144, 48};
@@ -85 +86 @@
   L0.regions[0].childE  =  NDECBANDS;
   strcpy (L0.regions[0].name, "fullsky");
-  // SkyRegionPrint (&L0.regions[0]);
+  if (DEBUG) SkyRegionPrint (&L0.regions[0]);
 
   /* allocate space for all levels */
@@ -93 +94 @@
   ALLOCATE (L3.regions, SkyRegion, 1);
   ALLOCATE (L4.regions, SkyRegion, 1);
+
+  // skipLines = 0;
+  // for (i = 0; i < 16; i++) skipLines += DecLines[i];
+  // for (i = 16; i < 17; i++) {
 
   /* L1 : dec bands */
@@ -107 +112 @@
     L1.regions[i].table    = -1;
     strcpy (L1.regions[i].name, DecNames[i]);
-    // SkyRegionPrint (&L1.regions[i]);
+    if (DEBUG) SkyRegionPrint (&L1.regions[i]);
 
     /* build the L2 regions for this L1 region (based on zones) */
@@ -123 +128 @@
     /* subdivide each zone */
     for (j = 0; j < Nzones; j++) {
+      if (DEBUG) fprintf (stderr, "zone: %d : %f - %f : %f - %f\n", j, zones[j].Rmin, zones[j].Rmax, zones[j].Dmin, zones[j].Dmax);
       SkyTableL2fromZone (&L2, &L3, &L4, band, &zones[j], i);
     }
@@ -273 +279 @@
     Dmax = MAX (regions[i].Dmax, Dmax);
     dDec = regions[i].Dmax - regions[i].Dmin;
-    if (dDec != zones[Nz].dDec) {
+    if (fabs(dDec - zones[Nz].dDec) > 0.001) {
       /* we've found the end of the current zone */
       zones[Nz].L3end = i;
@@ -347 +353 @@
     *p = '/';
     strcpy (L2[0].regions[Nr].name, name);
-    // SkyRegionPrint (&L2[0].regions[Nr]);
+    if (DEBUG) SkyRegionPrint (&L2[0].regions[Nr]);
 
     /* childS and childE are set in SkyTableL3fromL2 */
@@ -383 +389 @@
     L3[0].regions[Nr].childE   =  0;
 
-    // SkyRegionPrint (&L3[0].regions[Nr]);
+    if (DEBUG) SkyRegionPrint (&L3[0].regions[Nr]);
     /* name is set for the band in SkyRegionForDecBand */
 
@@ -432 +438 @@
       sprintf (name, "%s.%02d", L3[0].name, Nbox);
       strcpy (L4[0].regions[Nr].name, name);
-      // SkyRegionPrint (&L4[0].regions[Nr]);
+      if (DEBUG) SkyRegionPrint (&L4[0].regions[Nr]);
 
       Nr ++;

trunk/Ohana/src/markrock/src/markrock.c

@@ -37 +37 @@
 
   catalog.filename = argv[1];
-  switch (lock_catalog (&catalog, LCK_XCLD)) {
-  case 0:
-    fprintf (stderr, "ERROR: can't lock file\n");
-    exit (1);
-  case 1:
-    gcatalog (&catalog); /* load from disk */
-    break;
-  case 2:
-    fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
-    catalog.Naverage = 0;
-    catalog.Nmeasure = 0;
-    unlock_catalog (&catalog);
-    exit (0);
-  default:
-    fprintf (stderr, "weird lock_catalog exit state\n");
-    exit (1);
+  catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
+  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+
+  // an error exit status here is a significant error
+  if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "a")) {
+    fprintf (stderr, "ERROR: failure to open catalog file %s\n", catalog.filename);
+    exit (2);
+  }
+  if (catalog.Nave_disk) {
+    dvo_catalog_unlock (&catalog);
+    dvo_catalog_free (&catalog);
+    continue;
   }
 
@@ -63 +59 @@
 
   /* rocks2 = find_slow_rocks (&catalog, &catstats, &Nrocks2);  */
+  dvo_catalog_save (&catalog, VERBOSE);
+  dvo_catalog_unlock (&catalog);
+  dvo_catalog_free (&catalog);
 
-  wcatalog (&catalog);
   wrocks (rocks1, Nrocks1);
-
-  unlock_catalog (&catalog);
   /* wrocks (rocks2, Nrocks2); */
 

trunk/Ohana/src/markstar/src/find_bright_stars.c

@@ -15 +15 @@
   double dX, dY, dR, MaxDist, MaxDist1, MaxRadius, radius, radius2;
 
+  // put limits on the ref catalog mags
   load_gsc_data (&GSCdata, catstats);
 

trunk/Ohana/src/markstar/src/find_ghosts.c

@@ -32 +32 @@
     
     /* find ghost stars */
+    // put limits on the ref catalog mags
     load_gsc_data_ghost (&GSCdata, region, Nregions, &timage);
 

trunk/Ohana/src/markstar/src/markstar.c

@@ -37 +37 @@
 
   set_db (&db);
-  lock_image_db (&db, ImageCat);
+  dvo_image_lock (&db, ImageCat, 3600.0, LCK_XCLD);
 
-  gcatalog (argv[1], &catalog);
+  catalog.filename = argv[1];
+  catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
+  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+
+  // an error exit status here is a significant error
+  if (!dvo_catalog_open (&catalog, NULL, VERBOSE, "a")) {
+    fprintf (stderr, "ERROR: failure to open catalog file %s\n", catalog.filename);
+    exit (2);
+  }
+  if (!catalog.Nave_disk) {
+    dvo_catalog_unlock (&catalog);
+    dvo_catalog_free (&catalog);
+    exit (0);
+  }
 
   gcatstats (&catalog, &catstats);
@@ -53 +66 @@
   /* find_ghosts (&catalog, &catstats, argv[1], image, Nimage); */
 
-
-  wcatalog (argv[1], &catalog);
+  dvo_catalog_save (&catalog, VERBOSE);
+  dvo_catalog_unlock (&catalog);
+  dvo_catalog_free (&catalog);
 
   if (VERBOSE) {
@@ -61 +75 @@
              (now.tv_sec - then.tv_sec) + 1e-6*(now.tv_usec - then.tv_usec));
   }
-  clear_lockfile (); 
   fprintf (stderr, "SUCCESS\n");
 }

trunk/Ohana/src/relphot/Makefile

@@ -28 +28 @@
 $(SRC)/select_images.$(ARCH).o   \
 $(SRC)/load_catalogs.$(ARCH).o   \
-$(SRC)/gcatalog.$(ARCH).o        \
 $(SRC)/bcatalog.$(ARCH).o        \
 $(SRC)/GridOps.v2.$(ARCH).o      \
@@ -37 +36 @@
 $(SRC)/plot_scatter.$(ARCH).o    \
 $(SRC)/plotstuff.$(ARCH).o       \
-$(SRC)/misc.$(ARCH).o            \
+$(SRC)/sort.$(ARCH).o            \
 $(SRC)/reload_catalogs.$(ARCH).o \
-$(SRC)/image-db.$(ARCH).o \
-$(SRC)/free_catalogs.$(ARCH).o   \
 $(SRC)/setMrelFinal.$(ARCH).o    \
 $(SRC)/write_coords.$(ARCH).o    \
 $(SRC)/setExclusions.$(ARCH).o   \
 $(SRC)/Shutdown.$(ARCH).o        \
-$(SRC)/SetSignals.$(ARCH).o      \
-$(SRC)/wcatalog.$(ARCH).o
+$(SRC)/SetSignals.$(ARCH).o     
 
 OLD = \

trunk/Ohana/src/relphot/src/load_catalogs.c

@@ -8 +8 @@
   if (VERBOSE) fprintf (stderr, "loading catalog data\n");
 
-  // XXX skip over the empty catalogs? don't add to the list?
   ALLOCATE (catalog, Catalog, skylist[0].Nregions);
 
-  /* load data from each region file, only use bright stars */
-  // we use LCK_SOFT since we assume the image is locked 
+  // load data from each region file, only use bright stars
   for (i = 0; i < skylist[0].Nregions; i++) {
+
+    // set up the basic catalog info
     tcatalog.filename = skylist[0].filename[i];
+    tcatalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
+    tcatalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
+    tcatalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF; // don't need to load all data at this point
 
-    tcatalog.catformat = dvo_catalog_format (CATFORMAT);  // set the default catformat from config data
-    tcatalog.catmode   = dvo_catalog_mode (CATMODE);      // set the default catmode from config data
-    tcatalog.lockmode  = LCK_SOFT;
-    dvo_catalog_open (&tcatalog, skylist[0].regions[i], Nsecfilt, "r");
-
-    switch (lock_catalog (&tcatalog, LCK_SOFT)) {
-    case 0:
-      fprintf (stderr, "ERROR: can't lock file %s\n", tcatalog.filename);
-      exit (1);
-    case 1:
-      gcatalog (&tcatalog, FALSE); /* load from disk */
-      break;
-    case 2:
-      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", tcatalog.filename);
-      tcatalog.Naverage = 0;
-      tcatalog.Nmeasure = 0;
-      break;
-    default:
-      fprintf (stderr, "weird lock_catalog exit state\n");
+    if (!dvo_catalog_open (&tcatalog, skylist[0].regions[i], VERBOSE, "r")) {
+      fprintf (stderr, "ERROR: failure reading catalog %s\n", tcatalog.filename);
       exit (1);
     }
+    if (VERBOSE && !tcatalog.Nave_disk) fprintf (stderr, "no data in %s, skipping\n", tcatalog.filename);
+
+    // select only the brighter stars
     bcatalog (&catalog[i], &tcatalog);
+    dvo_catalog_unlock (&tcatalog);
+    dvo_catalog_free (&tcatalog);
   }
 
+  // XXX keep this test?
   Nstar = 0;
   for (i = 0; i < skylist[0].Nregions; i++) {
@@ -49 +41 @@
   }
 
+  // XXX consider only returning the populated catalogs
   *Ncatalog = skylist[0].Nregions;
   return (catalog);
 }
+
+/* this function loads all relevant catalog files for the first pass.  it currently loads the data
+   read only (SOFT lock) since it assumes the image table has been locked. if we go to the new
+   addstar locking paradigm, in which the images and catalogs are updated independently, then we may
+   need to use an XCLD lock here.  
+*/

trunk/Ohana/src/relphot/src/reload_catalogs.c

@@ -14 +14 @@
     catalog.filename = skylist[0].filename[i];
 
-    // XXX only update existing db tables
+    // only update existing db tables
     status = stat (catalog.filename, &filestat);
     if ((status == -1) && (errno == ENOENT)) {
@@ -20 +20 @@
       continue;
     }
-    switch (lock_catalog (&catalog, LCK_XCLD)) {
-      case 0: // file cannot be locked
-        fprintf (stderr, "ERROR: can't lock file %s\n", catalog.filename);
-        exit (1);
-      case 1: // file is now locked
-        gcatalog (&catalog, TRUE); /* load from disk */
-        break;
-      case 2: // file is empty
-        if (VERBOSE) fprintf (stderr, "no data in file %s, skipping\n", catalog.filename);
-        unlock_catalog (&catalog);
+
+    catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
+    catalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
+    catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+
+    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "w")) {
+      fprintf (stderr, "ERROR: failure reading catalog %s\n", catalog.filename);
+      exit (1);
+    }
+    if (VERBOSE && (catalog.Nave_disk == 0)) {
+        fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
+        dvo_catalog_unlock (&catalog);
+        dvo_catalog_free (&catalog);
         continue;
-      default:
-        fprintf (stderr, "weird lock_catalog exit state %s\n", catalog.filename);
-        exit (1);
     }
+
     initImageBins  (&catalog, 1);
     initMosaicBins (&catalog, 1);
@@ -43 +44 @@
 
     setMrelFinal (&catalog);
-    wcatalog (&catalog); 
-    unlock_catalog (&catalog);
+    dvo_catalog_save (&catalog, VERBOSE); 
+    dvo_catalog_unlock (&catalog);
+    dvo_catalog_free (&catalog);
 
     freeImageBins (1);

trunk/Ohana/src/relphot/src/relphot.c

@@ -88 +88 @@
 
   /* at this point, we have correct cal coeffs in the image/mosaic structures */
-  free_catalogs (catalog, Ncatalog);
+  for (i = 0; i < Ncatalog; i++) dvo_catalog_free (&catalog[i]);
   freeImageBins (Ncatalog);
   freeMosaicBins (Ncatalog);