Changeset 8388

Timestamp:

Aug 16, 2006, 10:45:27 AM (20 years ago)

Author:

eugene

Message:

update to new DVO APIs, remove old versions

Location:

trunk/Ohana/src/uniphot

Files:

• Makefile (modified) (1 diff)
• src/check_permissions.c (deleted)
• src/gcatalog.c (deleted)
• src/image-db.c (deleted)
• src/misc.c (deleted)
• src/sort.c (added)
• src/time.c (deleted)
• src/update.c (modified) (2 diffs)
• src/wcatalog.c (deleted)
• src/wimages.c (deleted)

trunk/Ohana/src/uniphot/Makefile

@@ -20 +20 @@
 
 UNIPHOT = \
-$(SRC)/uniphot.$(ARCH).o         \
-$(SRC)/initialize.$(ARCH).o      \
-$(SRC)/ConfigInit.$(ARCH).o      \
-$(SRC)/args.$(ARCH).o            \
-$(SRC)/liststats.$(ARCH).o       \
-$(SRC)/load_images.$(ARCH).o     \
-$(SRC)/subset_images.$(ARCH).o   \
-$(SRC)/find_image_tgroups.$(ARCH).o      \
-$(SRC)/find_image_sgroups.$(ARCH).o      \
-$(SRC)/fit_groups.$(ARCH).o      \
-$(SRC)/update.$(ARCH).o          \
-$(SRC)/update_catalog.$(ARCH).o          \
-$(SRC)/wcatalog.$(ARCH).o                \
-$(SRC)/wimages.$(ARCH).o                 \
-$(SRC)/gcatalog.$(ARCH).o                \
-$(SRC)/check_permissions.$(ARCH).o               \
-$(SRC)/image-db.$(ARCH).o                \
-$(SRC)/SetSignals.$(ARCH).o              \
-$(SRC)/Shutdown.$(ARCH).o                \
-$(SRC)/misc.$(ARCH).o
+$(SRC)/uniphot.$(ARCH).o            \
+$(SRC)/initialize.$(ARCH).o         \
+$(SRC)/ConfigInit.$(ARCH).o         \
+$(SRC)/args.$(ARCH).o               \
+$(SRC)/liststats.$(ARCH).o          \
+$(SRC)/load_images.$(ARCH).o        \
+$(SRC)/subset_images.$(ARCH).o      \
+$(SRC)/find_image_tgroups.$(ARCH).o \
+$(SRC)/find_image_sgroups.$(ARCH).o \
+$(SRC)/fit_groups.$(ARCH).o         \
+$(SRC)/update.$(ARCH).o             \
+$(SRC)/update_catalog.$(ARCH).o     \
+$(SRC)/SetSignals.$(ARCH).o         \
+$(SRC)/Shutdown.$(ARCH).o           \
+$(SRC)/sort.$(ARCH).o
 
 OBJ = $(UNIPHOT)

trunk/Ohana/src/uniphot/src/update.c

@@ -44 +44 @@
   for (i = 0; i < pglob.gl_pathc; i++) {
     catalog.filename = pglob.gl_pathv[i];
-    if (!gcatalog (&catalog)) continue;
+    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
+
+    // an error exit status here is a significant error
+    if (!dvo_catalog_open (&catalog, NULL, VERBOSE, "a")) {
+      fprintf (stderr, "ERROR: failure to open/create catalog file %s\n", catalog.filename);
+      exit (2);
+    }
+    if (!catalog.Nave_disk) {
+      dvo_catalog_unlock (&catalog);
+      dvo_catalog_free (&catalog);
+      continue;
+    }
 
     gfits_scan (&catalog.header, "RA0", "%lf",  1, &Rmin);
@@ -72 +84 @@
     fprintf (stderr, "catalog: %s sgroup: %d %s %f\n", catalog.filename, Nmin, sgroup[Nmin].label, Rmin);
     update_dvo_catalog (&catalog, &sgroup[Nmin], (Rmin > 2*RADIUS)); 
-    wcatalog (&catalog); 
+    dvo_catalog_save (&catalog, VERBOSE);
+    dvo_catalog_unlock (&catalog);
+    dvo_catalog_free (&catalog);
   }
 }