Changeset 3413

Timestamp:

Mar 12, 2005, 10:27:15 AM (21 years ago)

Author:

eugene

Message:

addings FITS tables to smp format

Location:

trunk/Ohana/src/gastro2

Files:

• Makefile (modified) (1 diff)
• include/gastro2.h (modified) (1 diff)
• src/gstars2.c (modified) (3 diffs)
• src/rfits.c (added)
• src/rtext.c (added)

trunk/Ohana/src/gastro2/Makefile

@@ -46 +46 @@
 $(SRC)/getusno.$(ARCH).o \
 $(SRC)/gcatalog.$(ARCH).o \
-$(SRC)/remove_clumps.$(ARCH).o
+$(SRC)/remove_clumps.$(ARCH).o \
+$(SRC)/rfits.$(ARCH).o \
+$(SRC)/rtext.$(ARCH).o
 
 OBJ = $(GASTRO)

trunk/Ohana/src/gastro2/include/gastro2.h

@@ -11 +11 @@
   int type;
 } StarData;
+
+typedef struct {
+  float X;
+  float Y;
+  float M;
+  float dM;
+  float Mgal;
+  float Map;
+  float sky;
+  float fx;
+  float fy;
+  float df;
+  char  dophot;
+  char  dummy[3];
+} Stars;
 
 typedef struct {

trunk/Ohana/src/gastro2/src/gstars2.c

@@ -1 +1 @@
 # include "gastro2.h"
-
-/* by necesity hard wired */
-# define D_NSTARS 1000
-# define BYTES_STAR 66
-# define BLOCK 1000
+StarData *rtext (char *filename, Header *header, int *nstars);
+StarData *rfits (char *filename, Header *header, int *nstars);
 
 void gstars (char *filename, CmpCatalog *Target) {
@@ -12 +9 @@
   char line[80], *buffer;
   double dmag, type, det;
-  int NX, NY, FoundAstrom;
+  int NX, NY, FoundAstrom, extend;
 
   FILE *f;
@@ -121 +118 @@
   Target[0].Area = fabs (NX*NY*Target[0].coords.cdelt1*Target[0].coords.cdelt2*det);
 
-  /* allocate space for stars */
-  Nstars = -1;
-  fits_scan (&Target[0].header, "NSTARS", "%d", 1, &Nstars);
-  if (Nstars == -1) {
-    fprintf (stderr, "ERROR: failed to find NSTARS\n");
-    exit (1);
-  }
-  ALLOCATE (stars, StarData, MAX (Nstars, 1));
-  Nbytes = Nstars*BYTES_STAR;
-
-  /* open file for stars */
-  f = fopen (filename, "r");
-  if (f == NULL) {
-    fprintf (stderr, "ERROR: can't open file to load stars\n");
-    exit (1);
-  }
-  fseek (f, Target[0].header.size, SEEK_SET); 
-
-  N = nstars = 0;
-  ALLOCATE (buffer, char, (BLOCK*BYTES_STAR));
-  
-  while ((nbytes = fread (buffer, 1, (BLOCK*BYTES_STAR), f)) != 0) {
-    Ninstar = nbytes / BYTES_STAR;
-    for (i = 0; i < Ninstar; i++, nstars++) {
-      dparse (&stars[N].X, 1, &buffer[i*BYTES_STAR]);
-      dparse (&stars[N].Y, 2, &buffer[i*BYTES_STAR]);
-      dparse (&stars[N].M, 3, &buffer[i*BYTES_STAR]);
-      dparse (&dmag,       4, &buffer[i*BYTES_STAR]);
-      dparse (&type,       5, &buffer[i*BYTES_STAR]);
-
-      /* hardwired dophot exclusions should eventually be encapsulated elsewhere */
-      if ((type == 4) || (type == 6) || (type == 5) || (type == 9)) continue;
-      if (dmag > 1000*MAX_ERROR) continue;
-      stars[N].dM   = 0.001 * dmag;
-      stars[N].type = type;
-      N++;
-    }
-  }
-  free (buffer);
-  fclose (f);
- 
-  if (nstars != Nstars) {
-    fprintf (stderr, "WARNING: only read %d of %d stars\n", nstars, Nstars);
-  }
-  if (N < 5) { 
-    fprintf (stderr, "ERROR: too few stars for reliable solution, only %d\n", N);
-    exit (1);
+  extend = FALSE;
+  fits_scan (&Target[0].header, "EXTEND",  "%t", 1, &extend);
+  if (extend) {
+    stars = rfits (filename, &Target[0].header, &Nstars);
+  } else {
+    stars = rtext (filename, &Target[0].header, &Nstars);
   }
 
-  stars = remove_clumps (stars, &N, NX, NY);
+  stars = remove_clumps (stars, &Nstars, NX, NY);
 
-  sort_stars_mag (stars, N);  /* sorting by magnitude */
+  sort_stars_mag (stars, Nstars);  /* sorting by magnitude */
   Target[0].stars = stars;
-  Target[0].N = N;
+  Target[0].N = Nstars;
 
   /* limit number of stars */