Changeset 37572

Timestamp:

Nov 9, 2014, 8:25:06 AM (12 years ago)

Author:

eugene

Message:

moved BuildChipMatch into LoadImagesDVO, and added the loading of the astrom offset table

Location:

branches/eam_branches/ipp-20140904/Ohana/src/libdvo

Files:

• include/libdvo_astro.h (modified) (1 diff)
• src/AstromOffsetMapUtils.c (modified) (1 diff)
• src/LoadImages.c (modified) (4 diffs)

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/include/libdvo_astro.h

@@ -172 +172 @@
 int AstromOffsetTableMatchChips (Image *images, off_t Nimages, AstromOffsetTable *table);
 AstromOffsetTable *AstromOffsetTableInit();
+void AstromOffsetTableFree(AstromOffsetTable *table);
 
 # endif

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/AstromOffsetMapUtils.c

@@ -69 +69 @@
 }
 
+void AstromOffsetTableFree (AstromOffsetTable *table) {
+
+  if (!table) return;
+
+  int i, j;
+  for (i = 0; i < table->Nmap; i++) {
+    for (j = 0; j < table->map[i][0].Nx; j++) {
+      free (table->map[i][0].dXv);
+      free (table->map[i][0].dYv);
+    }
+    free (table->map[i]);
+    free (table->map[i][0].dXv[j]);
+    free (table->map[i][0].dYv[j]);
+  }
+  free (table->IDtoSeq);
+  free (table->map);
+}
+
 int AstromOffsetTableNewMap (AstromOffsetTable *table, int order, Image *image) {
 

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/LoadImages.c

@@ -9 +9 @@
 static Image *imageCache = NULL;
 static off_t cacheNimage = 0;
+AstromOffsetTable *table = NULL;
 
 static time_t getLastModified(char *filename);
@@ -39 +40 @@
     lastModified = 0;
   }
-
 
   gfits_db_init (&db);
@@ -77 +77 @@
   }
 
+  // assign image->parent and image->coords.mosaic 
+  BuildChipMatch (image, *Nimage);
+  // MARKTIME("build chip match: %f sec\n", dtime);
+
+  char mapfile[DVO_MAX_PATH];
+  snprintf (mapfile, DVO_MAX_PATH, "%s/AstroMap.fits", catdir);
+
+  if (table) AstromOffsetTableFree(table);
+  table = AstromOffsetMapLoad (mapfile, FALSE);
+
+  // assign images.coords.offsetMap -> table->map[i]
+  if (table) {
+    AstromOffsetTableMatchChips (image, *Nimage, table);
+  }
+
   return (image);
 }
@@ -92 +107 @@
   if (!dvoUseImageCache && (images != NULL)) {
     free(images);
+    AstromOffsetTableFree (table);
   } else {
     // defer free until next LoadImages with a different or modified Images.dat