Changeset 40583 for trunk

Timestamp:

Dec 12, 2018, 11:09:18 AM (8 years ago)

Author:

eugene

Message:

add elements to get skycellID from tess table for some tessellations

Location:

trunk/Ohana/src/libdvo

Files:

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

trunk/Ohana/src/libdvo/include/dvo.h

@@ -442 +442 @@
   int    **cell; // zone,band -> proj cell sequence
   int    **projID; // zone,band -> proj cell ID
+  int    **skycellID; // zone,band -> starting skycell ID
   char  ***name; // projection cell name
   

trunk/Ohana/src/libdvo/src/BoundaryTree.c

@@ -27 +27 @@
     FREE (tree->cell[i]);
     FREE (tree->projID[i]);
+    FREE (tree->skycellID[i]);
     FREE (tree->name[i]);
   }
@@ -38 +39 @@
   FREE (tree->cell);
   FREE (tree->projID);
+  FREE (tree->skycellID);
   FREE (tree->name);
 
@@ -155 +157 @@
   ALLOCATE (tree->cell,    int *, tree->Nzone);
   ALLOCATE (tree->projID,  int *, tree->Nzone);
+  ALLOCATE (tree->skycellID,  int *, tree->Nzone);
   ALLOCATE (tree->name,  char **, tree->Nzone);
   for (i = 0; i < tree->Nzone; i++) {
@@ -165 +168 @@
     ALLOCATE (tree->cell[i],    int, tree->Nband[i]);
     ALLOCATE (tree->projID[i],  int, tree->Nband[i]);
+    ALLOCATE (tree->skycellID[i],  int, tree->Nband[i]);
     ALLOCATE (tree->name[i], char *, tree->Nband[i]);
     for (j = 0; j < tree->Nband[i]; j++) {
@@ -208 +212 @@
     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][8]);
+    char *endptr = NULL;
+    tree->projID[nz][nb] = strtol(&tree->name[nz][nb][8], &endptr, 10);
+    if (endptr[0] == '.') {
+      // we have elements after the projID, which should be the skycell ID
+      endptr ++;
+      tree->skycellID[nz][nb] = strtol(endptr, NULL, 10);
+    } else {
+      tree->skycellID[nz][nb] = -1;
+    }
   }
 

trunk/Ohana/src/libdvo/src/TessellationTable.c

@@ -579 +579 @@
     *tessID = myTess;
     *projID = tess[myTess].tree->projID[zone][band];
-    *skycellID = N;
+    if (tess[myTess].tree->skycellID[zone][band] == -1) {
+      *skycellID = N;
+    } else {
+      *skycellID = tess[myTess].tree->skycellID[zone][band] + N;
+    }      
 
     return TRUE;