IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4808


Ignore:
Timestamp:
Aug 17, 2005, 9:06:17 AM (21 years ago)
Author:
eugene
Message:

cleanup Wall,Werror; convert to internal measure R,D

Location:
trunk/Ohana/src/photdbc
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/photdbc/Makefile

    r2510 r4808  
    3333$(SRC)/gcatalog.$(ARCH).o        \
    3434$(SRC)/misc.$(ARCH).o            \
    35 $(SRC)/time.$(ARCH).o            \
    3635$(SRC)/join_stars.$(ARCH).o      \
    3736$(SRC)/unique_measures.$(ARCH).o \

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

    r3466 r4808  
    6969GSCRegion    *load_images (char *seed, int *nregion);
    7070GSCRegion    *name_region (char *name, int *Nregions);
    71 char         *sec_to_date (unsigned long second);
    7271void          ConfigInit (int *argc, char **argv);
    73 int           Fseek (FILE *f, long offset, int whence);
    7472int           args (int argc, char **argv);
    75 int           chk_time (char *line);
    7673int           corner_check (double *x1, double *y1, double *x2, double *y2);
    77 int           dms_to_ddd (double *Value, char *string);
    7874int           edge_check (double *x1, double *y1, double *x2, double *y2);
    7975void          flag_measures (Catalog *catalog);
    … …  
    8177void          get_mags (Catalog *catalog);
    8278void          getfullregion (Image *image, int Nimage, GSCRegion *fullregion);
    83 int           hms_to_deg (double *h0, double *h1, double *d0, double *d1, char *string);
    8479void          initialize (int argc, char **argv);
    8580void          initstats (char *mode);
    8681void          join_stars (Catalog *catalog);
    8782int           liststats (double *value, double *dvalue, int N, StatType *stats);
    88 unsigned long jd_to_sec (double jd);
    89 unsigned long date_to_sec (char *date);
    9083double        opening_angle (double x1, double y1, double x2, double y2, double x3, double y3);
    91 double        sec_to_jd (unsigned long second);
    9284void          set_ZP (double ZERO);
    9385void          sortA (double *X, int N);
    … …  
    9789void          sort_lists (float *X, float *Y, int *index, int N);
    9890void          sort_time (unsigned int *X, int *Y, int N);
    99 int           str_to_dtime (char *line, double *second);
    100 int           str_to_radec (double *ra, double *dec, char *str1, char *str2);
    101 int           str_to_time (char *line, unsigned int *second);
    10291void          unique_measures (Catalog *catalog);
    10392void          wcatalog (Catalog *catalog);
     93Catalog *subcatalog (Catalog *catalog);
     94void check_directory (char *basefile);

  • trunk/Ohana/src/photdbc/src/args.c

    r2494 r4808  
    2121    exit (2);
    2222  }
    23 
     23  return (TRUE);
    2424}
    2525

  • trunk/Ohana/src/photdbc/src/check_directory.c

    r3517 r4808  
    11# include "photdbc.h"
    22
    3 check_directory (char *basefile) {
     3void check_directory (char *basefile) {
    44 
    5   FILE *f;
    65  char *c, dir[256], filename[256];
    76  struct stat filestat;
    8   uid_t fuid, uid;
    9   gid_t fgid, gid;
     7  uid_t uid;
     8  gid_t gid;
    109  int status, cmode;
    1110
    … …  
    1413
    1514  /* check permission to write to directory */
    16   sprintf (filename, "%s\0", basefile);
     15  sprintf (filename, "%s", basefile);
    1716  c = strrchr (filename, '/');
    1817  if (c == (char *) NULL) {

  • trunk/Ohana/src/photdbc/src/find_images.c

    r2616 r4808  
    1111  Header header;
    1212  Image *timage, *image;
    13   int i, j, k, m, found, nimage, Nimage, NIMAGE, NTIMAGE, Nloop, Nlast;
    14   int n, Nim, status, InRange, np, Np;
     13  int i, j, k, m, found, nimage, Nimage, NIMAGE;
     14  int status, InRange;
    1515  FILE *f;
    1616  double Xc[5], Yc[5], Xi[5], Yi[5], r, d, dx, dy;
    17   char line[256];
    1817  int *line_number;
    1918  Coords tcoords;

  • trunk/Ohana/src/photdbc/src/flag_measures.c

    r2494 r4808  
    44
    55  int i, j, k, m, n, N, found;
    6   int *imagelink, Nimage, Nmeasure, Nlist, PhotNsec;
     6  int *imagelink, Nimage, Nlist, PhotNsec;
    77  unsigned int Time;
    88  int Ncode, Photcode, Minst, Mag, BAD_MEASURE;
    … …  
    4545  for (i = 0; i < catalog[0].Nmeasure; i++) {
    4646    n = catalog[0].measure[i].averef;
    47     ra  = catalog[0].average[n].R - catalog[0].measure[i].dR / 360000.0;
    48     dec = catalog[0].average[n].D - catalog[0].measure[i].dD / 360000.0;
     47    ra  = catalog[0].average[n].R_PS - catalog[0].measure[i].dR_PS / 3600.0;
     48    dec = catalog[0].average[n].D_PS - catalog[0].measure[i].dD_PS / 3600.0;
    4949    k = imagelink[i];
    5050    RD_to_XY (&x, &y, ra, dec, &image[k].coords);

  • trunk/Ohana/src/photdbc/src/gcatalog.c

    r2494 r4808  
    33int gcatalog (Catalog *catalog) {
    44 
    5   char mode, status;
     5  char mode;
    66
    77  mode = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;

  • trunk/Ohana/src/photdbc/src/get_regions.c

    r2494 r4808  
    5555  /* use the pole regions, if near pole */
    5656  if (maxDec > 86.25) {
    57     sprintf (regions[nregions].filename, "n8230/pole.cpt\0");
     57    sprintf (regions[nregions].filename, "n8230/pole.cpt");
    5858    regions[nregions].RA[0] = 0;
    5959    regions[nregions].RA[1] = 360;
    … …  
    118118      if ((DEC1 > 0) && (minDec < DEC1) && (maxDec > DEC0) && (minRa < RA1) && (maxRa > RA0)) {
    119119        temp[5] = 0;
    120         sprintf (regions[nregions].filename, "%s/%s.cpt\0", Dec2Sections[NBigDec + j], &temp[1]);
     120        sprintf (regions[nregions].filename, "%s/%s.cpt", Dec2Sections[NBigDec + j], &temp[1]);
    121121        regions[nregions].RA[0] = RA0;
    122122        regions[nregions].RA[1] = RA1;
    … …  
    131131      if ((DEC1 < 0) && (minDec < DEC0) && (maxDec > DEC1) && (minRa < RA1) && (maxRa > RA0)) {
    132132        temp[5] = 0;
    133         sprintf (regions[nregions].filename, "%s/%s.cpt\0", Dec2Sections[NBigDec + j], &temp[1]);
     133        sprintf (regions[nregions].filename, "%s/%s.cpt", Dec2Sections[NBigDec + j], &temp[1]);
    134134        regions[nregions].RA[0] = RA0;
    135135        regions[nregions].RA[1] = RA1;

  • trunk/Ohana/src/photdbc/src/initialize.c

    r2494 r4808  
    22
    33void initialize (int argc, char **argv) {
    4 
    5   int Np;
    6   double tmp;
    74
    85  /* are these set correctly? */
    … …  
    2623                                                     
    2724    fprintf (stderr, "CHISQ_MAX:             %lf\n", CHISQ_MAX);
    28     fprintf (stderr, "NMEAS_MIN:             %lf\n", NMEAS_MIN);
     25    fprintf (stderr, "NMEAS_MIN:             %d\n", NMEAS_MIN);
    2926
    3027    fprintf (stderr, "IMAGE_CATALOG          %s\n",  ImageCat);

  • trunk/Ohana/src/photdbc/src/join_stars.c

    r2494 r4808  
    33void join_stars (Catalog *catalog) {
    44
    5   int i, j, k, m, M, Ni, Nj, first_j, Ns1, Ns2;
     5  int i, j, k, m, M, Ni, Nj, first_j;
    66  int Naves, Nmeas, Ncurr;
    77  int Naverage, Nmeasure, *found, *index;
    … …  
    2828  Rmid = Dmid = 0;
    2929  for (i = 0; i < Naverage; i++) {
    30     Rmid += average[i].R;
    31     Dmid += average[i].D;
     30    Rmid += average[i].R_PS;
     31    Dmid += average[i].D_PS;
    3232  }
    3333  Rmid /= Naverage;
    … …  
    5050  for (i = 0; i < Naverage; i++) {
    5151    index[i] = i;
    52     fRD_to_XY (&X[i], &Y[i], average[i].R, average[i].D, &tcoords);
     52    fRD_to_XY (&X[i], &Y[i], average[i].R_PS, average[i].D_PS, &tcoords);
    5353  }
    5454  sort_lists (X, Y, index, Naverage);
    … …  
    7777        mpointer[Nmeas].measure = m;
    7878        mpointer[Nmeas].averef  = Naves;
    79         mpointer[Nmeas].R       = average[Ni].R - measure[m].dR / 360000.0;
    80         mpointer[Nmeas].D       = average[Ni].D - measure[m].dD / 360000.0;
     79        mpointer[Nmeas].R       = average[Ni].R_PS - measure[m].dR_PS / 3600.0;
     80        mpointer[Nmeas].D       = average[Ni].D_PS - measure[m].dD_PS / 3600.0;
    8181        Nmeas ++;
    8282      }
    … …  
    113113          mpointer[Nmeas].measure = m;
    114114          mpointer[Nmeas].averef  = Ncurr;
    115           mpointer[Nmeas].R       = average[Nj].R - measure[m].dR / 360000.0;
    116           mpointer[Nmeas].D       = average[Nj].D - measure[m].dD / 360000.0;
     115          mpointer[Nmeas].R       = average[Nj].R_PS - measure[m].dR_PS / 3600.0;
     116          mpointer[Nmeas].D       = average[Nj].D_PS - measure[m].dD_PS / 3600.0;
    117117          Nmeas ++;
    118118        }
    … …  
    130130        Sr = Sr / naverage[Ncurr].Nm;
    131131        Sd = Sd / naverage[Ncurr].Nm;
    132         naverage[Ncurr].R = Sr;
    133         naverage[Ncurr].D = Sd;
     132        naverage[Ncurr].R_PS = Sr;
     133        naverage[Ncurr].D_PS = Sd;
    134134
    135135        /* update original measurement offsets */
    … …  
    137137          m = naverage[Ncurr].offset + k;
    138138          M = mpointer[m].measure;
    139           measure[M].dR = 360000.0*(Sr - mpointer[m].R);
    140           measure[M].dD = 360000.0*(Sd - mpointer[m].D);
     139          measure[M].dR_PS = 3600.0*(Sr - mpointer[m].R);
     140          measure[M].dD_PS = 3600.0*(Sd - mpointer[m].D);
    141141        }
    142142

  • trunk/Ohana/src/photdbc/src/load_catalogs.c

    r2494 r4808  
    33Catalog *load_catalogs (GSCRegion *region, int Nregion) {
    44
    5   int i, Nstar;
     5  int i;
    66  Catalog *catalog;
    77

  • trunk/Ohana/src/photdbc/src/load_images.c

    r2494 r4808  
    88
    99  GSCRegion *region;
    10   int       Nregion, Ntimage;
    11   Image     *timage;
     10  int       Nregion;
    1211
    1312  region = name_region (seed, &Nregion);

  • trunk/Ohana/src/photdbc/src/photdbc.c

    r2494 r4808  
    4040  }
    4141  wcatalog (catalog);
     42  exit (0);
    4243}
    43 
    4444
    4545/** this program is somewhat rough: minimal error checking
    4646    -
    4747    only one catalog is loaded, corresponding to region file
    48    
    49 
    50 
    51 
    5248 */

  • trunk/Ohana/src/photdbc/src/subcatalog.c

    r2494 r4808  
    33Catalog *subcatalog (Catalog *catalog) {
    44 
    5   int i, j, offset, ecode;
     5  int i, j, offset;
    66  int NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm, Nsecfilt;
    77  int mag;
    … …  
    2727
    2828    /* exclude stars not in range */
    29     if (catalog[0].average[i].R < RMIN) continue;
    30     if (catalog[0].average[i].R > RMAX) continue;
    31     if (catalog[0].average[i].D < DMIN) continue;
    32     if (catalog[0].average[i].D > DMAX) continue;
     29    if (catalog[0].average[i].R_PS < RMIN) continue;
     30    if (catalog[0].average[i].R_PS > RMAX) continue;
     31    if (catalog[0].average[i].D_PS < DMIN) continue;
     32    if (catalog[0].average[i].D_PS > DMAX) continue;
    3333
    3434    /* assign average and secfilt values */

  • trunk/Ohana/src/photdbc/src/unique_measures.c

    r2494 r4808  
    88  unsigned int *tlist;
    99  Measure *mlist, *nmeasure;
    10   double dR, dD, R;
     10  double dR, dD, R, RADIUS2;
    1111  Average *p;
    1212
    … …  
    2222  ALLOCATE (mlist, Measure, Nlist);
    2323
     24  RADIUS2 = SQ(UNIQ_RADIUS);
     25 
    2426  p = catalog[0].average;
    2527  for (i = 0; i < catalog[0].Naverage; i++) {
    … …  
    5860      }
    5961     
    60       dR = (catalog[0].measure[ilist[j]].dR - catalog[0].measure[ilist[k]].dR);
    61       dD = (catalog[0].measure[ilist[j]].dD - catalog[0].measure[ilist[k]].dD);
     62      dR = (catalog[0].measure[ilist[j]].dR_PS - catalog[0].measure[ilist[k]].dR_PS);
     63      dD = (catalog[0].measure[ilist[j]].dD_PS - catalog[0].measure[ilist[k]].dD_PS);
    6264      R = SQ(dR) + SQ(dD);
    6365     
    64       /* dR, dD in 1/100 arcsec, RADIUS is 0.1 arcsec */
    65       if (R < UNIQ_RADIUS) {
     66      /* dR, dD in arcsec, RADIUS is 0.1 arcsec */
     67      if (R < RADIUS2) {
    6668        /* matched pair */
    6769        catalog[0].measure[ilist[k]].flags |= FLAG_DUPMEAS;
Note: See TracChangeset for help on using the changeset viewer.