Changeset 20936 for trunk/Ohana/src/relphot

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

Location:

trunk/Ohana/src/relphot/src

Files:

• GridOps.c (modified) (3 diffs)
• ImageOps.c (modified) (2 diffs)
• StarOps.c (modified) (1 diff)

trunk/Ohana/src/relphot/src/GridOps.c

@@ -261 +261 @@
         fprintf (stderr, "\n");
     }
+    return (TRUE);
 }
 
@@ -286 +287 @@
 
   int **gotstar, **gridmeas;
-  int i, j, k, N, Nmax, Ngood, Nbad, Nmos, Ncal, Nrel, Nsys, Nfit;
+  int i, j, k, N, Ngood, Nbad, Nmos, Ncal, Nrel, Nsys;
   double **A, **B, *Mjx, *Wjx;
-  float Msys, Mrel, Mcal, Mmos, Merr, Wsys;
+  float Msys, Mcal, Mmos, Merr, Wsys;
   double Mj, Wj;
   
@@ -449 +450 @@
 
     FILE *f;
-    Header header, theader;
+    Header theader;
     Matrix matrix;
 

trunk/Ohana/src/relphot/src/ImageOps.c

@@ -166 +166 @@
 void matchImage (Catalog *catalog, int meas, int cat) {
 
-  int i, ave, ccdnum;
-  double ra, dec, X, Y;
+  int i, ccdnum;
+  double X, Y;
   char *pname, *filter, *p, base[256];
   Measure *measure;
@@ -191 +191 @@
          and nn is an integer -> ccdnum */
       
+      /// XXX we have an inconsistency here wrt dvo.layout and dvo.photcode
+
       while (!isdigit(*p) && *p) p++;
       if (*p == 0) continue;

trunk/Ohana/src/relphot/src/StarOps.c

@@ -547 +547 @@
   double *xlist, *Mlist;
   Graphdata graphdata;
-  char *filename, tmp;
 
 # define NBIN 200