Changeset 4864 for trunk/Ohana/src/relphot

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/relphot

Files:

• Makefile (modified) (1 diff)
• include/relphot.h (modified) (4 diffs)
• src/MosaicOps.c (modified) (1 diff)
• src/SetSignals.c (added)
• src/Shutdown.c (added)
• src/check_permissions.c (added)
• src/find_images.c (modified) (4 diffs)
• src/image-db.c (added)
• src/load_images.c (modified) (2 diffs)
• src/relphot.c (modified) (2 diffs)
• src/wimages.c (added)

trunk/Ohana/src/relphot/Makefile

@@ -42 +42 @@
 $(SRC)/misc.$(ARCH).o            \
 $(SRC)/reload_catalogs.$(ARCH).o \
+$(SRC)/image-db.$(ARCH).o \
 $(SRC)/free_catalogs.$(ARCH).o   \
+$(SRC)/check_permissions.$(ARCH).o   \
 $(SRC)/setMrelFinal.$(ARCH).o    \
 $(SRC)/write_coords.$(ARCH).o    \
 $(SRC)/setExclusions.$(ARCH).o   \
+$(SRC)/Shutdown.$(ARCH).o        \
+$(SRC)/SetSignals.$(ARCH).o      \
 $(SRC)/wcatalog.$(ARCH).o
 

trunk/Ohana/src/relphot/include/relphot.h

@@ -1 +1 @@
 # include <ohana.h>
 # include <dvo.h>
+# include <signal.h>
 
 /* # define GRID_V1 */
@@ -118 +119 @@
 void          findImages          PROTO((Catalog *catalog, int Ncatalog));
 int           findMosaics         PROTO((Catalog *catalog, int Ncatalog));
-Image        *find_images         PROTO((GSCRegion *region, int Nregion, int *Nimages, int **LineNum));
+Image        *find_images         PROTO((FITS_DB *db, GSCRegion *region, int Nregion, int *Nimage, int **LineNum));
+void set_db (FITS_DB *in);
+int Shutdown (char *format, ...);
+void TrapSignal (int sig);
+void SetProtect (int mode);
+int SetSignals ();
+
 GSCRegion    *find_regions        PROTO((Image *image, int Nimage, int *Nregions, GSCRegion *fullregion));
 void          freeGridBins        PROTO((int Ncatalog));
@@ -147 +154 @@
 int           liststats           PROTO((double *value, double *dvalue, int N, StatType *stats));
 Catalog      *load_catalogs       PROTO((GSCRegion *region, int Nregion, GSCRegion *fullregion));
-GSCRegion    *load_images         PROTO((char *seed, int *nregion, GSCRegion *fullregion));
+GSCRegion    *load_images         PROTO((FITS_DB *db, char *seed, int *nregion, GSCRegion *fullregion));
+
+void check_permissions (char *basefile);
+void lock_image_db (FITS_DB *db, char *filename);
+void unlock_image_db (FITS_DB *db);
+void create_image_db (FITS_DB *db);
+
 int           main                PROTO((int argc, char **argv));
 void          mark_images         PROTO((Image *image, int Nimage, Image *timage, int Ntimage));
@@ -167 +180 @@
 int           setExclusions       PROTO((Catalog *catalog, int Ncatalog));
 void          setMcal             PROTO((Catalog *catalog, int Poor));
-void          setMcalFinal        PROTO((Image *image, int Nimage));
+void          setMcalFinal        PROTO(());
 int           setMcalOutput       PROTO((Catalog *catalog, int Ncatalog));
 void          setMgrid            PROTO((Catalog *catalog));

trunk/Ohana/src/relphot/src/MosaicOps.c

@@ -167 +167 @@
 }
 
-void setMcalFinal (Image *image, int Nimage) {
-
-  int i, j, im;
+void setMcalFinal () {
+
+  int i, j, im, Nimage;
+  Image *image;
 
   if (!MOSAICNAME[0]) return;
+
+  image = getimages (&Nimage);
 
   for (i = 0; i < Nmosaic; i++) {

trunk/Ohana/src/relphot/src/find_images.c

@@ -7 +7 @@
    images */
 
-Image *find_images (GSCRegion *region, int Nregion, int *Nimages, int **LineNum) {
-  
-  Header header;
+Image *find_images (FITS_DB *db, GSCRegion *region, int Nregion, int *Nimage, int **LineNum) {
+  
   Image *timage, *image;
-  int i, j, k, m, found, nimage, Nimage, NIMAGE;
-  int status, InRange, ecode;
-  FILE *f;
+  int i, j, k, m, found, nimage, Ntimage, NIMAGE;
+  int InRange, ecode;
   double Xc[5], Yc[5], Xi[5], Yi[5], r, d, dx, dy;
   int *line_number;
@@ -29 +27 @@
   strcpy (tcoords.ctype, "RA---TAN");
 
-  /* check if image datafile exists, get header, number of images */
-  if (!fits_read_header (ImageCat, &header)) {
-    fprintf (stderr, "ERROR: No images in catalog %s (1)\n", ImageCat);
-    exit (0);
-  }
-  Nimage = 0;
-  fits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
-  if (Nimage == 0) {
-    fprintf (stderr, "ERROR: No images in catalog %s (1)\n", ImageCat);
-    exit (0);
-  }
-
-  /* get ready to read data on images */ 
-  f = fopen (ImageCat, "r");
-  if (f == (FILE *) NULL) {
-    fprintf (stderr, "ERROR: trouble opening Image catalog: %s (2)\n", ImageCat);
-    exit (0);
-  }
-  fseek (f, header.size, SEEK_SET); 
-
-  /* load all images */
-  ALLOCATE (timage, Image, Nimage);
-  status = Fread (timage, sizeof(Image), Nimage, f, "image");
-  if (status != Nimage) {
-    fprintf (stderr, "ERROR: couldn't read images from image catalog: %s\n", ImageCat);
-    exit (0);
-  }
+  timage = fits_table_get_Image (&db[0].ftable, &Ntimage, &db[0].swapped);
 
   nimage = 0;
@@ -62 +34 @@
   ALLOCATE (line_number, int, NIMAGE);
   
-  for (i = 0; i < Nimage; i++) {
+  for (i = 0; i < Ntimage; i++) {
       
     /* select images by photcode */
@@ -153 +125 @@
   REALLOCATE (line_number, int, MAX (nimage, 1));
 
-  free (timage);
-  *Nimages = nimage;
+  *Nimage  = nimage;
   *LineNum = line_number;
-  fclose (f);
   return (image);
 }

trunk/Ohana/src/relphot/src/load_images.c

@@ -1 +1 @@
 # include "relphot.h"
 
-static int   Nimage;
-static int   *Line;
-static Image *image;
-
-GSCRegion *load_images (char *seed, int *nregion, GSCRegion *fullregion) {
+GSCRegion *load_images (FITS_DB *db, char *seed, int *nregion, GSCRegion *fullregion) {
 
   GSCRegion *region;
-  int       Nregion, Ntimage;
-  Image     *timage;
+  int        Nregion;
+  Image     *image;
+  int       *Line;
+  int        Nimage;
+
+  if (db[0].dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db[0].filename);
+
+  /* read entire db table */
+  if (!dvo_image_load (db, VERBOSE, FALSE)) Shutdown ("can't read image catalog %s", db[0].filename);
 
   region = name_region (seed, &Nregion);
 
   /* find images which supplied all measurements */
-  timage = find_images (region, Nregion, &Ntimage, &Line);
+  image = find_images (db, region, Nregion, &Nimage, &Line);
   free (Line);
 
   /* find all region files which touch images */
-  region = find_regions (timage, Ntimage, &Nregion, fullregion);
-  free (timage);
+  region = find_regions (image, Nimage, &Nregion, fullregion);
+  free (image);
 
   /* find images which supplied all measurements for all regions */
-  image = find_images (region, Nregion, &Nimage, &Line);
+  image = find_images (db, region, Nregion, &Nimage, &Line);
   getfullregion (image, Nimage, fullregion);
+
+  fits_vtable_from_ftable (&db[0].ftable, &db[0].vtable, Line, Nimage);
 
   initImages (image, Nimage);
@@ -30 +35 @@
   *nregion = Nregion;
   return (region);
-
 }
-
-void wimages () {
-  
-  int i, status, mode;
-  FILE *f;
-  Header header;
-
-  setMcalFinal (image, Nimage);
-
-  if (!fits_read_header (ImageCat, &header)) {
-    fprintf (stderr, "ERROR: can't find %s\n", ImageCat);
-    exit (0);
-  }
-  
-  f = fopen (ImageCat, "r+");
-  if (f == NULL) {
-    fprintf (stderr, "ERROR: can't open image catalog file to append: %s\n", ImageCat);
-    exit (0);
-  }
-  mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
-  chmod (ImageCat, mode);
-
-  if (VERBOSE) fprintf (stderr, "writing out %d images\n", Nimage);
-  for (i = 0; i < Nimage; i++) {
-    fseek (f, header.size + Line[i]*sizeof(Image), SEEK_SET);
-    status = Fwrite (&image[i], sizeof(Image), 1, f, "image");
-    if (status != 1) {
-      fprintf (stderr, "ERROR: failure writing image data to catalog %s\n", ImageCat);
-      exit (0);
-    }
-  }
-
-  fclose (f);
-}

trunk/Ohana/src/relphot/src/relphot.c

@@ -7 +7 @@
   Catalog *catalog;
   GSCRegion fullregion, *region;
+  FITS_DB db;
 
   /* get configuration info, args */
   initialize (argc, argv);
 
+  set_db (&db);
+  lock_image_db (&db, ImageCat);
+
   /* load regions and images based on seed region */
-  region = load_images (argv[1], &Ncatalog, &fullregion);
+  region = load_images (&db, argv[1], &Ncatalog, &fullregion);
 
   /* load catalog data from region files */
@@ -79 +83 @@
   /* load catalog data from region files, update Mrel include all data */
   reload_catalogs (region, Ncatalog, &fullregion);
-  wimages (); 
+  setMcalFinal ();
+  dvo_image_update (&db, VERBOSE);
+  unlock_image_db (&db); 
+
   exit (0);
 }