Changeset 4854 for trunk/Ohana/src/addstar

Timestamp:

Aug 22, 2005, 10:08:38 AM (21 years ago)

Author:

eugene

Message:

working towards a unified dvo_image interface

Location:

trunk/Ohana/src/addstar/src

Files:

• addstar.c (modified) (1 diff)
• gimages.c (modified) (6 diffs)
• image-db.c (modified) (2 diffs)
• wimage.c (modified) (2 diffs)

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

@@ -24 +24 @@
   if (SKYPROBE) load_subpix ();
 
+  /* we use the image table to lock db access */
   lock_image_db ();
 

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

@@ -9 +9 @@
   Image *timage, *pimage;
   Coords tcoords;
-  Header header;
   double r, d;
   double Xi[5], Yi[5], Xo[5], Yo[5];  /* image and original corners */
@@ -15 +14 @@
   struct stat filestatus;
   FILE *f;
-  
+
+  FITS_DB *db;
+
   /* if image.db is opened successfully, f will not be NULL.
      if image.db is empty, dbstate will be LCK_EMPTY 
      if image.db is not locked & opened successfully, we will not reach here!
   */
-  f = GetDB (&dbstate);
-  if (dbstate == LCK_EMPTY) {
+  db = GetDB ();
+  if (db[0].dbstate == LCK_EMPTY) {
     *Npimage = 0;
     return (NULL);
@@ -27 +28 @@
   fseek (f, 0, SEEK_SET);
 
-  /* read header */
-  if (!fits_load_header (f, &header)) {
+  if (!dvo_image_load (db, TRUE)) {
     Shutdown ("can't read image catalog %s", ImageCat);
   }
+  timage = fits_table_get_Image (&db.ftable, &Ntimage);
+  /* timage represents the complete image table */
 
-  fits_scan (&header, "ZERO_PT", "%lf", 1, &zeropt);
+  fits_scan (&db[0].header, "ZERO_PT", "%lf", 1, &zeropt);
   if (fabs (ZeroPt - zeropt) > 1e-4) {
     Shutdown ("zero point in image (%f:%s) inconsistent with zero point in catalog (%f)",
@@ -70 +72 @@
   }
   
-  /* advance to data segment */ 
-  fseek (f, header.size, SEEK_SET); 
-
-  Nimage = 0;
-  fits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
-  /* check that file size makes sense */
-  if (stat (ImageCat, &filestatus) == -1) {
-    Shutdown ("failed to get status of image catalog");
-  }
-  size = Nimage*sizeof(Image) + header.size;
-  if (size != filestatus.st_size) {
-    int Ndata;
-
-    Ndata = (filestatus.st_size - header.size) / sizeof (Image);
-    fprintf (stderr, "error: image catalog has inconsistent size\n");
-    fprintf (stderr, "header: %d images, data: %d images\n", Nimage, Ndata);
-    if (!FORCE_READ) Shutdown ("refuse to read image table");
-
-    Nimage = MIN (Nimage, Ndata);
-    fprintf (stderr, "using %d images\n", Nimage);
-  } 
-
-  /* kind of dangerous, see note below */
-  NTIMAGE = MAX (MIN (Nimage, 1000), 1);
-  ALLOCATE (timage, Image, NTIMAGE);
-
+  /* pimage represents the subset of overlapping images */
   npimage = 0;
   NPIMAGE = 20;
   ALLOCATE (pimage, Image, NPIMAGE);
 
-  /* run through image table, reading images in blocks */
-  for (Ntimage = 0; Ntimage < Nimage; Ntimage += ntimage) {
-    ntimage = Fread (timage, sizeof(Image), NTIMAGE, f, "image");
-    if (ntimage == 0) Shutdown ("expected %d images, only found %d", Nimage, Ntimage);
-    BuildChipMatch (timage, ntimage);
+  /* setup links for mosaic WRP and DIS entries */
+  BuildChipMatch (timage, Ntimage);
 
-    for (i = 0; i < ntimage; i++) {
+  /* run through image table and search for overlaps */
+  for (i = 0; i < Ntimage; i++) {
 
-      /* if any of these images are WRP images, need to find matching DIS */
-      if (!FindMosaicForImage (timage, ntimage, i)) continue;
+    /* if any of these images are WRP images, need to find matching DIS */
+    if (!FindMosaicForImage (timage, Ntimage, i)) continue;
 
-      addtolist = FALSE;
-      /* define image corners */
-      Xi[0] = 0;            Yi[0] = 0;
-      Xi[1] = timage[i].NX; Yi[1] = 0;
-      Xi[2] = timage[i].NX; Yi[2] = timage[i].NY;
-      Xi[3] = 0;            Yi[3] = timage[i].NY;
-      Xi[4] = 0;            Yi[4] = 0;  /* so we can make a loop easily */
-      /* transform to tcoords */
-      for (j = 0; j < 5; j++) {
-        XY_to_RD (&r, &d, Xi[j], Yi[j], &timage[i].coords);
-        RD_to_XY (&Xi[j], &Yi[j], r, d, &tcoords);
+    addtolist = FALSE;
+    /* define image corners */
+    Xi[0] = 0;            Yi[0] = 0;
+    Xi[1] = timage[i].NX; Yi[1] = 0;
+    Xi[2] = timage[i].NX; Yi[2] = timage[i].NY;
+    Xi[3] = 0;            Yi[3] = timage[i].NY;
+    Xi[4] = 0;            Yi[4] = 0;  /* so we can make a loop easily */
+    /* transform to tcoords */
+    for (j = 0; j < 5; j++) {
+      XY_to_RD (&r, &d, Xi[j], Yi[j], &timage[i].coords);
+      RD_to_XY (&Xi[j], &Yi[j], r, d, &tcoords);
+    }
+    /* check if any edges cross */
+    /* not every robust - images must be close in size */
+    for (j = 0; (j < 4) && !addtolist; j++) {
+      for (k = 0; (k < 4) && !addtolist; k++) {
+        addtolist |= edge_check (&Xi[j], &Yi[j], &Xo[k], &Yo[k]);
       }
-      /* check if any edges cross */
-      /* not every robust - images must be close in size */
-      for (j = 0; (j < 4) && !addtolist; j++) {
-        for (k = 0; (k < 4) && !addtolist; k++) {
-          addtolist |= edge_check (&Xi[j], &Yi[j], &Xo[k], &Yo[k]);
-        }
-      }
-      if (addtolist) {
-        pimage[npimage] = timage[i];
-        npimage ++;
-        if (npimage == NPIMAGE) {
-          NPIMAGE += 20;
-          REALLOCATE (pimage, Image, NPIMAGE);
-        }
+    }
+    if (addtolist) {
+      pimage[npimage] = timage[i];
+      npimage ++;
+      if (npimage == NPIMAGE) {
+        NPIMAGE += 20;
+        REALLOCATE (pimage, Image, NPIMAGE);
       }
     }
@@ -147 +121 @@
   *Npimage = npimage;
   return (pimage);
-
 }
   
@@ -158 +131 @@
 
    we are not adding the matching DIS image to the table.
+
+   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

@@ -4 +4 @@
 
 /* file-pointer to Image.db table. if image db does not yet exist */
-static FILE *f = (FILE *) NULL;
-static int dbstate = LCK_UNLOCK;
+static FITS_DB db;
 
-FILE *GetDB (int *state) {
-  *state = dbstate;
-  return (f);
+FITS_DB *GetDB () {
+  return (&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)) {
+    fprintf (stderr, "ERROR: can't lock image catalog\n");
+    exit (1);
+  }
+}
+
+void unlock_image_db (Image *image) {
+
+  mode_t mode;
+
+  /* protect wimage from interrupt signals */
+  if (MODE == M_IMAGE) {
+    SetProtect (TRUE);
+    wimage (image); 
+    SetProtect (FALSE);
+  }
+
+  fits_db_close (&db);
+
+  /* force permissions to 666 */
+  mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
+  chmod (ImageCat, mode);
 }
 
@@ -27 +57 @@
 
   SetProtect (TRUE);
-  fclearlockfile (ImageCat, f, LOCK, &dbstate);
+  fits_db_close (&db);
   fprintf (stderr, "ERROR: addstar halted\n");
   exit (1);
 }
-
-void lock_image_db () {
-  /* lock the image catalog */
-  check_permissions (ImageCat);
-  f = fsetlockfile (ImageCat, 3600.0, LOCK, &dbstate);
-  if (f == NULL) {
-    fprintf (stderr, "ERROR: can't lock image catalog\n");
-    exit (1);
-  }
-  fseek (f, 0, SEEK_SET);
-}
-
-void unlock_image_db (Image *image) {
-
-  mode_t mode;
-
-  /* protect wimage from interrupt signals */
-  if (MODE == M_IMAGE) {
-    SetProtect (TRUE);
-    wimage (image); 
-    SetProtect (FALSE);
-  }
-
-  fclearlockfile (ImageCat, f, LOCK, &dbstate);
-  mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
-  chmod (ImageCat, mode);
-}

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

@@ -1 +1 @@
 # include "addstar.h"
 
-/* add image to image db */
+/* add 1 image to image db */
 void wimage (Image *image) {
   
@@ -8 +8 @@
   Header header;
 
-  f = GetDB (&dbstate);
+  db = GetDB ();
   fseek (f, 0, SEEK_SET);