Changeset 3520 for trunk/Ohana/src/gastro2/src/rfits.c

Timestamp:

Mar 27, 2005, 4:39:46 PM (21 years ago)

Author:

eugene

Message:

converted to autocode SMPData

File:

• trunk/Ohana/src/gastro2/src/rfits.c (modified) (2 diffs)

trunk/Ohana/src/gastro2/src/rfits.c

@@ -1 +1 @@
 # include "gastro2.h"
-int ConvertStars (Stars *data, int size, int nitems);
 
-StarData *rfits (char *filename, Header *header, int *nstars) {
+StarData *rfits (FILE *f, int *nstars) {
 
-  int i, N, Nx, Ny, Nstars;
-  FILE *f;
+  int i, N, Nstars;
   Matrix matrix;
   Header theader;
   FTable table;
-  Stars *stars;
+  SMPData  *stars;
   StarData *stardata;
-
-  /* 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, header[0].size, SEEK_SET); 
 
   /* init & load in table data */
   table.header   = &theader;
-  if (!fits_fread_matrix (f, &matrix, header))          goto escape;
   if (!fits_fread_ftable (f, &table, "SMPFILE")) goto escape;
 
-  /* convert to internal format */
-  stars = (Stars *) table.buffer;
-  fits_scan (table.header, "NAXIS1", "%d", 1, &Nx);
-  fits_scan (table.header, "NAXIS2", "%d", 1, &Ny);
-  Nstars = Ny;
-
-  if (!ConvertStars (stars, sizeof (Stars), Nstars)) goto escape;
+  stars = fits_table_get_SMPData (&table, &Nstars);
 
   ALLOCATE (stardata, StarData, Nstars);
@@ -63 +46 @@
   exit (1);
 }
-
-# define SWAP_BYTE(X) \
-  tmp = byte[X+0]; byte[X+0] = byte[X+1]; byte[X+1] = tmp;
-# define SWAP_WORD(X) \
-  tmp = byte[X+0]; byte[X+0] = byte[X+3]; byte[X+3] = tmp; \
-  tmp = byte[X+1]; byte[X+1] = byte[X+2]; byte[X+2] = tmp;
-# define SWAP_DBLE(X) \
-  tmp = byte[X+0]; byte[X+0] = byte[X+7]; byte[X+7] = tmp; \
-  tmp = byte[X+1]; byte[X+1] = byte[X+6]; byte[X+6] = tmp; \
-  tmp = byte[X+2]; byte[X+2] = byte[X+5]; byte[X+5] = tmp; \
-  tmp = byte[X+3]; byte[X+3] = byte[X+4]; byte[X+4] = tmp;
-
-# ifdef linux
-# define BYTE_SWAP
-# endif
-
-# ifdef sid
-# define BYTE_SWAP
-# endif
-
-# ifdef dec
-# define BYTE_SWAP
-# endif
-
-# define STARS_SIZE 44
-
-int ConvertStars (Stars *data, int size, int nitems) {
-
-  int i;
-  unsigned char *byte, tmp;
-
-# ifdef BYTE_SWAP
-
-  if (size != STARS_SIZE) {
-    fprintf (stderr, "mismatch in type sizes (Stars) %d vs %d\n", size, STARS_SIZE);
-    return (FALSE);
-  }
-
-  byte = (char *) data;
-  for (i = 0; i < nitems; i++, byte += size) {
-    SWAP_WORD (0);   /* R */
-    SWAP_WORD (4);   /* Y */
-    SWAP_WORD (8);   /* M */
-    SWAP_WORD (12);  /* dM */
-    SWAP_WORD (16);  /* Mgal */
-    SWAP_WORD (20);  /* Map */
-    SWAP_WORD (24);  /* sky */
-    SWAP_WORD (28);  /* fx */
-    SWAP_WORD (32);  /* fy */
-    SWAP_WORD (36);  /* df */
-  }
-  return (TRUE);
-
-# else
-  return (TRUE);
-# endif  
-} 
-