Changeset 5850 for trunk/Ohana/src/opihi/dvo/cmpload.c

Timestamp:

Dec 27, 2005, 3:21:40 PM (21 years ago)

Author:

eugene

Message:

substantial work to move kii/kapa call into libkapa

File:

• trunk/Ohana/src/opihi/dvo/cmpload.c (modified) (3 diffs)

trunk/Ohana/src/opihi/dvo/cmpload.c

@@ -6 +6 @@
 int cmpload (int argc, char **argv) {
   
-  int i, Noverlay, N, Nin, Nextra, n, Objtype, type;
+  int i, Noverlay, NOVERLAY, Nstar, N, Nin, Nextra, Objtype, type;
   int doneread, done, Nskip, Nbytes, nbytes, Ninstar;
   char *c, *c2;
-  double *X, *Y, *M;
   double dtmp;
   FILE *f;
-  char *buffer, *buffer2;
+  char *buffer;
   int Ximage, Nimage;
   Header header;
@@ -43 +42 @@
 
   /* find expected number of stars */
-  fits_scan (&header, "NSTARS", "%d", 1, &nstar);
-  if (nstar == 0) {
+  fits_scan (&header, "NSTARS", "%d", 1, &Nstar);
+  if (Nstar == 0) {
     fprintf (stderr, "ERROR: can't get NSTARS from header\n");
     fits_free_header (&header);
@@ -121 +120 @@
       # endif 
 
-      dparse (&overlay[Noverlay].x,  1, &buffer[i*BYTES_STAR]);
-      dparse (&overlay[Noverlay].y,  2, &buffer[i*BYTES_STAR]);
+      fparse (&overlay[Noverlay].x,  1, &buffer[i*BYTES_STAR]);
+      fparse (&overlay[Noverlay].y,  2, &buffer[i*BYTES_STAR]);
       overlay[Noverlay].type = KII_OVERLAY_BOX;
       overlay[Noverlay].dx = 5.0;