Changeset 27839 for branches/simmosaic_branches/Ohana/src/relphot/src/GridOps.c

Timestamp:

May 3, 2010, 8:45:22 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simmosaic_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/relphot/src/GridOps.c (modified) (10 diffs)

branches/simmosaic_branches/Ohana/src/relphot/src/GridOps.c

@@ -7 +7 @@
 };
 
-static int     Ngrid;
+static int     Ngrid;  // number of grid elements (gridX * gridY)
 static float   *gridM; // magnitude offset for this grid cell 
 static float   *gridS; // stdev of the magnitude offset for this grid cell 
 static int     *gridN; // number of stars used to measure the magnitude offset for this grid cell 
 static int     *gridV; // data mode for this cell: fitted, frozen, reference
-static int      gridX;
-static int      gridY;
-
-static int    **bin;
-static int    **Xmeas;
-static int    **Ymeas;
+static int      gridX; // number of grid elements in X direction
+static int      gridY; // number of grid elements in Y direction
+
+static int    **bin;   // link from catalog, measure to grid element
+static int    **Xmeas; // grid x-coordinate for a measurement
+static int    **Ymeas; // grid y-coordinate for a measurement
 
 static int    **clist; // link from measurement on a cell to catalog containing measurement
-static int    **mlist; // link from measurement on a cell to measurement in a catalog
-static int     *Nlist; // list of measurements for each grid cell
-static int     *NLIST;
+static off_t  **mlist; // link from measurement on a cell to measurement in a catalog
+static off_t   *Nlist; // number of measurements for each grid cell
+static off_t   *NLIST; // allocated number of measurements for each grid cell
 
 static struct {
@@ -159 +159 @@
   ALLOCATE (Ymeas, int *, Ncatalog);
   for (i = 0; i < Ncatalog; i++) {
-    ALLOCATE (bin[i], int, MAX (catalog[i].Nmeasure, 1));
+    ALLOCATE (bin[i],   int, MAX (catalog[i].Nmeasure, 1));
     ALLOCATE (Xmeas[i], int, MAX (catalog[i].Nmeasure, 1));
     ALLOCATE (Ymeas[i], int, MAX (catalog[i].Nmeasure, 1));
@@ -166 +166 @@
 
   /* define grid -> cat,meas pointers */
-  ALLOCATE (Nlist, int, Ngrid);
-  ALLOCATE (NLIST, int, Ngrid);
-  ALLOCATE (clist, int *, Ngrid);
-  ALLOCATE (mlist, int *, Ngrid);
+  ALLOCATE (Nlist, off_t,   Ngrid);
+  ALLOCATE (NLIST, off_t,   Ngrid);
+  ALLOCATE (clist, int *,   Ngrid);
+  ALLOCATE (mlist, off_t *, Ngrid);
 
   for (i = 0; i < Ngrid; i++) {
     Nlist[i] = 0;
     NLIST[i] = 100;
-    ALLOCATE (clist[i], int, NLIST[i]);
-    ALLOCATE (mlist[i], int, NLIST[i]);
+    ALLOCATE (clist[i], int,   NLIST[i]);
+    ALLOCATE (mlist[i], off_t, NLIST[i]);
   }
 }
@@ -206 +206 @@
 }
 
-int setGridMeasure (int meas, int cat, double X, double Y, int ccdnum) {
+int setGridMeasure (off_t meas, int cat, double X, double Y, int ccdnum) {
 
   int ix, iy, Cx, Cy, i;
@@ -241 +241 @@
   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 (TRUE);
@@ -264 +264 @@
 }
 
-float getMgrid (int meas, int cat) {
+float getMgrid (off_t meas, int cat) {
 
   int i;
@@ -287 +287 @@
 
   int **gotstar, **gridmeas;
-  int i, j, k, N, Ngood, Nbad, Nmos, Ncal, Nrel, Nsys;
+  int i, j, k, Ngood, Nbad, Nmos, Ncal, Nrel, Nsys;
   double **A, **B, *Mjx, *Wjx;
   float Msys, Mcal, Mmos, Merr, Wsys;
@@ -498 +498 @@
     gridM[i] = B[i][0];
     gridS[i] = sqrt(A[i][i]);
-    gridN[i] = N;
+    gridN[i] = Ngood;
   }
 
@@ -673 +673 @@
 void dump_grid () { 
 
-  int i, j, Nimage, Nbytes, Nformat;
-  int *imlist;
+  off_t i, Nimage;
+  int j, Nbytes, Nformat;
+  off_t *imlist;
   FILE *f;
   Header header, theader;
@@ -702 +703 @@
   gfits_create_header (&header);
   gfits_create_matrix (&header, &matrix);
-  gfits_modify (&header, "NEXTEND", "%d", 1, Nimage + 3);
+  gfits_modify (&header, "NEXTEND", "%lld", 1, (long long) Nimage + 3);
   gfits_modify (&header, "FILTER", "%s", 1, photcode[0].name);
-  gfits_modify (&header, "COMMENT", "%S", 1, "Mosaic Photometry Grid Analysis");
+  gfits_modify_alt (&header, "COMMENT", "%S", 1, "Mosaic Photometry Grid Analysis");
 
   // we need to add lines to the PHU to identify the camera and format; these are used by the ipp config system