IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4026


Ignore:
Timestamp:
May 25, 2005, 6:24:57 AM (21 years ago)
Author:
eugene
Message:

moving average, photcode, measure, etc to autocode

Location:
trunk/Ohana/src/libohana
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/libohana/Makefile

    r3903 r4026  
    44AUTO    =       $(ROOT)/src/libautocode
    55ASRC    =       $(AUTO)/src
     6ADEF    =       $(AUTO)/def
    67LIB     =       $(HOME)/lib
    78SRC     =       $(HOME)/src
    … …  
    5253
    5354AOBJ = \
     55$(ASRC)/coords.$(ARCH).o \
    5456$(ASRC)/regimage.$(ARCH).o \
    5557$(ASRC)/detreg.$(ARCH).o \
    … …  
    5860$(ASRC)/smpdata.$(ARCH).o \
    5961$(ASRC)/spectrum.$(ARCH).o \
    60 $(ASRC)/spectrum-ascii.$(ARCH).o
     62$(ASRC)/spectrum-ascii.$(ARCH).o \
     63$(ASRC)/image.$(ARCH).o
    6164
    62 autocode: $(INC1)
    63         cd $(AUTO) && make install
     65ACOM = $(ADEF)/autocode.c $(ADEF)/autocode.h $(ADEF)/common.h
    6466
    6567$(OBJ1): $(INC1)
    6668$(OBJ2): $(INC2)
    67 $(AOBJ): autocode
     69$(AOBJ): $(ASRC)/%.$(ARCH).o : $(ADEF)/%.d $(ACOM)
     70        cd $(AUTO) && make objects
    6871
    6972$(DESTLIB)/libohana.a: $(LIB)/libohana.$(ARCH).a
    … …  
    7275        cp $(LIB)/libohana.$(ARCH).a $(DESTLIB)/libohana.a
    7376
    74 $(LIB)/libohana.$(ARCH).a: autocode $(OBJ1) $(AOBJ) $(OBJ2)
     77$(LIB)/libohana.$(ARCH).a: $(OBJ1) $(OBJ2) $(AOBJ)
    7578        @if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
    7679        rm -f $(LIB)/libohana.$(ARCH).a
    … …  
    9699.c.$(ARCH).o:
    97100        $(CC) $(CFLAGS) -c $*.c -o $@
    98         @echo done with $*.o
     101        @echo XXX done with $*.o

  • trunk/Ohana/src/libohana/include/dvo.h

    r3609 r4026  
    1717} FITS_DB;
    1818
     19# if (0)
    1920/* the standard astrometric coordinates structure */
    2021typedef struct {
    … …  
    2829  char     Npolyterms;
    2930} Coords;  /* 120 bytes / Coords */
     31# endif
    3032
    3133/* in fits_db.c */
    … …  
    3941int   fits_db_update              PROTO((FITS_DB *db, VTable *vtable));
    4042
    41 /* in coords.c */
     43/* in coords.c, using libautocode/def/coords.d */
    4244int  XY_to_RD (double *ra, double *dec, double x,  double y,   Coords *coords);
    4345int  RD_to_XY (double *x,  double *y,   double ra, double dec, Coords *coords);

  • trunk/Ohana/src/libohana/include/elixir.h

    r3609 r4026  
    1515
    1616# if (0)
    17 /* structure for Image Registration Database */
    18 typedef struct {
    19   char filename[64];
    20   char pathname[128];
    21   char filter[32];
    22   char instrument[32];
    23   char ccd;                        /* an identifier for CCD in mosaic (0 for single ccd) */
    24   char mode;                       /* MEF, SINGLE, SPLIT */
    25   char type;                       /* image type */
    26   char flag;                       /* image status flags */
    27   char seq;                        /* cube sequence number */
    28   char junk[23];
    29  
    30   float exptime;
    31   float airmass;
    32   float sky;
    33   float bias;
    34   float fwhm;
    35 
    36   float telfocus;
    37   float xprobe, yprobe, zprobe;
    38   float dettemp;
    39   float teltemp[4];
    40   float rotangle;
    41   float ra, dec;
    42 
    43   e_time obstime;
    44   e_time regtime;
    45 } RegImage;  /* 360 bytes / image */
    46 # endif
    47 
    48 # if (0)
    49 /* Detrend Database structure */
    50 typedef struct {
    51   e_time tstart;
    52   e_time tstop;
    53   e_time treg;
    54   float exptime;
    55   int type;
    56   int filter;
    57   int ccd;
    58   int Nentry;
    59   int Norder;
    60   char mode;
    61   char altpath;   /* true: data on alt db paths */
    62   char dummy[58]; /* for future expansion */
    63   char label[64];
    64   char filename[256];
    65 } DetReg;    /* 416 bytes */
    66 # endif
    67 
    6817/* average data as stored in the LONEOS database */
    6918typedef struct {
    … …  
    11160} SecFilt; /* 6 byte / SecFilt */
    11261
    113 /* image structure for binary data storage of image data */
    114 typedef struct {
    115   Coords         coords;            /* 120 bytes */
    116   unsigned int   tzero;             /* readout time row 0 in sec (0 - 142 years valid range) */
    117   unsigned int   nstar;             /* number of stars on image */
    118   short int      secz;              /* thousanths of airmass (valid range -32.000 -- 32.000) */
    119   short int      NX, NY;            /* dimensions of image */
    120   short int      apmifit, dapmifit; /* aperture correction and error in thousandths of mag */
    121   short int      source;            /* identifier for CCD (each ever used will have a unique letter) */
    122   short int      Mcal;              /* thousandths of mag (-32.000 -- 32.000 valid range) */
    123   short int      dMcal;             /* thousandths of mag (-32.000 -- 32.000 valid range) */
    124   short int      Xm;                /* 10*log(image chi-square) */
    125   char           name[32];          /* name of original image */
    126   unsigned char  detection_limit;   /* tenths of mag (0.0 - 25.6 valid range) */
    127   unsigned char  saturation_limit;  /* tenths of mag (0.0 - 25.6 valid range) */
    128   unsigned char  cerror;            /* astrometric error: 1/50 of arcsec (0 -- 5.12 valid range) */
    129   unsigned char  fwhm_x, fwhm_y;    /* PSF terms in 25*arcsec (valid range 0.0 -- 10.2" ") */
    130   unsigned char  trate;             /* 10000 * scan rate in sec/pix (0 -- 0.0256 valid range,
    131                                        typically 0.0146. this is used only to determine the time
    132                                        of the observation, not to find the coordinates.  1 byte
    133                                        gives 0.11 sec accuracy */
    134   float          exptime;           /* exposure time, seconds */
    135   char           code;              /* flag to mark an image as bad or whatever */
    136   unsigned char  ccdnum;            /* mosaic CCD ID number (IMAGEID) */
    137   char           dummy[20];         /* extra space for the future */
    138   short int      order;             /* number of terms used for Mrel */
    139   short int      Mx, My;
    140   short int      Mxx, Mxy, Myy;
    141   short int      Mxxx, Mxxy, Mxyy, Myyy;
    142   short int      Mxxxx, Mxxxy, Mxxyy, Mxyyy, Myyyy;
    143 } Image;  /* 240 bytes / Image */
    144 /* Image needs to be aligned with 8-byte boundaries on Suns */
    145 
    146 /************  end of database structures ************************************/
    147 
    148 /* structure for data on a catalog region */
    149 typedef struct {
    150   char filename[256];
    151   double DEC[2], RA[2];
    152 } GSCRegion;
    153 
    15462typedef struct {
    15563  unsigned short int code;   /* code number (stored in Measure.source) */
    … …  
    16371  float X[4];                /* color terms X[0]*mc + X[1]*mc^2 + X[2]*mc^3, etc */
    16472} PhotCode;
     73# endif
     74
     75/************  end of database structures ************************************/
     76
     77/* structure for data on a catalog region */
     78typedef struct {
     79  char filename[256];
     80  double DEC[2], RA[2];
     81} GSCRegion;
    16582
    16683typedef struct {

  • trunk/Ohana/src/libohana/include/loneos.h

    r3609 r4026  
    44
    55/************  database structures ************************************/
    6 
    7 /* structure for Image Registration Database */
    8 typedef struct {
    9   char filename[64];
    10   char pathname[128];
    11   char filter[32];
    12   char instrument[32];
    13   char ccd;                        /* an identifier for CCD in mosaic (0 for single ccd) */
    14   char mode;                       /* MEF, SINGLE, SPLIT */
    15   char type;                       /* image type */
    16   char flag;                       /* image status flags */
    17   char junk[24];
    18  
    19   float exptime;
    20   float airmass;
    21   float sky;
    22   float bias;
    23   float fwhm;
    24 
    25   float telfocus;
    26   float xprobe, yprobe, zprobe;
    27   float dettemp;
    28   float teltemp[4];
    29   float rotangle;
    30   float ra, dec;
    31 
    32   e_time obstime;
    33   e_time regtime;
    34 } RegImage;  /* 360 bytes / image */
    35 
    36 # if (0)
    37 /* Detrend Database structure */
    38 typedef struct {
    39   e_time tstart;
    40   e_time tstop;
    41   e_time treg;
    42   float exptime;
    43   int type;
    44   int filter;
    45   int ccd;
    46   int Nentry;
    47   int Norder;
    48   char mode;
    49   char altpath;   /* true: data on alt db paths */
    50   char dummy[58]; /* for future expansion */
    51   char label[64];
    52   char filename[256];
    53 } DetReg;    /* 416 bytes */
    54 # endif
    556
    567/* average data as stored in the LONEOS database -- must be translated on load */
    … …  
    9142} SecFilt; /* 6 byte / SecFilt */
    9243
    93 /* image structure for binary data storage of image data */
    9444typedef struct {
    95   Coords         coords;            /* 120 bytes */
    96   unsigned int   tzero;             /* readout time row 0 in sec (0 - 142 years valid range) */
    97   unsigned int   nstar;             /* number of stars on image */
    98   short int      secz;              /* thousanths of airmass (valid range -32.000 -- 32.000) */
    99   short int      NX, NY;            /* dimensions of image */
    100   short int      apmifit, dapmifit; /* aperture correction and error in thousandths of mag */
    101   short int      source;            /* identifier for CCD (each ever used will have a unique letter) */
    102   short int      Mcal;              /* thousandths of mag (-32.000 -- 32.000 valid range) */
    103   short int      dMcal;             /* thousandths of mag (-32.000 -- 32.000 valid range) */
    104   short int      Xm;                /* 10*log(image chi-square) */
    105   char           name[32];          /* name of original image */
    106   unsigned char  detection_limit;   /* tenths of mag (0.0 - 25.6 valid range) */
    107   unsigned char  saturation_limit;  /* tenths of mag (0.0 - 25.6 valid range) */
    108   unsigned char  cerror;            /* astrometric error: 1/50 of arcsec (0 -- 5.12 valid range) */
    109   unsigned char  fwhm_x, fwhm_y;    /* PSF terms in 25*arcsec (valid range 0.0 -- 10.2" ") */
    110   unsigned char  trate;             /* 10000 * scan rate in sec/pix (0 -- 0.0256 valid range,
    111                                        typically 0.0146. this is used only to determine the time
    112                                        of the observation, not to find the coordinates.  1 byte
    113                                        gives 0.11 sec accuracy */
    114   float          exptime;           /* exposure time, seconds */
    115   char           code;              /* flag to mark an image as bad or whatever */
    116   unsigned char  ccdnum;            /* mosaic CCD ID number (IMAGEID) */
    117   char           dummy[20];         /* extra space for the future */
    118   short int      order;             /* number of terms used for Mrel */
    119   short int      Mx, My;
    120   short int      Mxx, Mxy, Myy;
    121   short int      Mxxx, Mxxy, Mxyy, Myyy;
    122   short int      Mxxxx, Mxxxy, Mxxyy, Mxyyy, Myyyy;
    123 } Image;  /* 240 bytes / Image */
    124 /* Image needs to be aligned with 8-byte boundaries on Suns */
     45  unsigned short int code;   /* code number (stored in Measure.source) */
     46  char name[32];             /* name for filter combination */
     47  char type;                 /* primary, secondary, dependent, reference */
     48  short int C, dC, dX;       /* primary phot calibration terms (millimags) */
     49  float K;                   /* secondary phot calibration terms (millimags) */
     50  int  c1, c2;               /* color is average.M[c1] - average.M[c2] */
     51  int  equiv;                /* this dependent filter is equivalent to equiv primary/secondary */
     52  int  Nc;                   /* number of color terms */
     53  float X[4];                /* color terms X[0]*mc + X[1]*mc^2 + X[2]*mc^3, etc */
     54} PhotCode;
     55
     56/************  end of database structures ************************************/
    12557
    12658/* a catalog contains this data */
    … …  
    15082  double DEC[2], RA[2];
    15183} GSCRegion;
    152 
    153 typedef struct {
    154   unsigned short int code;   /* code number (stored in Measure.source) */
    155   char name[32];             /* name for filter combination */
    156   char type;                 /* primary, secondary, dependent, reference */
    157   short int C, dC, dX;       /* primary phot calibration terms (millimags) */
    158   float K;                   /* secondary phot calibration terms (millimags) */
    159   int  c1, c2;               /* color is average.M[c1] - average.M[c2] */
    160   int  equiv;                /* this dependent filter is equivalent to equiv primary/secondary */
    161   int  Nc;                   /* number of color terms */
    162   float X[4];                /* color terms X[0]*mc + X[1]*mc^2 + X[2]*mc^3, etc */
    163 } PhotCode;
    16484
    16585typedef struct {
Note: See TracChangeset for help on using the changeset viewer.