IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 3519


Ignore:
Timestamp:
Mar 25, 2005, 6:58:32 PM (21 years ago)
Author:
eugene
Message:

moving SMPData to autocode

Location:
trunk/Ohana/src
Files:
1 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/imclean/Makefile

    r3412 r3519  
    1414# 
    1515INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    16 LIBS    =       -L$(LLIB) -lFITS -lohana -lm
     16LIBS    =       -L$(LLIB) -lohana -lFITS -lm
    1717CFLAGS  =       -o $*.$(ARCH).o $(INCS)
    1818CCFLAGS =       $(INCS) $(LIBS)
    … …  
    2323$(SRC)/AdjustHeader.$(ARCH).o   $(SRC)/find_group.$(ARCH).o \
    2424$(SRC)/find_trails.$(ARCH).o    $(SRC)/find_line.$(ARCH).o \
    25 $(SRC)/LoadStarsDophot.$(ARCH).o $(SRC)/wstars.$(ARCH).o        \
     25$(SRC)/wstars.$(ARCH).o         $(SRC)/LoadStarsDophot.$(ARCH).o \
    2626$(SRC)/LoadStarsSex.$(ARCH).o   $(SRC)/LoadStarsChad.$(ARCH).o  \
    2727$(SRC)/wfits.$(ARCH).o

  • trunk/Ohana/src/imclean/include/imclean.h

    r3466 r3519  
    3131char **KEYWORD, **KEYVALU, **KEYFMT;
    3232
    33 typedef struct {
    34   double X;
    35   double Y;
    36   double M, dM;
    37   char   dophot;
    38   double sky;
    39   double fx, fy, df;
    40   double Mgal, Map;
    41 } StarsOld;
    42 
    43 typedef struct {
    44   float X;
    45   float Y;
    46   float M;
    47   float dM;
    48   float Mgal;
    49   float Map;
    50   float sky;
    51   float fx;
    52   float fy;
    53   float df;
    54   char  dophot;
    55   char  dummy[3];
    56 } Stars;
    57 
    58 Stars *LoadStars ();
    59 Stars *LoadStarsChad ();
    60 Stars *LoadStarsSex ();
    61 
    62 Stars *LoadStarsDophot (char *filename, int *nstars, Header *header);
    63 Stars *LoadStarsChad (char *filename, int *nstars, Header *header);
    64 Stars *LoadStarsSex (char *filename, int *nstars, Header *header);
     33SMPData *LoadStarsDophot (char *filename, int *nstars, Header *header);
     34SMPData *LoadStarsChad (char *filename, int *nstars, Header *header);
     35SMPData *LoadStarsSex (char *filename, int *nstars, Header *header);
    6536
    6637void ConfigInit (int *argc, char **argv);
    6738void AdjustHeader (Header *header);
    68 void sort_stars (Stars *X, int N);
    69 void find_trails (Stars *stars, int Nstars);
    70 int find_group (Stars *stars, char *mark, int Npts, int i, double *ANGLE);
    71 void wstars (char *filename, Stars *stars, int Nstars, Header *header);
     39void sort_stars (SMPData *X, int N);
     40void find_trails (SMPData *stars, int Nstars);
     41int find_group (SMPData *stars, char *mark, int Npts, int i, double *ANGLE);
     42void wstars (char *filename, SMPData *stars, int Nstars, Header *header);
    7243
    73 void fix_total (Stars *stars, int Nstars, Header *header);
    74 int find_line (Stars *stars, char *mark, int Npts, int i, double *M, double *B, double Angle);
    75 void find_better_line (Stars *stars, char *mark, int Npts, int i, double *M, double *B, int axis);
     44void fix_total (SMPData *stars, int Nstars, Header *header);
     45int find_line (SMPData *stars, char *mark, int Npts, int i, double *M, double *B, double Angle);
     46void find_better_line (SMPData *stars, char *mark, int Npts, int i, double *M, double *B, int axis);
    7647
    7748void help ();
    7849void args (int argc, char **argv);
    79 int ConvertStars (Stars *data, int size, int nitems);
    80 void wfits (char *filename, Stars *stars, int Nstars, Header *header);
     50void wfits (char *filename, SMPData *stars, int Nstars, Header *header);

  • trunk/Ohana/src/imclean/src/LoadStarsChad.c

    r2423 r3519  
    33# define HIST_BINS 150
    44
    5 Stars *LoadStarsChad (char *filename, int *nstars, Header *header) {
     5SMPData *LoadStarsChad (char *filename, int *nstars, Header *header) {
    66
    77  FILE *f;
    8   Stars *stars;
     8  SMPData *stars;
    99  int NSTARS, Nstars, i, N;
    1010  int status;
    … …  
    3030  Nstars = 0;
    3131  NSTARS = 500;
    32   ALLOCATE (stars, Stars, NSTARS);
     32  ALLOCATE (stars, SMPData, NSTARS);
    3333
    3434  /* for now assume file 'header' is fixed-format */
    … …  
    9292    if (Nstars == NSTARS - 1) {
    9393      NSTARS += 500;
    94       REALLOCATE (stars, Stars, NSTARS);
     94      REALLOCATE (stars, SMPData, NSTARS);
    9595    }
    9696  }

  • trunk/Ohana/src/imclean/src/LoadStarsDophot.c

    r2423 r3519  
    55/* m = 0.1*Mhist[i] */
    66
    7 Stars *LoadStarsDophot (char *filename, int *nstars, Header *header) {
     7SMPData *LoadStarsDophot (char *filename, int *nstars, Header *header) {
    88
    99  FILE *f;
    10   Stars *stars;
     10  SMPData *stars;
    1111  int NSTARS, Nstars, i, Nline, N;
    1212  int type, status;
    … …  
    3838  Nstars = 0;
    3939  NSTARS = 500;
    40   ALLOCATE (stars, Stars, NSTARS);
     40  ALLOCATE (stars, SMPData, NSTARS);
    4141
    4242  /* read average values from first line */
    … …  
    112112        if (Nstars == NSTARS - 1) {
    113113          NSTARS += 500;
    114           REALLOCATE (stars, Stars, NSTARS);
     114          REALLOCATE (stars, SMPData, NSTARS);
    115115        }
    116116      }

  • trunk/Ohana/src/imclean/src/LoadStarsSex.c

    r2423 r3519  
    55/* good for sextractor */
    66
    7 Stars *LoadStarsSex (char *filename, int *nstars, Header *header) {
     7SMPData *LoadStarsSex (char *filename, int *nstars, Header *header) {
    88
    99  FILE *f;
    10   Stars *stars;
     10  SMPData *stars;
    1111  int NSTARS, Nstars, i, Nline, N;
    1212  int type, status;
    … …  
    3737  Nstars = 0;
    3838  NSTARS = 500;
    39   ALLOCATE (stars, Stars, NSTARS);
     39  ALLOCATE (stars, SMPData, NSTARS);
    4040
    4141  /* read in data from obj file */
    … …  
    105105      if (Nstars == NSTARS - 1) {
    106106        NSTARS += 500;
    107         REALLOCATE (stars, Stars, NSTARS);
     107        REALLOCATE (stars, SMPData, NSTARS);
    108108      }
    109109    }

  • trunk/Ohana/src/imclean/src/find_group.c

    r2423 r3519  
    11# include "imclean.h"
    22
    3 int find_group (Stars *stars, char *mark, int Npts, int i, double *ANGLE) {
     3int find_group (SMPData *stars, char *mark, int Npts, int i, double *ANGLE) {
    44 
    55  int j, N, bin, Ndegbin;

  • trunk/Ohana/src/imclean/src/find_line.c

    r2423 r3519  
    11# include "imclean.h"
    22
    3 int find_line (Stars *stars, char *mark, int Npts, int i, double *M, double *B, double Angle) {
     3int find_line (SMPData *stars, char *mark, int Npts, int i, double *M, double *B, double Angle) {
    44 
    55  int j, N;
    … …  
    7373
    7474
    75 void find_better_line (Stars *stars, char *mark, int Npts, int i, double *M, double *B, int axis) {
     75void find_better_line (SMPData *stars, char *mark, int Npts, int i, double *M, double *B, int axis) {
    7676 
    7777  int j, N;
    … …  
    150150}
    151151
    152 void fix_total (Stars *stars, int Nstars, Header *header) {
     152void fix_total (SMPData *stars, int Nstars, Header *header) {
    153153 
    154154  int Ngood, i;

  • trunk/Ohana/src/imclean/src/find_trails.c

    r2423 r3519  
    11# include "imclean.h"
    22
    3 void find_trails (Stars *stars, int Nstars) {
     3void find_trails (SMPData *stars, int Nstars) {
    44
    55  int i;

  • trunk/Ohana/src/imclean/src/imclean.c

    r3412 r3519  
    44
    55  Header header;
    6   Stars *stars;
     6  SMPData *stars;
    77  int Nstars;
    88

  • trunk/Ohana/src/imclean/src/sort_stars.c

    r2423 r3519  
    11# include "imclean.h"
    22
    3 void sort_stars (Stars *X, int N) {
     3void sort_stars (SMPData *X, int N) {
    44
    55  int l,j,ir,i;
    6   Stars tX;
     6  SMPData tX;
    77 
    88  if (N < 1) return;

  • trunk/Ohana/src/imclean/src/star_stats.c

    r2423 r3519  
    11# include "imclean.h"
    22
    3 star_stats (Header *header, Stars *stars, int Nstars) {
     3star_stats (Header *header, SMPData *stars, int Nstars) {
    44
    55  int i;

  • trunk/Ohana/src/imclean/src/wfits.c

    r3466 r3519  
    11# include "imclean.h"
    22
    3 void wfits (char *filename, Stars *stars, int Nstars, Header *header) {
     3void wfits (char *filename, SMPData *stars, int Nstars, Header *header) {
    44
    55  Matrix matrix;
    … …  
    1818  fits_create_matrix (header, &matrix);
    1919   
    20   /* create bintable header */
    21   fits_create_table_header (&theader, "BINTABLE", "SMPFILE");
    22 
    23   /* define bintable layout */
    24   fits_define_bintable_column (&theader, "E",    "X_PIX",      "x coord",              "pixels",                         1.0, 0.0);
    25   fits_define_bintable_column (&theader, "E",    "Y_PIX",      "y coord",              "pixels",                         1.0, 0.0);
    26   fits_define_bintable_column (&theader, "E",    "MAG_RAW",    "inst mags",            "mags",                           1.0, 0.0);
    27   fits_define_bintable_column (&theader, "E",    "MAG_ERR",    "inst mag error",       "mags",                           1.0, 0.0);
    28   fits_define_bintable_column (&theader, "E",    "MAG_GAL",    "galaxy mag",           "mags",                           1.0, 0.0);
    29   fits_define_bintable_column (&theader, "E",    "MAG_AP",     "aperture mag",         "mags",                           1.0, 0.0);
    30   fits_define_bintable_column (&theader, "E",    "LOG_SKY",    "log-10 of sky",        "mags",                           1.0, 0.0);
    31   fits_define_bintable_column (&theader, "E",    "FWHM_X",     "semi-major",           "mags",                           1.0, 0.0);
    32   fits_define_bintable_column (&theader, "E",    "FWHM_Y",     "semi-minor",           "mags",                           1.0, 0.0);
    33   fits_define_bintable_column (&theader, "E",    "THETA",      "ellipse angle",        "mags",                           1.0, 0.0);
    34   fits_define_bintable_column (&theader, "B",    "DOPHOT",     "dophot type",          "",                              1.0, 0.0);
    35   fits_define_bintable_column (&theader, "3A",   "DUMMY",      "padding",              "",                              1.0, 0.0);
    36 
    37   /* create table, add data values */
    38   fits_create_table (&theader, &table);
    39 
    40   ConvertStars (stars, sizeof (Stars), Nstars);
    41   fits_add_rows (&table, (char *) stars, Nstars, sizeof (Stars));
     20  table.header = &theader;
     21  fits_table_set_SMPData (&table, stars, Nstars);
    4222
    4323  fits_write_header  (filename, header);
    … …  
    4727  exit (0);
    4828}
    49 
    50 # define SWAP_BYTE(X) \
    51   tmp = byte[X+0]; byte[X+0] = byte[X+1]; byte[X+1] = tmp;
    52 # define SWAP_WORD(X) \
    53   tmp = byte[X+0]; byte[X+0] = byte[X+3]; byte[X+3] = tmp; \
    54   tmp = byte[X+1]; byte[X+1] = byte[X+2]; byte[X+2] = tmp;
    55 # define SWAP_DBLE(X) \
    56   tmp = byte[X+0]; byte[X+0] = byte[X+7]; byte[X+7] = tmp; \
    57   tmp = byte[X+1]; byte[X+1] = byte[X+6]; byte[X+6] = tmp; \
    58   tmp = byte[X+2]; byte[X+2] = byte[X+5]; byte[X+5] = tmp; \
    59   tmp = byte[X+3]; byte[X+3] = byte[X+4]; byte[X+4] = tmp;
    60 
    61 # ifdef linux
    62 # define BYTE_SWAP
    63 # endif
    64 
    65 # ifdef sid
    66 # define BYTE_SWAP
    67 # endif
    68 
    69 # ifdef dec
    70 # define BYTE_SWAP
    71 # endif
    72 
    73 # define STARS_SIZE 44
    74 
    75 int ConvertStars (Stars *data, int size, int nitems) {
    76 
    77   int i;
    78   unsigned char *byte, tmp;
    79 
    80 # ifdef BYTE_SWAP
    81 
    82   if (size != STARS_SIZE) {
    83     fprintf (stderr, "mismatch in type sizes (Stars) %d vs %d\n", size, STARS_SIZE);
    84     return (FALSE);
    85   }
    86 
    87   byte = (char *) data;
    88   for (i = 0; i < nitems; i++, byte += size) {
    89     SWAP_WORD (0);   /* R */
    90     SWAP_WORD (4);   /* Y */
    91     SWAP_WORD (8);   /* M */
    92     SWAP_WORD (12);  /* dM */
    93     SWAP_WORD (16);  /* Mgal */
    94     SWAP_WORD (20);  /* Map */
    95     SWAP_WORD (24);  /* sky */
    96     SWAP_WORD (28);  /* fx */
    97     SWAP_WORD (32);  /* fy */
    98     SWAP_WORD (36);  /* df */
    99   }
    100   return (TRUE);
    101 
    102 # else
    103   return (TRUE);
    104 # endif 
    105 }
    106 

  • trunk/Ohana/src/imclean/src/wstars.c

    r2423 r3519  
    22# define NCHAR 66 /* 65 char EXCLUDING return */
    33
    4 void wstars (char *filename, Stars *stars, int Nstars, Header *header) {
     4void wstars (char *filename, SMPData *stars, int Nstars, Header *header) {
    55 
    66  int i, Nchar;

  • trunk/Ohana/src/libautocode/Makefile

    r3515 r3519  
    2828
    2929LIBOBJ = \
     30$(SRC)/smpdata.$(ARCH).o \
    3031$(SRC)/spectrum.$(ARCH).o \
    3132$(SRC)/spectrum-ascii.$(ARCH).o
    3233
    3334LIBINC = \
     35$(INC)/smpdata.h \
    3436$(INC)/spectrum.h \
    3537$(INC)/spectrum-ascii.h

  • trunk/Ohana/src/libautocode/def/smpdata.d

    r3515 r3519  
    22STRUCT  SMPData
    33EXTNAME SMPFILE
     4TYPE    BINTABLE
     5SIZE    44
    46
    57# elements of data structure / FITS table

  • trunk/Ohana/src/libohana/Makefile

    r3516 r3519  
    4747
    4848AOBJ = \
     49$(ASRC)/smpdata.$(ARCH).o \
    4950$(ASRC)/spectrum.$(ARCH).o \
    5051$(ASRC)/spectrum-ascii.$(ARCH).o
Note: See TracChangeset for help on using the changeset viewer.