Changeset 3521

Timestamp:

Mar 27, 2005, 4:47:22 PM (21 years ago)

Author:

eugene

Message:

converted to autocode SMPData

Location:

trunk/Ohana/src/addstar

Files:

• Makefile (modified) (3 diffs)
• include/addstar.h (modified) (3 diffs)
• src/rfits.c (modified) (2 diffs)

trunk/Ohana/src/addstar/Makefile

@@ -1 @@
-default: addstar
+,default: addstar
 help:
         @echo "make options: addstar (default)"
@@ -17 +17 @@
 #  
 INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-LIBS    =       -L$(LLIB) -lFITS -lohana -lz -lm
+LIBS    =       -L$(LLIB) -lohana -lFITS -lz -lm
 CFLAGS  =       $(INCS)
 LFLAGS  =       $(LIBS) 
@@ -62 +62 @@
 $(SRC)/wimage.$(ARCH).o \
 $(SRC)/rfits.$(ARCH).o \
-$(SRC)/rtext.$(ARCH).o \
-$(SRC)/ConvertStars.$(ARCH).o
+$(SRC)/rtext.$(ARCH).o
 
 EXTRA = \

trunk/Ohana/src/addstar/include/addstar.h

@@ -18 +18 @@
     exit (0); }
 
+# if (0)
 /* this structure is used for loading the data from the FITS smp file */
 typedef struct {
@@ -33 +34 @@
   char  dummy[3];
 } StarData;
+# endif
 
 typedef struct {
@@ -215 +217 @@
 GSCRegion *gregion_match (GSCRegion *regions, int *nregions);
 GSCRegion *gregion_patch (GSCRegion *patch, int *nregions);
-int ConvertStars (StarData *data, int size, int nitems);
 int dump_rawstars (Stars *stars, int Nstars);
 Stars *rfits (FILE *f, int *nstars);

trunk/Ohana/src/addstar/src/rfits.c

@@ -7 +7 @@
   FTable table;
   Stars *stars;
-  StarData *stardata;
+  SMPData *smpdata;
 
   /* if no stars, no table */
-  if (*nstars == 0) {
-    *nstars = 0;
-    return (NULL);
-  }
+  if (*nstars == 0) return (NULL);
 
   /* init & load in table data */
@@ -19 +16 @@
   if (!fits_fread_ftable (f, &table, "SMPFILE")) goto escape;
 
-  /* convert to internal format */
-  stardata = (StarData *) table.buffer;
-  fits_scan (table.header, "NAXIS1", "%d", 1, &Nx);
-  fits_scan (table.header, "NAXIS2", "%d", 1, &Ny);
-  Nstars = Ny;
-
-  if (!ConvertStars (stardata, sizeof (StarData), Nstars)) goto escape;
+  smpdata = fits_table_get_SMPData (&table, &Nstars);
 
   ALLOCATE (stars, Stars, Nstars);
   for (i = 0; i < Nstars; i++) {
-    stars[i].X      = stardata[i].X;
-    stars[i].Y      = stardata[i].Y;
-    stars[i].M      = stardata[i].M;
-    stars[i].dM     = stardata[i].dM;
-    stars[i].dophot = stardata[i].dophot;
+    stars[i].X      = smpdata[i].X;
+    stars[i].Y      = smpdata[i].Y;
+    stars[i].M      = smpdata[i].M;
+    stars[i].dM     = smpdata[i].dM;
+    stars[i].dophot = smpdata[i].dophot;
 
-    stars[i].Mgal   = stardata[i].M;
-    stars[i].Map    = stardata[i].dM;
-    stars[i].fx     = stardata[i].fx;
-    stars[i].fy     = stardata[i].fy;
-    stars[i].df     = stardata[i].df;
+    stars[i].Mgal   = smpdata[i].M;
+    stars[i].Map    = smpdata[i].dM;
+    stars[i].fx     = smpdata[i].fx;
+    stars[i].fy     = smpdata[i].fy;
+    stars[i].df     = smpdata[i].df;
   }    
   *nstars = Nstars;