Changeset 35736

Timestamp:

Jul 2, 2013, 11:01:06 AM (13 years ago)

Author:

eugene

Message:

pass projID with boundary tree

Location:

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

Files:

• include/dvo.h (modified) (1 diff)
• src/BoundaryTree.c (modified) (3 diffs)

branches/eam_branches/ipp-20130509/Ohana/src/libdvo/include/dvo.h

@@ -329 +329 @@
   double  **dec; // DEC of projection cell center
   int    **cell; // zone,band -> proj cell sequence
+  int    **projID; // zone,band -> proj cell ID
   char  ***name; // projection cell name
   

branches/eam_branches/ipp-20130509/Ohana/src/libdvo/src/BoundaryTree.c

@@ -84 +84 @@
     ALLOCATE (tree->dY,      int *, tree->Nzone);
     ALLOCATE (tree->cell,    int *, tree->Nzone);
+    ALLOCATE (tree->projID,  int *, tree->Nzone);
     ALLOCATE (tree->name,  char **, tree->Nzone);
     for (i = 0; i < tree->Nzone; i++) {
@@ -93 +94 @@
       ALLOCATE (tree->dY[i],      int, tree->Nband[i]);
       ALLOCATE (tree->cell[i],    int, tree->Nband[i]);
+      ALLOCATE (tree->projID[i],  int, tree->Nband[i]);
       ALLOCATE (tree->name[i], char *, tree->Nband[i]);
       for (j = 0; j < tree->Nband[i]; j++) {
@@ -136 +138 @@
       memcpy(tree->name[nz][nb], &name[i*BOUNDARY_TREE_NAME_LENGTH], BOUNDARY_TREE_NAME_LENGTH);
       // XXX parse out the ID from the name (skycell.NNNN)
-      tree->projID[nz][nb] = atoi(&tree->name[nz][nb][9]);
+      tree->projID[nz][nb] = atoi(&tree->name[nz][nb][8]);
     }