Changeset 10506

Timestamp:

Dec 6, 2006, 12:44:09 PM (20 years ago)

Author:

eugene

Message:

fixed the database update of images

Location:

trunk/Ohana/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/StarOps.c (modified) (1 diff)
• src/load_images.c (modified) (1 diff)
• src/relphot.c (modified) (1 diff)
• src/setMrelFinal.c (modified) (1 diff)

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

@@ -181 +181 @@
 void          plot_stars          PROTO((Catalog *catalog, int Ncatalog));
 void          reload_catalogs     PROTO((SkyList *skylist));
+int           reload_images       PROTO((FITS_DB *db));
 int           setExclusions       PROTO((Catalog *catalog, int Ncatalog));
 void          setMcal             PROTO((Catalog *catalog, int Poor));

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

@@ -349 +349 @@
   }
   initstats (STATMODE);
-  fprintf (stderr, "%d measures marked poor, %d total\n", Ndel, Nave);
+  if (VERBOSE) fprintf (stderr, "%d measures marked poor, %d total\n", Ndel, Nave);
   free (ilist);
   free (tlist);

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

@@ -36 +36 @@
   return (skylist);
 }
+
+int reload_images (FITS_DB *db) {
+
+  Image     *image;
+  int        Nimage, Nx, i;
+  VTable    *vtable;
+
+  image = getimages (&Nimage);
+
+  vtable = &db[0].vtable;
+
+  gfits_scan (vtable[0].header, "NAXIS1", "%d", 1, &Nx);
+  for (i = 0; i < Nimage; i++) {
+    memcpy (vtable[0].buffer[i], &image[i], Nx);
+  }
+  return (TRUE);
+}

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

@@ -108 +108 @@
   reload_catalogs (skylist);
   setMcalFinal ();
+
+  reload_images (&db);
+  
   dvo_image_update (&db, VERBOSE);
   dvo_image_unlock (&db); 

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

@@ -138 +138 @@
     }
   }
-  fprintf (stderr, "pass %d, Ntot: %d, Ntry: %d, Nskip: %d, Nkeep: %d\n",
-           pass, Ntot, Ntry, Nskip, Nkeep);
+  if (VERBOSE) fprintf (stderr, "pass %d, Ntot: %d, Ntry: %d, Nskip: %d, Nkeep: %d\n",
+                        pass, Ntot, Ntry, Nskip, Nkeep);
 }