Changeset 4864 for trunk/Ohana/src/addstar

Timestamp:

Aug 23, 2005, 8:55:22 PM (21 years ago)

Author:

eugene

Message:

converted to the libohana/dvo_image I/O routines; improvements in fits_db.c

Location:

trunk/Ohana/src/addstar

Files:

• Makefile (modified) (1 diff)
• include/addstar.h (modified) (3 diffs)
• src/Shutdown.c (added)
• src/addstar.c (modified) (4 diffs)
• src/gimages.c (modified) (6 diffs)
• src/image-db.c (modified) (2 diffs)
• src/rfits.c (modified) (1 diff)
• src/wimage.c (modified) (2 diffs)

trunk/Ohana/src/addstar/Makefile

@@ -61 +61 @@
 $(SRC)/update_coords.$(ARCH).o \
 $(SRC)/wcatalog.$(ARCH).o \
-$(SRC)/wimage.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
 $(SRC)/rfits.$(ARCH).o \
 $(SRC)/rtext.$(ARCH).o

trunk/Ohana/src/addstar/include/addstar.h

@@ -138 +138 @@
 Stars     *getgsc                 PROTO((GSCRegion *patch, int *NSTARS));
 Stars     *getusno                PROTO((GSCRegion *catstats, int *Nstars));
-Image     *gimages                PROTO((Image *image, int *Npimage));
+Image     *gimages                PROTO((FITS_DB *db, Image *image, int *Npimage));
 Stars     *grefcat                PROTO((char *Refcat, GSCRegion *catstats, int *nstars));
 Stars     *grefstars              PROTO((char *file, int *Nstars));
@@ -152 +152 @@
 int        load_pt_catalog        PROTO((Catalog *catalog, GSCRegion *region));  /*** choose new name ***/
 void       load_subpix            PROTO(());
-void       lock_image_db          PROTO(());
+void       lock_image_db          PROTO((FITS_DB *db, char *filename));
 int        main                   PROTO((int argc, char **argv));
 void       make_backup            PROTO((char *filename));
@@ -170 +170 @@
 void       sort_stars             PROTO((Stars *stars, int N));
 int        str_to_radec           PROTO((double *ra, double *dec, char *str1, char *str2));
-void       unlock_image_db        PROTO((Image *image));
+void       unlock_image_db        PROTO((FITS_DB *db));
 void       update_coords          PROTO((Average *average, Measure *measure, int *next));
 void       wcatalog               PROTO((Catalog *catalog));
-void       wimage                 PROTO((Image *image));
+void       wimage                 PROTO((FITS_DB *db, Image *image));
+void       create_image_db        PROTO((FITS_DB *db));
+void       set_db                 PROTO((FITS_DB *in));
 
 void       uppercase              PROTO((char *string));

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

@@ -8 +8 @@
   GSCRegion *regions;
   Catalog catalog;
+  FITS_DB db;
 
   double dtime;
@@ -21 +22 @@
   overlap = NULL;
   regions = NULL;
+  set_db (&db);
 
   if (SKYPROBE) load_subpix ();
 
-  /* we use the image table to lock db access */
-  lock_image_db ();
+  /* we use the image table to lock db access -- perhaps this is not necessary?*/
+  lock_image_db (&db, ImageCat);
 
   switch (MODE) {
@@ -32 +34 @@
     if ((DUMP != NULL) && !strcmp (DUMP, "rawstars")) dump_rawstars (stars, Nstars);
     regions = gregion_image (&image, &Nregions);
-    overlap = gimages (&image, &Noverlap);
+    /* lock_image_db (&db, ImageCat); */
+    overlap = gimages (&db, &image, &Noverlap);
+    /* unlock_image_db (&db); */
     break;
   case M_REFLIST:
@@ -75 +79 @@
 
   if (CALIBRATE) { FindCalibration (&image); }
-  unlock_image_db (&image); 
+
+  if (db.dbstate == LCK_EMPTY) {
+    create_image_db (&db);
+  }
+  
+  ohana_memcheck (FALSE);
+
+  /* write out new image */
+  if (MODE == M_IMAGE) {
+    dvo_image_addrows (&db, &image, 1);
+    SetProtect (TRUE);
+    dvo_image_update (&db, VERBOSE);
+    SetProtect (FALSE);
+  }
+  ohana_memcheck (FALSE);
+  /* unlock_image_db (&db); */
 
   gettimeofday (&stop, NULL);

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

@@ -2 +2 @@
 
 /* given image, find catalog images which overlap it */
-Image *gimages (Image *image, int *Npimage) {
+Image *gimages (FITS_DB *db, Image *image, int *Npimage) {
   
-  int i, j, k, Nimage, addtolist, size, dbstate;
-  int NTIMAGE, Ntimage, ntimage;
-  int NPIMAGE, npimage;
+  int i, j, k, addtolist;
+  int NPIMAGE, npimage, Ntimage;
   Image *timage, *pimage;
   Coords tcoords;
@@ -12 +11 @@
   double Xi[5], Yi[5], Xo[5], Yo[5];  /* image and original corners */
   double zeropt;
-  struct stat filestatus;
-  FILE *f;
-
-  FITS_DB *db;
 
   /* if image.db is opened successfully, f will not be NULL.
@@ -21 +16 @@
      if image.db is not locked & opened successfully, we will not reach here!
   */
-  db = GetDB ();
   if (db[0].dbstate == LCK_EMPTY) {
     *Npimage = 0;
     return (NULL);
   }
-  fseek (f, 0, SEEK_SET);
 
-  if (!dvo_image_load (db, TRUE)) {
-    Shutdown ("can't read image catalog %s", ImageCat);
+  /* read entire db table (use block read eventually?) */
+  if (!dvo_image_load (db, VERBOSE, FORCE_READ)) {
+    Shutdown ("can't read image catalog %s", db[0].filename);
   }
-  timage = fits_table_get_Image (&db.ftable, &Ntimage);
-  /* timage represents the complete image table */
+  timage = fits_table_get_Image (&db[0].ftable, &Ntimage, &db[0].swapped);
 
   fits_scan (&db[0].header, "ZERO_PT", "%lf", 1, &zeropt);
@@ -80 +73 @@
   BuildChipMatch (timage, Ntimage);
 
-  /* run through image table and search for overlaps */
+  /* run through image table and search for overlaps
+     also define the vtable entries for the images we keep  */
+
   for (i = 0; i < Ntimage; i++) {
 
@@ -116 +111 @@
 
   BuildChipMatch (pimage, npimage);
-
+  
   if (VERBOSE) fprintf (stderr, "found %d overlapping images\n", npimage);
 
@@ -134 +129 @@
    we are now loading in the entire image db table into memory.  
 
-   we will need to write out the new image with a vtable.
 */

trunk/Ohana/src/addstar/src/image-db.c

@@ -1 +1 @@
 # include "addstar.h"
 
-# define LOCK LCK_XCLD
+void lock_image_db (FITS_DB *db, char *filename) {
 
-/* file-pointer to Image.db table. if image db does not yet exist */
-static FITS_DB db;
+  /* lock the image catalog */
+  check_permissions (filename);
 
-FITS_DB *GetDB () {
-  return (&db);
-}
+  db[0].lockstate = LCK_XCLD;
+  db[0].timeout   = 3600.0;
+  fits_db_init (db);
 
-void lock_image_db () {
-  /* lock the image catalog */
-  check_permissions (ImageCat);
-
-  db.lockstate = LCK_XCLD;
-  db.timeout   = 3600.0;
-  fits_db_init (&db);
-
-  if (!fits_db_lock (&db, ImageCat)) {
+  if (!fits_db_lock (db, filename)) {
     fprintf (stderr, "ERROR: can't lock image catalog\n");
     exit (1);
@@ -24 +16 @@
 }
 
-void unlock_image_db (Image *image) {
+void unlock_image_db (FITS_DB *db) {
 
   mode_t mode;
 
-  /* protect wimage from interrupt signals */
-  if (MODE == M_IMAGE) {
-    SetProtect (TRUE);
-    wimage (image); 
-    SetProtect (FALSE);
+  fprintf (stderr, "closing file\n");
+  if (db[0].f == NULL) {
+    fprintf (stderr, "re-closing file??\n");
   }
-
-  fits_db_close (&db);
+  fits_db_close (db);
+  db[0].f = NULL;
 
   /* force permissions to 666 */
   mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
-  chmod (ImageCat, mode);
+  chmod (db[0].filename, mode);
 }
 
-/* clean up open / locked ImageCat before shutting down */
-int Shutdown (char *format, ...) {  
-  va_list argp;
-  char *formatplus;
-  
-  ALLOCATE (formatplus, char, strlen(format));
-  strcpy (formatplus, format);
-  strcat (formatplus, "\n");
+void create_image_db (FITS_DB *db) {
 
-  va_start (argp, format);
-  vfprintf (stderr, formatplus, argp);
-  free (formatplus);
-  va_end (argp);
+  if (VERBOSE) fprintf (stderr, "can't find %s, creating a new one\n", ImageCat);
 
-  SetProtect (TRUE);
-  fits_db_close (&db);
-  fprintf (stderr, "ERROR: addstar halted\n");
-  exit (1);
+  /* create new header */
+  fits_init_header (&db[0].header);
+
+  if (!strcmp (CATMODE, "RAW")) {
+    /* make header a fake image */
+    db[0].header.bitpix   = 16;
+    db[0].header.Naxes    = 2;
+    db[0].header.Naxis[0] = 1;
+    db[0].header.Naxis[1] = 1;
+    fits_create_header (&db[0].header);
+  }
+
+  if (!strcmp (CATMODE, "MEF") || !strcmp (CATMODE, "SPLIT")) {
+    fits_create_header (&db[0].header);
+  }
+
+  fits_create_matrix (&db[0].header, &db[0].matrix);
+  fits_table_set_Image (&db[0].ftable, NULL, 0);
+
+  /* assign Zero Point provided by first image in dB */
+  fits_modify (&db[0].header, "ZERO_PT", "%lf", 1, ZeroPt);
+  fits_modify (&db[0].header, "NIMAGES", "%d", 1, 0);
 }
+

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

@@ -16 +16 @@
   if (!fits_fread_ftable (f, &table, "SMPFILE")) goto escape;
 
-  smpdata = fits_table_get_SMPData (&table, &Nstars);
+  smpdata = fits_table_get_SMPData (&table, &Nstars, NULL);
 
   ALLOCATE (stars, Stars, Nstars);

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

@@ -2 +2 @@
 
 /* add 1 image to image db */
-void wimage (Image *image) {
+void wimages (FITS_DB *db, Image *image, int Nimage) {
   
-  FILE *f;
-  int Nimages, status, offset, dbstate;
-  Header header;
+  int status, Nimages;
 
-  db = GetDB ();
-  fseek (f, 0, SEEK_SET);
+  /* set permissions somewhere ...
+  mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
+  fchmod (ImageCat, mode); */
 
-  if (dbstate == LCK_EMPTY) {
-    if (VERBOSE) fprintf (stderr, "can't find %s, creating a new one\n", ImageCat);
-    if (!fits_read_header (ImageTemplate, &header)) {
-      fprintf (stderr, "ERROR: can't find template header %s\n", ImageTemplate);
-      exit (1);
-    }
-    /* assign Zero Point provided by first image in dB */
-    fits_modify (&header, "ZERO_PT", "%lf", 1, ZeroPt);
-    fits_modify (&header, "NIMAGES", "%d", 1, 0);
-  } else {
-    if (!fits_load_header (f, &header)) {
-      fprintf (stderr, "ERROR: can't read image header %s\n", ImageCat);
-      exit (1);
-    }
-  }
-  
+  /* adjust header */
   Nimages = 0;
-  fits_scan (&header, "NIMAGES", "%d", 1, &Nimages);
+  fits_scan (&db[0].header, "NIMAGES", "%d", 1, &Nimages);
   Nimages ++;
-  fits_modify (&header, "NIMAGES", "%d", 1, Nimages);
+  fits_modify (&db[0].header, "NIMAGES", "%d", 1, Nimages);
 
-  /* position to begining of file to write header */
-  fseek (f, 0, SEEK_SET);
-  status = Fwrite (header.buffer, 1, header.size, f, "char");
-  if (status != header.size) {
-    fprintf (stderr, "ERROR: failed writing data to image header\n");
-    exit (1);
+  fits_table_to_vtable (&db[0].ftable, &db[0].vtable, 0, 0);
+  for (i = 0; i < Nimage; i++) {
+    fits_vadd_rows (&db[0].vtable, (char *) image, 1, sizeof(Image));
   }
 
-  /* position to end of data array */
-  offset = (Nimages - 1)*sizeof(Image) + header.size;
-  fseek (f, offset, SEEK_SET);
+  /* check that primary header and table header agree */
+  if (Nimages != db[0].header.Naxis[1]) {
+    fprintf (stderr, "header / table length mismatch!\n");
+  }
 
-  status = Fwrite (image, sizeof(Image), 1, f, "image");
-  if (status != 1) {
+  SetProtect (TRUE);
+  status = dvo_image_update (db, VERBOSE);
+  SetProtect (FALSE);
+
+  if (!status) {
     fprintf (stderr, "ERROR: failed writing data to image catalog\n");
     exit (1);
@@ -51 +36 @@
 }
 
-/* the image we add in this routine is always a new image.  
-   We only need to do two things:
-     1) append the data for the image to the end of the file
-     2) update the NIMAGES field in the header (which means, read in header, re-write)
- */
+/* add the new image to the image table:
+   - use the table header (from ftable)
+   - create an empty vtable
+   - add the new image to the end of the vtable
+   
+   - write out the vtable, either as TEXT or FITS
+   * dvo_image_update performs the needed byte-swap on the image data
+*/