Changeset 39995

Timestamp:

Mar 5, 2017, 11:22:44 AM (9 years ago)

Author:

eugene

Message:

fix the grid range trunction

Location:

trunk/Ohana/src/relastro/src

Files:

• BrightCatalog.c (modified) (1 diff)
• bcatalog.c (modified) (2 diffs)

trunk/Ohana/src/relastro/src/BrightCatalog.c

@@ -294 +294 @@
       secfilt[i].Mmax   = Mmax[i];
     }
-    fprintf (stderr, "loaded data for %lld averages\n", (long long) Nrow);
+    // fprintf (stderr, "loaded data for %lld secfilt\n", (long long) Nrow);
 
     free (M    );

trunk/Ohana/src/relastro/src/bcatalog.c

@@ -365 +365 @@
   gfits_scan (&oldcatalog[0].header, "DEC1", "%lf", 1, &Dmax);
 
-  if (VERBOSE2) fprintf (stderr, "extracting from catalog covering region %f,%f to %f,%f\n", Rmin, Dmin, Rmax, Dmax);
+  if (VERBOSE) fprintf (stderr, "extracting from catalog covering region %f,%f to %f,%f (%d average)\n", Rmin, Dmin, Rmax, Dmax, (int) subcatalog[0].Naverage);
 
   float AREA = fabs(Dmax - Dmin) * fabs(Rmax - Rmin) * cos (0.5*RAD_DEG*(Dmax + Dmin));
@@ -459 +459 @@
     if (isnan(X[i])) continue;
     if (isnan(Y[i])) continue;
-    ix = MIN(0, MAX(NX - 1, (X[i] - Xmin) / 200.0));
-    iy = MIN(0, MAX(NY - 1, (Y[i] - Ymin) / 200.0));
+    ix = MAX(0, MIN(NX - 1, (X[i] - Xmin) / 200.0));
+    iy = MAX(0, MIN(NY - 1, (Y[i] - Ymin) / 200.0));
     int Nn = Nn_grid[ix][iy];
     Nm_grid[ix][iy][Nn] = subcatalog[0].average[i].Nmeasure;