Changeset 31468

Timestamp:

May 6, 2011, 11:13:57 AM (15 years ago)

Author:

eugene

Message:

enable SKIP_MEAS for getstar; add image table dump to relphot

Location:

branches/eam_branches/ipp-20110505/Ohana/src

Files:

• getstar/src/getstar.c (modified) (2 diffs)
• libdvo/include/dvo.h (modified) (1 diff)
• libdvo/src/dvo_catalog_split.c (modified) (2 diffs)
• libfits/table/F_copy_T.c (added)
• relphot/src/relphot.c (modified) (1 diff)

branches/eam_branches/ipp-20110505/Ohana/src/getstar/src/getstar.c

@@ -64 +64 @@
         catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
         catalog.catflags = LOAD_AVES | LOAD_SECF;
-        if (needMeas) {
-            catalog.catflags |= LOAD_MEAS;
-        }
+        catalog.catflags |= needMeas ? LOAD_MEAS : SKIP_MEAS;
 
         // an error exit status here is a significant error
@@ -98 +96 @@
         catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
         catalog.catflags = LOAD_AVES | LOAD_SECF;
-        if (needMeas) {
-            catalog.catflags |= LOAD_MEAS;
-        }
+        catalog.catflags |= needMeas ? LOAD_MEAS : SKIP_MEAS;
 
         // an error exit status here is a significant error

branches/eam_branches/ipp-20110505/Ohana/src/libdvo/include/dvo.h

@@ -75 +75 @@
 # define LOAD_MISS      0x04
 # define LOAD_SECF      0x08 
-# define LOAD_MEAS_META 0x10
+# define SKIP_AVES      0x10
+# define SKIP_MEAS      0x20
+# define SKIP_MISS      0x40
+# define SKIP_SECF      0x80
+
+// # define LOAD_MEAS_META 0x100 -- is this used??
 
 /* photometry code types */

branches/eam_branches/ipp-20110505/Ohana/src/libdvo/src/dvo_catalog_split.c

@@ -239 +239 @@
 
   /*** Measure Table ***/
-  status = dvo_catalog_open_subcat (catalog, &catalog[0].measure_catalog, ftable.header, "MEASURE", VERBOSE);
-  if (status == DVO_CAT_OPEN_FAIL) {
-    return (FALSE);
-  }
-  if ((status == DVO_CAT_OPEN_EMPTY) && (catalog[0].Nmeas_disk > 0)) {
-    return (FALSE);
+  if (!(catalog[0].catflags & SKIP_MEAS)) {
+    // unless we specify 'skip', we still need to load the 
+    status = dvo_catalog_open_subcat (catalog, &catalog[0].measure_catalog, ftable.header, "MEASURE", VERBOSE);
+    if (status == DVO_CAT_OPEN_FAIL) {
+      return (FALSE);
+    }
+    if ((status == DVO_CAT_OPEN_EMPTY) && (catalog[0].Nmeas_disk > 0)) {
+      return (FALSE);
+    }
   }
   if ((status != DVO_CAT_OPEN_EMPTY) && (catalog[0].catflags & LOAD_MEAS)) {
@@ -262 +265 @@
   } else {
     // XXX is it necessary to generate a template header here?
+    // XXX this is a memory leak, right?
+    if (catalog[0].measure_catalog) {
+      gfits_free_header (&catalog[0].measure_catalog[0].header);
+    } else {
+      ALLOCATE (catalog[0].measure_catalog, Catalog, 1);
+      dvo_catalog_init (catalog[0].measure_catalog, TRUE);
+    }
     gfits_create_header (&catalog[0].measure_catalog[0].header);
     ALLOCATE (catalog[0].measure, Measure, 1);

branches/eam_branches/ipp-20110505/Ohana/src/relphot/src/relphot.c

@@ -147 +147 @@
   }
   
+  if (SOMETHING) {
+    FITS_DB dbX;
+    dbX.lockstate = LCK_XCLD;
+    dbX.timeout   = 60.0;
+    gfits_db_init (&dbX);
+    char filename[1024];
+    snprintf (filename, 1024, "%s.bck", ImageCat);
+    if (!gfits_db_lock (dbX, filename)) {
+      fprintf (stderr, "can't lock backup image image catalog\n");
+      return (FALSE);
+    }
+    
+    // copy header
+    gfits_copy_header (dbX.header, db.header);
+    gfits_copy_header (dbX.theader, db.theader);
+    gfits_copy_matrix (dbX.matrix, db.matrix);
+    gfits_copy_table (dbX.matrix, db.matrix);
+
+    // copy Images.dat to another structure
+    dvo_image_update (&db, VERBOSE);
+    dvo_image_unlock (&db); 
+  }
+
   if (USE_GRID) dump_grid ();
   if (!UPDATE) exit (0);