Changeset 13645

Timestamp:

Jun 5, 2007, 10:19:11 AM (19 years ago)

Author:

eugene

Message:

fixed error with non-unique skycell names

File:

• trunk/Ohana/src/addstar/src/sky_tessalation.c (modified) (8 diffs)

trunk/Ohana/src/addstar/src/sky_tessalation.c

@@ -25 +25 @@
 int sky_tessalation_triangles (FITS_DB *db, int level, int Nmax) {
 
-  int i, j, Ndigit, Ntriangles, Nbase, Ntotal, Ltop, Nimages;
+  int i, j, Ndigit, Ntriangles, Nbase, Ntotal, Ltop, Nout, Nimages;
   double Ntop, fLtop;
   SkyTriangle *base, *tri, *new;
@@ -60 +60 @@
 
   // for each base triangle, subdivide the rest of the way and save
+  Nout = 0;
   for (i = 0; i < Nbase; i++) {
     ALLOCATE (tri, SkyTriangle, 1);
@@ -74 +75 @@
     for (j = 0; j < Ntriangles; j++) {
       sky_triangle_to_image (&image[j], &tri[j]);
-      snprintf (image[j].name, 32, format, j);
+      snprintf (image[j].name, 32, format, Nout);
+      Nout++;
     }  
     Nimages = Ntriangles;
@@ -93 +95 @@
 int sky_tessalation_squares (FITS_DB *db, int level, int Nmax) {
 
-  int i, j, Ndigit, Ntriangles, Nbase, Ntotal, Ntop, Ltop, Nout, Nx, Ny;
+  int i, j, Nname, Ndigit, Ntriangles, Nbase, Ntotal, Ntop, Ltop, Nout, Nx, Ny;
   double fLtop;
   SkyTriangle *base, *tri, *new;
@@ -131 +133 @@
 
   // for each base triangle, subdivide the rest of the way and save
+  Nname = 0;
   for (i = 0; i < Nbase; i++) {
     ALLOCATE (tri, SkyTriangle, 1);
@@ -152 +155 @@
       if (!strcmp(image[j].coords.ctype, "DROP")) continue;
       memcpy (&out[Nout], &image[j], sizeof(Image));
-      snprintf (out[Nout].name, 32, format, j);
+      snprintf (out[Nout].name, 32, format, Nname);
+      Nname++;
       Nout++;
     }  
@@ -249 +253 @@
 int sky_subdivide_image (Image *output, Image *input, int Nx, int Ny) {
 
-  int i, j, N, NX, NY;
+  int i, j, N, NX, NY, Ndigit;
+  char format[24];
 
   NX = input[0].NX/(double)Nx + 0.5;
   NY = input[0].NY/(double)Ny + 0.5;
+
+  Ndigit = (int)(log10(Nx*Ny)) + 1 ;
+  snprintf (format, 24, "%s.%%0%dd", input[0].name, Ndigit);
 
   N = 0;
@@ -259 +267 @@
 
       memcpy (&output[N], &input[0], sizeof(Image));
+      snprintf (output[N].name, 32, format, N);
 
       // output[0].coords = input[0].coords;