Changeset 37001

Timestamp:

Jul 12, 2014, 8:38:19 AM (12 years ago)

Author:

eugene

Message:

free the found and foundWarp catalog elements (grows too large for whole sky); save a copy of the image table before running the reload step

Location:

branches/eam_branches/ipp-20140610/Ohana/src/relphot/src

Files:

• StarOps.c (modified) (3 diffs)
• relphot_parallel_regions.c (modified) (3 diffs)
• setMrelCatalog.c (modified) (2 diffs)
• setMrelFinal.c (modified) (2 diffs)

branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/StarOps.c

@@ -410 +410 @@
 
       /* star/photcodes already calibrated */
-      if ( isSetMrelFinal && catalog[Nc].found[Nsecfilt*j+Nsec]) continue;  
+      if ( isSetMrelFinal && catalog[Nc].found_t[Nsecfilt*j+Nsec]) continue;  
       
       // skip bad stars
@@ -683 +683 @@
 
       if (isSetMrelFinal) {
-        catalog[Nc].found[Nsecfilt*j+Nsec] = TRUE;
+        catalog[Nc].found_t[Nsecfilt*j+Nsec] = TRUE;
 
         catalog[Nc].secfilt[Nsecfilt*j+Nsec].Mstdev = 1000.0*stats.sigma; // Mstdev is in millimags (not enough space for more precision)
@@ -1073 +1073 @@
         
         /* on final processing, skip stars already measured */
-        if (final && catalog[i].found[Nsecfilt*j + Nsec]) continue;  
+        if (final && catalog[i].found_t[Nsecfilt*j + Nsec]) continue;  
 
         /* skip bad stars to prevent them from becoming good (on inner sample) */

branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/relphot_parallel_regions.c

@@ -1 +1 @@
 # include "relphot.h"
+int save_images_backup (FITS_DB *db);
 
 int relphot_parallel_regions () {
@@ -63 +64 @@
   SkyList *skylist = SkyListByBounds (sky, -1, regionHosts->Rmin, regionHosts->Rmax, regionHosts->Dmin, regionHosts->Dmax);
 
+  // I have to save a copy because dvo_image_save and _unlock swap and free the data
+  save_images_backup (&db);
+
   /* update catalogs (in parallel) */
   reload_catalogs (skylist, flatcorr, 0, NULL);
@@ -74 +78 @@
 }
 
+int save_images_backup (FITS_DB *db) {
+
+  FITS_DB dbX;
+  char filename[1024];
+
+  INITTIME;
+
+  gfits_db_init (&dbX);
+  dbX.lockstate = LCK_XCLD;
+  dbX.timeout   = 60.0;
+  dbX.mode      = db->mode;
+  dbX.format    = db->format;
+
+  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 Images.dat data (all or only the subset / vtable elements?)  I think I need to dump
+  // the entire Image table, but with the updates in place I think this says: re-work the
+  // ftable/vtable usage in this program to be more sensible...
+  gfits_copy_header (&db->header,  &dbX.header);
+  gfits_copy_matrix (&db->matrix,  &dbX.matrix);
+  gfits_copy_header (&db->theader, &dbX.theader);
+  gfits_copy_ftable (&db->ftable,  &dbX.ftable);
+
+  dbX.ftable.header = &dbX.theader;
+
+  dvo_image_save (&dbX, VERBOSE);
+  dvo_image_unlock (&dbX); 
+  MARKTIME("-- save Image.dat.bck: %f sec\n", dtime);
+
+  return TRUE;
+}

branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/setMrelCatalog.c

@@ -60 +60 @@
     Average *average = catalog[Nc].average ? &catalog[Nc].average[j] : NULL;
     Measure *measure = catalog[Nc].measure ? &catalog[Nc].measure[m] : NULL;
-    setMrelAverageExposure (m, Nc, pass, flatcorr, results, average, &catalog[Nc].averageT[j], &catalog[Nc].secfilt[j*Nsecfilt], measure, &catalog[Nc].measureT[m], &catalog[Nc].found[Nsecfilt*j]);
+    setMrelAverageExposure (m, Nc, pass, flatcorr, results, average, &catalog[Nc].averageT[j], &catalog[Nc].secfilt[j*Nsecfilt], measure, &catalog[Nc].measureT[m], &catalog[Nc].found_t[Nsecfilt*j]);
 
     // only apply Stack operation on setMrelFinal in first pass 
@@ -70 +70 @@
     // only measure force-warp mean values if issetMrelFinal (make it optional?)
     if (isSetMrelFinal) {
-      setMrelAverageForcedWarp (m, Nc, pass, results, &catalog[Nc].average[j], &catalog[Nc].secfilt[j*Nsecfilt], &catalog[Nc].measure[m], &catalog[Nc].foundWarp[Nsecfilt*j]);
+      setMrelAverageForcedWarp (m, Nc, pass, results, &catalog[Nc].average[j], &catalog[Nc].secfilt[j*Nsecfilt], &catalog[Nc].measure[m], &catalog[Nc].foundWarp_t[Nsecfilt*j]);
       setGlobalObjStats (&catalog[Nc].average[j], &catalog[Nc].measure[m]);
     }

branches/eam_branches/ipp-20140610/Ohana/src/relphot/src/setMrelFinal.c

@@ -85 +85 @@
 
   /* set catalog[0].found[i] = FALSE */
-  ALLOCATE (catalog[0].found, off_t, MAX (1, Nsecfilt*catalog[0].Naverage));
-  ALLOCATE (catalog[0].foundWarp, off_t, MAX (1, Nsecfilt*catalog[0].Naverage));
+  ALLOCATE (catalog[0].found_t, off_t, MAX (1, Nsecfilt*catalog[0].Naverage));
+  ALLOCATE (catalog[0].foundWarp_t, off_t, MAX (1, Nsecfilt*catalog[0].Naverage));
   for (i = 0; i < Nsecfilt*catalog[0].Naverage; i++) {
-    catalog[0].found[i] = FALSE;
-    catalog[0].foundWarp[i] = FALSE;
+    catalog[0].found_t[i] = FALSE;
+    catalog[0].foundWarp_t[i] = FALSE;
   }
 
@@ -196 +196 @@
       
       /* star/photcodes already calibrated */
-      if (catalog[0].found[Nsecfilt*i+Nsec]) continue;  
+      if (catalog[0].found_t[Nsecfilt*i+Nsec]) continue;  
 
       m = catalog[0].average[i].measureOffset;