Changeset 37807 for trunk/Ohana/src/photdbc/src/copy_images.c

Timestamp:

Jan 11, 2015, 2:14:39 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140904

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/photdbc/src/copy_images.c (modified) (2 diffs)

trunk/Ohana/src/photdbc/src/copy_images.c

@@ -52 +52 @@
   }
 
+  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);
+  AstromOffsetTable *table_src = AstromOffsetMapLoad (mapfile, VERBOSE);
+
+  // assign images.coords.offsetMap -> table->map[i]
+  if (table_src) {
+    AstromOffsetTableMatchChips (image, Nimage, table_src);
+  }
+
   subset = select_images (skylist, image, Nimage, &LineNumber, &Nsubset, FALSE);
+
+  if (table_src) {
+    AstromOffsetTable *table_tgt = AstromOffsetTableInit ();
+    
+    off_t i;
+    for (i = 0; i < Nsubset; i++) {
+      if (!subset[i].coords.offsetMap) continue;
+      if (subset[i].coords.Npolyterms != -1) continue; // assert on this?
+      AstromOffsetTableAddMapFromImage (table_tgt, &subset[i]);
+    }
+    snprintf (mapfile, DVO_MAX_PATH, "%s/AstroMap.fits", outdir);
+    AstromOffsetMapSave (table_tgt, mapfile);
+    free (table_tgt->imageIDtoTableSeq);
+    free (table_tgt->map);
+    free (table_tgt);
+  }
 
   dvo_image_addrows (&out, subset, Nsubset);
@@ -73 +101 @@
   SavePhotcodesFITS (filename);
 
+  // free the astrom offset tables
+  AstromOffsetTableFree (table_src);
+
   return (TRUE);
 }