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

Timestamp:

Sep 12, 2014, 9:24:36 AM (12 years ago)

Author:

eugene

Message:

adding stellar params; associating image maps

File:

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

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

@@ -107 +107 @@
   ALLOCATE (table->map, AstromOffsetMap, Nmap);
 
-  // find the max value of ID
+  // find the max value of imageID
   int MaxID = 0;
   for (i = 0; i < Nmap; i++) {
-    MaxID = MAX(map_disk[i].ID, MaxID);
+    MaxID = MAX(map_disk[i].imageID, MaxID);
   }
   MaxID ++; // we want the outer bound, not the last value
@@ -119 +119 @@
     table->IDtoSeq[i] = -1;
   }
-  table->MaxID = MaxID;
+  table->MaxID = MaxID - 1;
 
   // assign the ID values
   for (i = 0; i < Nmap; i++) {
-    int ID = map_disk[i].ID;
-    myAssert (table->IDtoSeq[ID] == -1, "oops, duplicate map IDs");
+    int ID = map_disk[i].imageID;
+    myAssert (table->IDtoSeq[ID] == -1, "oops, duplicate image IDs");
     table->IDtoSeq[ID] = i;
   }
@@ -162 +162 @@
 
   AstromOffsetMap_Disk_6x6 *map_disk = NULL;
-  ALLOCATE (map_disk, AstromOffsetMap_Disk_6x6, Nmap);
+  ALLOCATE (map_disk, AstromOffsetMap_Disk_6x6, table->Nmap);
 
   // assign the map values (this allocates just the area needed for each image, not the