Changeset 3416 for trunk/Ohana/src/addstar/src/gstars.c

Timestamp:

Mar 14, 2005, 12:46:02 PM (21 years ago)

Author:

eugene

Message:

adding mosaic astrometry support and smp-fits files

File:

• trunk/Ohana/src/addstar/src/gstars.c (modified) (5 diffs)

trunk/Ohana/src/addstar/src/gstars.c

@@ -1 +1 @@
 # include "addstar.h"
-# define D_NSTARS 1000
-# define BYTES_STAR 66
-# define BLOCK 1000
 
 Stars *gstars (char *file, int *NSTARS, Image *image) {
@@ -8 +5 @@
   FILE *f;
   Header header;
-  int j, N, Ninstar;
+  int j, N, Ninstar, extend;
   int nbytes, Nbytes;
-  Stars *stars;
+  Stars *stars, *rdstars;
   char *buffer, *c, *c2, photcode[64];
   double tmp;
@@ -22 +19 @@
     exit (1);
   }
-
-  /* open file */
-  f = fopen (file, "r");
-  if (f == NULL) {
-    fprintf (stderr, "ERROR: can't read data from %s\n", file);
-    exit (1);
-  }
-  fseek (f, header.size, SEEK_SET); 
 
   /* find image rootname */
@@ -147 +136 @@
     exit (1);
   }
-  ALLOCATE (stars, Stars, image[0].nstar);
 
   /* this is really lame.  get sky background from Flips data */
@@ -170 +158 @@
   }
 
-  /* load in stars by blocks of 1000 */
-  N = 0;
-  ALLOCATE (buffer, char, (BLOCK*BYTES_STAR) + 1);
-  buffer[BLOCK*BYTES_STAR] = 0;
-  Nextra = 0;
-  doneread = FALSE;
-  while (!doneread) {
-    Nbytes = BYTES_STAR * BLOCK - Nextra;
-    nbytes = Fread (&buffer[Nextra], 1, Nbytes, f, "char");
-    if (nbytes == 0) {
-      doneread = TRUE;
-      continue;
+  /* read in data section */
+  f = fopen (file, "r");
+  if (f == NULL) {
+    fprintf (stderr, "ERROR: can't read data from %s\n", file);
+    exit (1);
+  }
+  fseek (f, header.size, SEEK_SET); 
+
+  extend = FALSE;
+  fits_scan (&header, "EXTEND",  "%t", 1, &extend);
+  if (extend) {
+    Nbytes = fits_matrix_size (&header); 
+    fseek (f, Nbytes, SEEK_CUR); 
+    rdstars = rfits (f, &image[0].nstar);
+  } else {
+    rdstars = rtext (f, &image[0].nstar);
+  }
+  fclose (f);
+
+  /* modify resulting star list */
+  ALLOCATE (stars, Stars, image[0].nstar);
+  for (N = j = 0; j < image[0].nstar; j++) {
+    /* allow for some dynamic filtering of star list */
+    if (rdstars[j].dM > 1000.0 / SNLIMIT) continue;
+    if (XMAX && (rdstars[j].X > XMAX)) continue;
+    if (XMIN && (rdstars[j].X < XMIN)) continue;
+    if (YMAX && (rdstars[j].Y > YMAX)) continue;
+    if (YMIN && (rdstars[j].Y < YMIN)) continue;
+    stars[N] = rdstars[j];
+
+    XY_to_RD (&stars[N].R, &stars[N].D, stars[N].X, stars[N].Y, &image[0].coords);
+    while (stars[N].R < 0.0) stars[N].R += 360.0;
+    while (stars[N].R >= 360.0) stars[N].R -= 360.0;
+    stars[N].found = -1;
+    stars[N].code = thiscode[0].code;
+
+    if (SKYPROBE) {
+      dMs = get_subpix (stars[N].X, stars[N].Y);
+      stars[N].M    -= dMs;
+      stars[N].Mgal -= dMs;
+      stars[N].Map  -= dMs;
+      dMs = 1000.0*scat_subpix (stars[N].X, stars[N].Y);
+      stars[N].dM = hypot (stars[N].dM, dMs);
     }
-    nbytes += Nextra;
-    /* check line-by-line integrity */
-    c = buffer;
-    done = FALSE;
-    while ((c < buffer + nbytes) && (!done)) { 
-      for (c2 = c; *c2 == '\n'; c2++);
-      if (c2 > c) { /* extra return chars */
-        memmove (c, c2, (int)(buffer + nbytes - c2));
-        Nskip = c2 - c;
-        nbytes -= Nskip;
-        bzero (buffer + nbytes, Nskip);
-        if (VERBOSE) fprintf (stderr, "deleted %d extra return chars\n", Nskip);
-      }
-      c2 = strchr (c, '\n');
-      if (c2 == (char *) NULL) {
-        done = TRUE;    
-        continue;
-      }
-      c2++;
-      if ((c2 - c) != BYTES_STAR) { /* bad line, delete it */
-        memmove (c, c2, (int)(buffer + nbytes - c2));
-        Nskip = c2 - c;
-        nbytes -= Nskip;
-        bzero (buffer + nbytes, Nskip);
-        if (VERBOSE) fprintf (stderr, "deleted line, %d extra chars\n", Nskip);
-      } else {
-        c = c2;
-      }
-    }
-    Ninstar = nbytes / BYTES_STAR;
-    Nextra = nbytes % BYTES_STAR;
-    for (j = 0; j < Ninstar; j++, N++) {
-      dparse (&stars[N].X,  1, &buffer[j*BYTES_STAR]);
-      dparse (&stars[N].Y,  2, &buffer[j*BYTES_STAR]);
-      dparse (&stars[N].M,  3, &buffer[j*BYTES_STAR]);
-
-      /* cmp files carry dM in millimags */
-      dparse (&tmp, 4, &buffer[j*BYTES_STAR]);
-      stars[N].dM = 0.001*tmp;
-
-      /* allow for some dynamic filtering of star list */
-      if (stars[N].dM > 1000.0 / SNLIMIT) { N--; continue; }
-      if (XMAX && (stars[N].X > XMAX))    { N--; continue; }
-      if (XMIN && (stars[N].X < XMIN))    { N--; continue; }
-      if (YMAX && (stars[N].Y > YMAX))    { N--; continue; }
-      if (YMIN && (stars[N].Y < YMIN))    { N--; continue; }
-
-      dparse (&tmp,         5, &buffer[j*BYTES_STAR]);
-      stars[N].dophot = tmp;
-
-      dparse (&stars[N].Mgal, 7, &buffer[j*BYTES_STAR]);
-      dparse (&stars[N].Map,  8, &buffer[j*BYTES_STAR]);
-      dparse (&stars[N].fx,   9, &buffer[j*BYTES_STAR]);
-      dparse (&stars[N].fy,  10, &buffer[j*BYTES_STAR]);
-      dparse (&stars[N].df,  11, &buffer[j*BYTES_STAR]);
-
-      XY_to_RD (&stars[N].R, &stars[N].D, stars[N].X, stars[N].Y, &image[0].coords);
-      while (stars[N].R < 0.0) stars[N].R += 360.0;
-      while (stars[N].R >= 360.0) stars[N].R -= 360.0;
-      stars[N].found = -1;
-      stars[N].code = thiscode[0].code;
-
-      if (SKYPROBE) {
-        dMs = get_subpix (stars[N].X, stars[N].Y);
-        stars[N].M    -= dMs;
-        stars[N].Mgal -= dMs;
-        stars[N].Map  -= dMs;
-        dMs = 1000.0*scat_subpix (stars[N].X, stars[N].Y);
-        stars[N].dM = hypot (stars[N].dM, dMs);
-      }
-    }
-  }
-
+    N ++;
+  }
   image[0].nstar = N;
   REALLOCATE (stars, Stars, image[0].nstar);
+  free (rdstars);
+
   if (VERBOSE) fprintf (stderr, "read %d stars from target file\n", image[0].nstar);
   *NSTARS = image[0].nstar;