Changeset 27312 for branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/MosaicOps.c

Timestamp:

Mar 17, 2010, 2:52:38 PM (16 years ago)

Author:

eugene

Message:

more largefile support mods -- code now builds

File:

• branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/MosaicOps.c (modified) (14 diffs)

branches/eam_branches/largefiles.20100314/Ohana/src/relphot/src/MosaicOps.c

@@ -8 +8 @@
 static off_t   **bin;    /* catalog, measure -> mosaic */
 
-static off_t   **clist;  /* mosaic -> catalog[] */
+static int     **clist;  /* mosaic -> catalog[] */
 static off_t   **mlist;  /* mosiac -> measure[] */
 static off_t    *Nlist;
@@ -26 +26 @@
   ALLOCATE (mosaic, Mosaic, NMOSAIC);
 
-  ALLOCATE (imlist, off_t *, NMOSAIC);
-  ALLOCATE (Nimlist, off_t, NMOSAIC);
-  ALLOCATE (NIMLIST, off_t, NMOSAIC);
+  ALLOCATE (imlist,  off_t *, NMOSAIC);
+  ALLOCATE (Nimlist, off_t,   NMOSAIC);
+  ALLOCATE (NIMLIST, off_t,   NMOSAIC);
 
   /* generate list of unique mosaics */
@@ -78 +78 @@
     if (Nmosaic == NMOSAIC) {
       NMOSAIC += 10;
-      REALLOCATE (mosaic, Mosaic, NMOSAIC);
-      REALLOCATE (imlist, off_t *, NMOSAIC);
-      REALLOCATE (Nimlist, off_t, NMOSAIC);
-      REALLOCATE (NIMLIST, off_t, NMOSAIC);
+      REALLOCATE (mosaic,  Mosaic,  NMOSAIC);
+      REALLOCATE (imlist,  off_t *, NMOSAIC);
+      REALLOCATE (Nimlist, off_t,   NMOSAIC);
+      REALLOCATE (NIMLIST, off_t,   NMOSAIC);
     }
   }
@@ -201 +201 @@
 
   /* mosaic -> measure */
-  ALLOCATE (Nlist, off_t, Nmosaic);
-  ALLOCATE (NLIST, off_t, Nmosaic);
-  ALLOCATE (clist, off_t *, Nmosaic);
+  ALLOCATE (Nlist, off_t,   Nmosaic);
+  ALLOCATE (NLIST, off_t,   Nmosaic);
+  ALLOCATE (clist, int *,   Nmosaic);
   ALLOCATE (mlist, off_t *, Nmosaic);
 
@@ -209 +209 @@
     Nlist[i] = 0;
     NLIST[i] = 100;
-    ALLOCATE (clist[i], off_t, NLIST[i]);
+    ALLOCATE (clist[i], int,   NLIST[i]);
     ALLOCATE (mlist[i], off_t, NLIST[i]);
   }
@@ -239 +239 @@
 int findMosaics (Catalog *catalog, int Ncatalog) {
   
+  int i, ecode;
   off_t j;
-  int i, ecode;
 
   if (!MOSAIC_ZEROPT) return (FALSE);
@@ -260 +260 @@
 void matchMosaics (Catalog *catalog, off_t meas, int cat) {
 
-  int off_t;
+  int i;
 
   for (i = 0; i < Nmosaic; i++) {
@@ -286 +286 @@
     if (Nlist[i] == NLIST[i]) {
       NLIST[i] += 100;
-      REALLOCATE (clist[i], int, NLIST[i]);
-      REALLOCATE (mlist[i], int, NLIST[i]);
+      REALLOCATE (clist[i], int,   NLIST[i]);
+      REALLOCATE (mlist[i], off_t, NLIST[i]);
     }   
     return;
@@ -295 +295 @@
 }
 
-float getMmos (off_t meas, off_t cat) {
+float getMmos (off_t meas, int cat) {
 
   off_t i;
@@ -392 +392 @@
       mark = (N < IMAGE_TOOFEW) || (N < IMAGE_GOOD_FRACTION*Nlist[i]);
       if (mark) {
-        fprintf (stderr, "marked image %s (%d), (%d < %d) || (%d < %f*%d)\n", image[imlist[i][0]].name, i, N, IMAGE_TOOFEW, N, IMAGE_GOOD_FRACTION, Nlist[i]);
+        fprintf (stderr, "marked image %s (%lld), (%lld < %d) || (%lld < %f*%lld)\n", image[imlist[i][0]].name, (long long) i, (long long) N, IMAGE_TOOFEW, (long long) N, IMAGE_GOOD_FRACTION, (long long) Nlist[i]);
         mosaic[i].flags |= ID_IMAGE_FEW;
         Nfew ++;
@@ -400 +400 @@
     }
     liststats (list, dlist, N, &stats);
-    if (PoorImages) fprintf (stderr, "Mmos: %f %f %d %d\n", stats.mean, stats.sigma, stats.Nmeas, N);
+    if (PoorImages) fprintf (stderr, "Mmos: %f %f %d %lld\n", stats.mean, stats.sigma, stats.Nmeas, (long long) N);
     mosaic[i].Mcal  = stats.mean;
     mosaic[i].dMcal = stats.sigma;
@@ -511 +511 @@
     n++;
   }
-  fprintf (stderr, "Nmosaic: %d, n: %d\n", Nmosaic, n);
+  fprintf (stderr, "Nmosaic: %lld, n: %lld\n", (long long) Nmosaic, (long long) n);
 
   liststats (list, dlist, n, &stats);
@@ -591 +591 @@
   }
 
-  fprintf (stderr, "%d mosaics marked poor\n", Nmark);
+  fprintf (stderr, "%lld mosaics marked poor\n", (long long) Nmark);
   initstats (STATMODE);
   free (mlist);
@@ -635 +635 @@
     }
   
-    sprintf (string, "Mosaic %d", i);
+    sprintf (string, "Mosaic %lld", (long long) i);
     plot_defaults (&graphdata);
     plot_list (&graphdata, xlist, ylist, N, string, NULL);