Changeset 37683 for branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/AstromOffsetMapIO.c

Timestamp:

Nov 28, 2014, 7:02:01 AM (12 years ago)

Author:

eugene

Message:

add support to copy & save coords with offsetmaps

File:

• branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/AstromOffsetMapIO.c (modified) (2 diffs)

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

@@ -142 +142 @@
     table->map[i][0].dX           = map_disk[i].dY;
 
+    // since this was on disk, we obviously keep it
+    table->map[i][0].keep         = TRUE;
+
     ALLOCATE (table->map[i][0].dXv, float *, map_disk[i].Nx);
     ALLOCATE (table->map[i][0].dYv, float *, map_disk[i].Nx);
@@ -167 +170 @@
   // assign the map values (this allocates just the area needed for each image, not the
   // full 6x6, saving some memory while doing the analysis)
+  // some maps in the table should be skipped because their image no longer uses them
+  int Ndisk = 0;
   for (i = 0; i < table->Nmap; i++) {
-    map_disk[i].Nx       = table->map[i][0].Nx;
-    map_disk[i].Ny       = table->map[i][0].Ny;
-    map_disk[i].tableID  = table->map[i][0].tableID;
-    map_disk[i].imageID  = table->map[i][0].imageID;
+    if (!table->map[i][0].keep) continue;
+    map_disk[Ndisk].Nx      = table->map[i][0].Nx;
+    map_disk[Ndisk].Ny      = table->map[i][0].Ny;
+    map_disk[Ndisk].tableID = table->map[i][0].tableID;
+    map_disk[Ndisk].imageID = table->map[i][0].imageID;
     
-    map_disk[i].dX       = table->map[i][0].dX;
-    map_disk[i].dY       = table->map[i][0].dY;
+    map_disk[Ndisk].dX      = table->map[i][0].dX;
+    map_disk[Ndisk].dY      = table->map[i][0].dY;
 
-    for (j = 0; j < map_disk[i].Nx; j++) {
-      for (k = 0; k < map_disk[i].Ny; k++) {
-        map_disk[i].dXv[j][k] = table->map[i][0].dXv[j][k];
-        map_disk[i].dYv[j][k] = table->map[i][0].dYv[j][k];
+    for (j = 0; j < map_disk[Ndisk].Nx; j++) {
+      for (k = 0; k < map_disk[Ndisk].Ny; k++) {
+        map_disk[Ndisk].dXv[j][k] = table->map[i][0].dXv[j][k];
+        map_disk[Ndisk].dYv[j][k] = table->map[i][0].dYv[j][k];
       }
     }
+    Ndisk ++;
   }
-  *Nmap = table->Nmap;
+  *Nmap = Ndisk;
   return map_disk;
 }