Changeset 8390

Timestamp:

Aug 16, 2006, 11:17:15 AM (20 years ago)

Author:

eugene

Message:

update to new DVO APIs

Location:

trunk/Ohana/src/relastro/src

Files:

• ConfigInit.c (modified) (1 diff)
• args.c (modified) (3 diffs)
• bcatalog.c (modified) (2 diffs)
• check_permissions.c (deleted)
• find_images.c (deleted)
• find_regions.c (deleted)
• free_catalogs.c (deleted)
• gcatalog.c (deleted)
• get_regions.c (deleted)
• image-db.c (deleted)
• initialize.c (modified) (1 diff)
• load_catalogs.c (modified) (2 diffs)
• load_images.c (modified) (1 diff)
• misc.c (deleted)
• name_region.c (deleted)
• reload_catalogs.c (modified) (3 diffs)
• relphot.c (modified) (4 diffs)
• select_images.c (added)
• sort.c (added)
• wcatalog.c (deleted)
• wimages.c (deleted)

trunk/Ohana/src/relastro/src/ConfigInit.c

@@ -34 +34 @@
   sprintf (ImageCat, "%s/Images.dat", CATDIR);
 
+  if (!ScanConfig (config, "SKY_DEPTH",         "%d",  0, &SKY_DEPTH)) {
+    SKY_DEPTH = 2;
+  }
+  if (!ScanConfig (config, "SKY_TABLE",         "%s",  0, SKY_TABLE)) {
+    SKY_TABLE[0] = 0;
+  }
+
   GetConfig (config, "PHOTCODE_FILE",          "%s",  0, PhotCodeFile);
   GetConfig (config, "ZERO_PT",                "%lf", 0, &ZERO_POINT);

trunk/Ohana/src/relastro/src/args.c

@@ -1 +1 @@
 # include "relphot.h"
+void usage (void);
 
 int args (int argc, char **argv) {
 
   int N;
+  double trange;
 
   /* define time */
@@ -14 +16 @@
     }
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &TSTOP)) { 
-      fprintf (stderr, "ERROR: syntax error\n");
-      return (FALSE);
+    if (!str_to_dtime (argv[N], &trange)) { 
+      if (!str_to_time (argv[N], &TSTOP)) { 
+        fprintf (stderr, "ERROR: syntax error\n");
+        return (FALSE);
+      }
+    } else {
+      if (trange < 0) {
+        trange = fabs (trange);
+        TSTOP = TSTART;
+        TSTART -= trange;
+      } else {
+        TSTOP = TSTART + trange;
+      }
     }
     remove_argument (N, &argc, argv);
     TimeSelect = TRUE;
+  }
+
+  /* specify portion of the sky */
+  UserPatch.Rmin = 0;
+  UserPatch.Rmax = 360;
+  UserPatch.Dmin = -90;
+  UserPatch.Dmax = +90;
+  UserPatchSelect = FALSE;
+  if ((N = get_argument (argc, argv, "-region"))) {
+    remove_argument (N, &argc, argv);
+    UserPatch.Rmin = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+    UserPatch.Rmax = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+    UserPatch.Dmin = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+    UserPatch.Dmax = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+    UserPatchSelect = TRUE;
   }
 
@@ -142 +173 @@
   }
 
-  if (argc != 3) {
-    fprintf (stderr, "ERROR: USAGE: nrphot (region) (photcode)\n");
-    fprintf (stderr, "  options: \n");
-    fprintf (stderr, "  -time (start) (stop)\n");
-    fprintf (stderr, "  -v\n");
-    fprintf (stderr, "  -plot\n");
-    fprintf (stderr, "  -plotdelay (seconds)\n");
-    fprintf (stderr, "  -statmode (mode)\n");
-    fprintf (stderr, "  -n (nloop)\n");
-    fprintf (stderr, "  -reset\n");
-    fprintf (stderr, "  -update\n");
-    fprintf (stderr, "  -params\n");
-    fprintf (stderr, "  -mosaic (mosaic)\n");
-    fprintf (stderr, "  -imfreeze\n");
-    fprintf (stderr, "  -grid\n");
-    fprintf (stderr, "  -area Xmin Xmax Ymin Ymax\n");
-    fprintf (stderr, "  -instmag min max\n");
-    fprintf (stderr, "  \n");
-    exit (2);
-  } 
-  return (TRUE);
+  if ( UserPatchSelect && (argc != 2)) usage ();
+  if (!UserPatchSelect && (argc != 3)) usage ();
+
+  return TRUE;
 }
 
+void usage () {
+  fprintf (stderr, "ERROR: USAGE: relphot (region) (photcode)\n");
+  fprintf (stderr, "       or:    relphot (photcode) -region RA RA DEC DEC\n");
+  fprintf (stderr, "  options: \n");
+  fprintf (stderr, "  -time (start) (stop)\n");
+  fprintf (stderr, "  -v\n");
+  fprintf (stderr, "  -plot\n");
+  fprintf (stderr, "  -plotdelay (seconds)\n");
+  fprintf (stderr, "  -statmode (mode)\n");
+  fprintf (stderr, "  -n (nloop)\n");
+  fprintf (stderr, "  -reset\n");
+  fprintf (stderr, "  -update\n");
+  fprintf (stderr, "  -params\n");
+  fprintf (stderr, "  -mosaic (mosaic)\n");
+  fprintf (stderr, "  -imfreeze\n");
+  fprintf (stderr, "  -grid\n");
+  fprintf (stderr, "  -area Xmin Xmax Ymin Ymax\n");
+  fprintf (stderr, "  -instmag min max\n");
+  fprintf (stderr, "  \n");
+  exit (2);
+} 

trunk/Ohana/src/relastro/src/bcatalog.c

@@ -1 +1 @@
 # include "relphot.h"
 
-int bcatalog (Catalog *subcatalog, Catalog *catalog, GSCRegion *fullregion) {
+int bcatalog (Catalog *subcatalog, Catalog *catalog) {
   
   int i, j, offset, ecode;
@@ -18 +18 @@
   for (i = 0; i < catalog[0].Naverage; i++) {
     if (catalog[0].average[i].Nm < 2) continue; 
+
+    /* XXX this limitation is absurd
     if (catalog[0].average[i].R < fullregion[0].RA[0]) continue;
     if (catalog[0].average[i].R > fullregion[0].RA[1]) continue;
     if (catalog[0].average[i].D < fullregion[0].DEC[0]) continue;
     if (catalog[0].average[i].D > fullregion[0].DEC[1]) continue;
+    */
 
     /* start with all stars good */

trunk/Ohana/src/relastro/src/initialize.c

@@ -3 +3 @@
 void initialize (int argc, char **argv) {
 
-  /* are these set correctly? */
+  int N;
+
   ConfigInit (&argc, argv);
   args (argc, argv);
 
-  if ((photcode = GetPhotcodebyName (argv[2])) == NULL) {
-    fprintf (stderr, "ERROR: photcode %s not found in photcode table\n", argv[2]);
+  N = UserPatchSelect ? 1 : 2;
+  if ((photcode = GetPhotcodebyName (argv[N])) == NULL) {
+    fprintf (stderr, "ERROR: photcode %s not found in photcode table\n", argv[N]);
     exit (1);
   }
   if ((photcode[0].type != PHOT_PRI) && (photcode[0].type != PHOT_SEC)) {
-    fprintf (stderr, "photcode %s is not a primary or secondary filter\n", argv[2]);
+    fprintf (stderr, "photcode %s is not a primary or secondary filter\n", argv[N]);
     exit (1);
   }

trunk/Ohana/src/relastro/src/load_catalogs.c

@@ -1 +1 @@
 # include "relphot.h"
 
-Catalog *load_catalogs (GSCRegion *region, int Nregion, GSCRegion *fullregion) {
+Catalog *load_catalogs (SkyList *skylist, int *Ncatalog) {
 
   int i, Nstar;
-  char filename[256];
   Catalog *catalog, tcatalog;
 
   if (VERBOSE) fprintf (stderr, "loading catalog data\n");
 
-  ALLOCATE (catalog, Catalog, Nregion);
+  ALLOCATE (catalog, Catalog, skylist[0].Nregions);
 
-  /* load data from each region file, only use bright stars */
-  for (i = 0; i < Nregion; i++) {
-    sprintf (filename, "%s/%s", CATDIR, region[i].filename);
-    tcatalog.filename = filename;  /* don't free region before catalog! */
-    switch (lock_catalog (&tcatalog, LCK_SOFT)) {
-    case 0:
-      fprintf (stderr, "ERROR: can't lock file %s\n", region[i].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");
+  // 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
+
+    if (!dvo_catalog_open (&tcatalog, skylist[0].regions[i], VERBOSE, "r")) {
+      fprintf (stderr, "ERROR: failure reading catalog %s\n", tcatalog.filename);
       exit (1);
     }
-    bcatalog (&catalog[i], &tcatalog, fullregion);
+    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 < Nregion; i++) {
+  for (i = 0; i < skylist[0].Nregions; i++) {
     Nstar += catalog[i].Naverage;
   }
@@ -42 +40 @@
     exit (0);
   }
+
+  // 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/relastro/src/load_images.c

@@ -1 +1 @@
 # include "relphot.h"
 
-GSCRegion *load_images (FITS_DB *db, char *seed, int *nregion, GSCRegion *fullregion) {
+SkyList *load_images (FITS_DB *db, char *regionName, SkyRegion *region, int RegionSelect) {
 
-  GSCRegion *region;
-  int        Nregion;
-  Image     *image;
-  int       *Line;
-  int        Nimage;
+  Image     *image, *subset;
+  int        Nimage, Nsubset, Nchar;
+  int       *LineNumber;
 
-  /* read entire db table */
-  if (!dvo_image_load (db, VERBOSE, FALSE)) Shutdown ("can't read image catalog %s", db[0].filename);
+  SkyTable *sky = NULL;
+  SkyList *skylist = NULL;
 
-  region = name_region (seed, &Nregion);
+  // load the current sky table (layout of all SkyRegions) 
+  sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, SKY_DEPTH, VERBOSE);
+  SkyTableSetFilenames (sky, CATDIR, "cpt");
+  
+  // determine the populated SkyRegions overlapping the requested area
+  if (RegionSelect) {
+    skylist = SkyListByPatch (sky, -1, region);
+  } else {
+    Nchar = strlen(regionName);
+    if (!strcmp (&regionName[Nchar-4], ".cpt")) regionName[Nchar-4] = 0;
+    skylist = SkyListByName (sky, regionName);
+  }
 
-  /* find images which supplied all measurements */
-  image = find_images (db, region, Nregion, &Nimage, &Line);
-  free (Line);
+  // convert database table to internal structure
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
 
-  /* find all region files which touch images */
-  region = find_regions (image, Nimage, &Nregion, fullregion);
-  free (image);
+  // select the images which overlap the selected sky regions
+  subset = select_images (skylist, image, Nimage, &LineNumber, &Nsubset);
 
-  /* find images which supplied all measurements for all regions */
-  image = find_images (db, region, Nregion, &Nimage, &Line);
-  getfullregion (image, Nimage, fullregion);
+  gfits_vtable_from_ftable (&db[0].ftable, &db[0].vtable, LineNumber, Nsubset);
 
-  gfits_vtable_from_ftable (&db[0].ftable, &db[0].vtable, Line, Nimage);
-
-  initImages (image, Nimage);
-  initMosaics (image, Nimage);
+  initImages (subset, Nsubset);
+  initMosaics (subset, Nsubset);
   
-  *nregion = Nregion;
-  return (region);
+  return (skylist);
 }

trunk/Ohana/src/relastro/src/reload_catalogs.c

@@ -1 +1 @@
 # include "relphot.h"
 
-void reload_catalogs (GSCRegion *region, int Nregion, GSCRegion *fullregion) {
+void reload_catalogs (SkyList *skylist) {
 
   int i;
-  char filename[256];
+  int status;
+  struct stat filestat;
   Catalog catalog;
 
@@ -10 +11 @@
 
   /* load data from each region file */
-  for (i = 0; i < Nregion; i++) {
-    sprintf (filename, "%s/%s", CATDIR, region[i].filename);
-    catalog.filename = filename;  /* don't free region before catalog! */
-    switch (lock_catalog (&catalog, LCK_XCLD)) {
-    case 0:
-      fprintf (stderr, "ERROR: can't lock file %s\n", region[i].filename);
-      exit (1);
-    case 1:
-      gcatalog (&catalog, TRUE); /* load from disk */
-      break;
-    case 2:
-      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
-      unlock_catalog (&catalog);
+  for (i = 0; i < skylist[0].Nregions; i++) {
+    catalog.filename = skylist[0].filename[i];
+
+    // only update existing db tables
+    status = stat (catalog.filename, &filestat);
+    if ((status == -1) && (errno == ENOENT)) {
+      if (VERBOSE) fprintf (stderr, "no file %s, skipping\n", catalog.filename);
       continue;
-      break;
-    default:
-      fprintf (stderr, "weird lock_catalog exit state\n");
+    }
+
+    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;
+    }
+
     initImageBins  (&catalog, 1);
     initMosaicBins (&catalog, 1);
@@ -37 +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/relastro/src/relphot.c

@@ -1 +1 @@
 # include "relphot.h"
-/** I'm not currently setting the lockfiles.  this should be fixed! **/
 
 int main (int argc, char **argv) {
@@ -6 +5 @@
   int i, status, Ncatalog;
   Catalog *catalog;
-  GSCRegion fullregion, *region;
   FITS_DB db;
+
+  SkyList *skylist = NULL;
 
   /* get configuration info, args */
   initialize (argc, argv);
 
+  /* register database handle with shutdown procedure */
   set_db (&db);
+
+  /* lock and load the image db table */
   status = dvo_image_lock (&db, ImageCat, 60.0, (UPDATE ? LCK_XCLD : LCK_SOFT));
   if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db.filename);
   if (db.dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db.filename);
+  if (!dvo_image_load (&db, VERBOSE, FALSE)) Shutdown ("can't read image catalog %s", db.filename);
 
-  /* load regions and images based on seed region */
-  // XXX EAM : load images and regions based on bounds, not name
-  region = load_images (&db, argv[1], &Ncatalog, &fullregion);
+  /* load regions and images based on specified sky patch */
+  // XXX need to mimic old-style load by passing patch name
+  // XXX need to reduce number of global variables in use.
+  // XXX this is fairly lame: argv[1] is photcode if UserPatchSelect is true
+  skylist = load_images (&db, argv[1], &UserPatch, UserPatchSelect);
+
+  /* unlock, if we can (else, unlocked below) */
   if (!UPDATE) dvo_image_unlock (&db); 
 
   /* load catalog data from region files */
-  catalog = load_catalogs (region, Ncatalog, &fullregion);
+  catalog = load_catalogs (skylist, &Ncatalog);
 
   /* match measurements with images, mosaics */
@@ -80 +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);
@@ -86 +94 @@
 
   /* load catalog data from region files, update Mrel include all data */
-  reload_catalogs (region, Ncatalog, &fullregion);
+  reload_catalogs (skylist);
   setMcalFinal ();
   dvo_image_update (&db, VERBOSE);