Changeset 8386 for trunk/Ohana/src/relphot

Timestamp:

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

Author:

eugene

Message:

updating to new DVO APIs

Location:

trunk/Ohana/src/relphot

Files:

• Makefile (modified) (2 diffs)
• src/gcatalog.c (deleted)
• src/load_catalogs.c (modified) (2 diffs)
• src/misc.c (deleted)
• src/reload_catalogs.c (modified) (3 diffs)
• src/relphot.c (modified) (1 diff)
• src/sort.c (added)

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);