Changeset 8392

Timestamp:

Aug 16, 2006, 2:30:23 PM (20 years ago)

Author:

eugene

Message:

update to new DVO APIs

Location:

trunk/Ohana/src/getstar

Files:

• Makefile (modified) (1 diff)
• src/gcatalog.c (deleted)
• src/getstar.c (modified) (4 diffs)
• src/init_catalog.c (deleted)
• src/load_pt_catalog.c (deleted)
• src/mkcatalog.c (deleted)
• src/wcatalog.c (deleted)

trunk/Ohana/src/getstar/Makefile

@@ -24 +24 @@
 $(SRC)/Shutdown.$(ARCH).o        \
 $(SRC)/SetSignals.$(ARCH).o      \
-$(SRC)/gcatalog.$(ARCH).o        \
-$(SRC)/load_pt_catalog.$(ARCH).o \
-$(SRC)/select_by_region.$(ARCH).o \
-$(SRC)/wcatalog.$(ARCH).o        \
-$(SRC)/init_catalog.$(ARCH).o    \
-$(SRC)/mkcatalog.$(ARCH).o
+$(SRC)/select_by_region.$(ARCH).o
 
 OBJ = $(GETSTAR)

trunk/Ohana/src/getstar/src/getstar.c

@@ -16 +16 @@
   SkyTableSetFilenames (sky, CATDIR, "cpt");
 
-  /* choose elements to load based on options */
-  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
-  init_catalog (&output);
+  // create an output catalog with the desired name and format options
+  output.filename  = OUTPUT;
+  output.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
+  output.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
+  output.Nsecfilt  = GetPhotcodeNsecfilt ();
+  dvo_catalog_open (&output, NULL, VERBOSE, "w");
 
   switch (MODE) {
@@ -28 +31 @@
       skylist = SkyListByPatch (sky, -1, &REGION);
       for (i = 0; i < skylist[0].Nregions; i++) {
+        // set the parameters which guide catalog open/load/create
         catalog.filename = skylist[0].filename[i];
-        load_pt_catalog (&catalog, skylist[0].regions[i]);
-        unlock_catalog (&catalog);
+        catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
+        catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+
+        // an error exit status here is a significant error
+        if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "r")) {
+          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;
+        }
+        dvo_catalog_unlock (&catalog);
 
         /* skip empty catalogs */
-        if (catalog.Nave_disk == 0) continue;
         select_by_region (&output, &catalog, &REGION, 0, 0);
       }
@@ -46 +61 @@
       skylist = SkyListByImage (sky, -1, &image, &Nimage);
       for (i = 0; i < skylist[0].Nregions; i++) {
-          catalog.filename = skylist[0].filename[i];
-          load_pt_catalog (&catalog, skylist[0].regions[i]);
-          unlock_catalog (&catalog);
+        // set the parameters which guide catalog open/load/create
+        catalog.filename = skylist[0].filename[i];
+        catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
+        catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
 
-          /* skip empty catalogs */
-          if (catalog.Nave_disk == 0) continue;
-          stars = select_by_image (&catalog, &image, 0, 0, stars, &Nstars);
+        // an error exit status here is a significant error
+        if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "r")) {
+          fprintf (stderr, "ERROR: failure to open/create catalog file %s\n", catalog.filename);
+          exit (2);
+        }
+        /* skip empty catalogs */
+        if (!catalog.Nave_disk) continue;
+        stars = select_by_image (&catalog, &image, 0, 0, stars, &Nstars);
       }
       # endif
@@ -70 +91 @@
 
   /* write out the selected stars */
-  wcatalog (OUTPUT, &output);
+  // XXX need to set the catalog boundaries by hand? RA0-RA1, DEC0-DEC1
+  dvo_catalog_save (&output, VERBOSE);
+  dvo_catalog_unlock (&output);
+  dvo_catalog_free (&output);
   fprintf (stderr, "SUCCESS\n");
   exit (0);
-
 }