IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 7691


Ignore:
Timestamp:
Jun 25, 2006, 8:01:37 PM (20 years ago)
Author:
eugene
Message:

updated load2mass

Location:
trunk/Ohana/src/addstar
Files:
2 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/addstar/Makefile

    r7688 r7691  
    9393LOAD-2MASS = \
    9494$(SRC)/load2mass.$(ARCH).o \
    95 $(SRC)/load2mass_as_data.$(ARCH).o \
     95$(SRC)/load2mass_as_rawdata.$(ARCH).o \
    9696$(SRC)/get2mass_ops.$(ARCH).o \
    97 $(SRC)/ConfigInit.$(ARCH).o \
    98 $(SRC)/args.$(ARCH).o \
     97$(SRC)/find_matches_refstars.$(ARCH).o \
     98$(SRC)/load_pt_catalog.$(ARCH).o \
     99$(SRC)/args_load2mass.$(ARCH).o \
     100$(SRC)/sort_lists.$(ARCH).o \
     101$(SRC)/replace_match.$(ARCH).o \
     102$(SRC)/update_coords.$(ARCH).o \
     103$(SRC)/gcatalog.$(ARCH).o \
     104$(SRC)/mkcatalog.$(ARCH).o \
     105$(SRC)/wcatalog.$(ARCH).o \
     106$(SRC)/ConfigInit.$(ARCH).o \
    99107$(SRC)/Shutdown.$(ARCH).o \
    100108$(SRC)/SetSignals.$(ARCH).o
    … …  
    244252scan2mass.install        : $(DESTBIN)/scan2mass
    245253
     254load2mass                : $(BIN)/load2mass.$(ARCH)
     255$(BIN)/load2mass.$(ARCH) : $(LOAD-2MASS)
     256load2mass.install        : $(DESTBIN)/load2mass
     257
    246258all: addstar addstarc addstard addstart
    247259

  • trunk/Ohana/src/addstar/include/2mass.h

    r7688 r7691  
    3030
    3131char *skipNbounds (char *line, char bound, int Nbound, int Nbyte);
    32 e_time get2mass_time (char *ptr, char *buffer, int Nbound, int Nbyte);
     32e_time get2mass_time (char *ptr, int Nbound, int Nbyte);
     33
     34int load2mass_as_rawdata (SkyTable *skytable, char *filename, AddstarClientOptions options);
     35SkyTable *load2mass_acc (char *path, char *accel);
     36int get2mass_3star (Stars *star, char *line, int Nmax);

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

    r7683 r7691  
    138138Stars     *grefstars              PROTO((char *file, int photcode, int *Nstars));
    139139Stars     *gstars                 PROTO((char *file, int *NSTARS, int photcode, Image *image));
    140 void       help                   PROTO(());
    141140int        in_image               PROTO((double r, double d, Image *image));
    142141int        load_pt_catalog        PROTO((Catalog *catalog, SkyRegion *region));  /*** choose new name ***/
    … …  
    191190
    192191AddstarClientOptions args_client (int argc, char **argv, AddstarClientOptions options);
     192AddstarClientOptions args_load2mass (int argc, char **argv, AddstarClientOptions options);
    193193
    194194void args_server (int argc, char **argv);

  • trunk/Ohana/src/addstar/src/Shutdown.c

    r7080 r7691  
    2222
    2323  SetProtect (TRUE);
    24   gfits_db_close (db);
     24  if (db != NULL) gfits_db_close (db);
    2525  fprintf (stderr, "ERROR: addstar halted\n");
    2626  exit (1);

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

    r7080 r7691  
    11# include "addstar.h"
    2 void help (void);
     2static void help (void);
    33
    44AddstarClientOptions args (int argc, char **argv, AddstarClientOptions options) {
    … …  
    283283}
    284284
    285 void help () {
     285static void help () {
    286286
    287287  fprintf (stderr, "USAGE\n");

  • trunk/Ohana/src/addstar/src/args_client.c

    r7080 r7691  
    11# include "addstar.h"
    2 void help (void);
     2static void help (void);
    33
    44AddstarClientOptions args_client (int argc, char **argv, AddstarClientOptions options) {
    … …  
    212212}
    213213
    214 void help () {
     214static void help () {
    215215
    216216  fprintf (stderr, "USAGE\n");

  • trunk/Ohana/src/addstar/src/args_server.c

    r5445 r7691  
    11# include "addstar.h"
    2 void help (void);
     2static void help (void);
    33
    44void args_server (int argc, char **argv) {
    … …  
    5757}
    5858
    59 void help () {
     59static void help () {
    6060
    6161  fprintf (stderr, "USAGE\n");

  • trunk/Ohana/src/addstar/src/find_matches_refstars.c

    r6683 r7691  
    322322  }
    323323
     324  free (X1);
     325  free (Y1);
     326  free (N1);
     327  free (X2);
     328  free (Y2);
     329  free (N2);
     330  free (next);
     331  free (next_miss);
     332
    324333  catalog[0].Naverage = Nave;
    325334  catalog[0].Nmeasure = Nmeas;

  • trunk/Ohana/src/addstar/src/get2mass_ops.c

    r7688 r7691  
    99int get2mass_setup (int photcode) {
    1010
     11  NAMED_PHOTCODE (TM_J, "2MASS_J");
     12  NAMED_PHOTCODE (TM_H, "2MASS_H");
     13  NAMED_PHOTCODE (TM_K, "2MASS_K");
     14
    1115  FilterSkip = TimeSkip = Qentry = 0;
    1216  Photcode = photcode;
    … …  
    3135}
    3236
     37// fill in the data for a single star.  takes a pointer to the start of the line
    3338int get2mass_star (Stars *star, char *line, int Nmax) {
    3439
    35   ptr = skipNbounds (p, '|', FilterSkip, Nmax);
     40  char *ptr, qc;
     41  double M, dM;
     42  e_time time;
     43
     44  ptr = skipNbounds (line, '|', FilterSkip, Nmax);
    3645  if (ptr == NULL) Shutdown ("format error in 2mass");
    3746  M  = strtod (ptr, NULL);
    3847  ptr = skipNbounds (ptr, '|', 1, Nmax - (ptr - line));
    3948  dM = strtod (ptr, NULL);
    40   time = get2mass_time (ptr, buffer, TimeSkip, Nbyte);
     49  time = get2mass_time (ptr, TimeSkip, Nmax - (ptr - line));
    4150
    4251  /* filter on the ph_qual flag for this filter (field 19) */
    4352  if (SELECT_2MASS_QUALITY != NULL) {
    44     ptr = skipNbounds (p, '|', 18, Nmax - (ptr - line));
     53    ptr = skipNbounds (line, '|', 18, Nmax);
    4554    qc  = ptr[Qentry];
    4655    if (strchr (SELECT_2MASS_QUALITY, qc) == NULL) return (FALSE);
    4756  }
    4857
    49   stars[0].M     = M;
    50   stars[0].dM    = dM;
    51   stars[0].code  = photcode;
    52   stars[0].t     = time;
    53   stars[0].found = -1;
    54 
    55   return TRUE;
    56 }
    57 
    58 int get2mass_coords (Stars *star, double *R, double *D, int Nmax) {
    59 
    60   *R = strtod (p, NULL);
    61   ptr = skipNbounds (p, '|', 1, Nmax);
     58  star[0].M     = M;
     59  star[0].dM    = dM;
     60  star[0].code  = Photcode;
     61  star[0].t     = time;
     62  star[0].found = -1;
     63
     64  return TRUE;
     65}
     66
     67// fill in the data for a JHK triplet star.  takes a pointer to the start of the line
     68int get2mass_3star (Stars *star, char *line, int Nmax) {
     69
     70  char *ptr;
     71  char Jquality, Hquality, Kquality;
     72  double J, dJ, H, dH, K, dK;
     73  e_time time;
     74
     75  ptr = line;
     76  if (ptr == NULL) Shutdown ("format error in 2mass");
     77
     78  ptr = skipNbounds (ptr, '|', 6, Nmax - (ptr - line));
     79  J  = strtod (ptr, NULL);
     80  ptr = skipNbounds (ptr, '|', 1, Nmax - (ptr - line));
     81  dJ = strtod (ptr, NULL);
     82
     83  ptr = skipNbounds (ptr, '|', 3, Nmax - (ptr - line));
     84  H  = strtod (ptr, NULL);
     85  ptr = skipNbounds (ptr, '|', 1, Nmax - (ptr - line));
     86  dH = strtod (ptr, NULL);
     87
     88  ptr = skipNbounds (ptr, '|', 3, Nmax - (ptr - line));
     89  K  = strtod (ptr, NULL);
     90  ptr = skipNbounds (ptr, '|', 1, Nmax - (ptr - line));
     91  dK = strtod (ptr, NULL);
     92
     93  /* filter on the ph_qual flag for this filter (field 19) */
     94  if (SELECT_2MASS_QUALITY != NULL) {
     95    ptr = skipNbounds (ptr, '|', 3, Nmax - (ptr - line));
     96    Jquality = (strchr (SELECT_2MASS_QUALITY, ptr[0]) != NULL);
     97    Hquality = (strchr (SELECT_2MASS_QUALITY, ptr[1]) != NULL);
     98    Kquality = (strchr (SELECT_2MASS_QUALITY, ptr[2]) != NULL);
     99    time = get2mass_time (ptr, 18, Nmax - (ptr - line));
     100  } else {
     101    time = get2mass_time (ptr, 20, Nmax - (ptr - line));
     102  }
     103
     104  star[0].M     = J;
     105  star[0].dM    = dJ;
     106  star[0].code  = TM_J;
     107  star[0].t     = time;
     108  star[0].found = -1;
     109
     110  star[1].M     = H;
     111  star[1].dM    = dH;
     112  star[1].code  = TM_H;
     113  star[1].t     = time;
     114  star[1].found = -1;
     115
     116  star[2].M     = K;
     117  star[2].dM    = dK;
     118  star[2].code  = TM_K;
     119  star[2].t     = time;
     120  star[2].found = -1;
     121
     122  return TRUE;
     123}
     124
     125// fill in the coords for a single star.  takes a pointer to the start of the line
     126int get2mass_coords (char *line, double *R, double *D, int Nmax) {
     127
     128  char *ptr;
     129
     130  *R = strtod (line, NULL);
     131  ptr = skipNbounds (line, '|', 1, Nmax);
    62132  *D = strtod (ptr, NULL);
    63133  if (*D > 90) Shutdown ("weird DEC value: something is wrong");

  • trunk/Ohana/src/addstar/src/load2mass.c

    r7688 r7691  
    66  char *path;
    77  int i, N, Nrefcat;
    8   SkyTable *sky;
    9 
    10   if (argc == 2) {
    11     load2mass_as_data (argv[1]);
    12     exit (0);
    13   }
     8  SkyTable *sky, *sky2mass;
     9  AddstarClientOptions options;
    1410
    1511  // need to construct these options with args_load2mass...
    1612  options = ConfigInit (&argc, argv);
    17   options = args (argc, argv, options);
     13  options = args_load2mass (argc, argv, options);
    1814
    1915  sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, SKY_DEPTH, VERBOSE);
    2016  SkyTableSetFilenames (sky, CATDIR, "cpt");
    2117 
    22   if (argc != 1) {
    23     fprintf (stderr, "USAGE: load2mass [options: see addstar]\n");
    24     exit (2);
    25   }
    26 
    2718  path = TWO_MASS_DIR_AS;
    2819
    2920  // the accel.dat file has the raw filenames
    3021  // test if the file exists, or else try the .gz version
    31   sky = load2mass_acc (path, "accel.dat");
     22  sky2mass = load2mass_acc (path, "accel.dat");
    3223 
    33   for (i = 0; i < sky[0].Nregions; i++) {
     24  for (i = 0; i < sky2mass[0].Nregions; i++) {
    3425    fprintf (stderr, "loading %s\n", sky[0].filename[i]);
    35     load2mass_as_data (skytable, sky[0].filename[i], options);
     26    load2mass_as_rawdata (sky, sky2mass[0].filename[i], options);
    3627  }
    3728  exit (0);

  • trunk/Ohana/src/addstar/src/load_pt_catalog.c

    r6674 r7691  
    1515  case 1:
    1616    gcatalog (catalog); /* load from disk */
     17    if (VERBOSE) fprintf (stderr, "loading existing file %s\n", catalog[0].filename);
    1718    break;
    1819  case 2:
    1920    mkcatalog (region, catalog); /* fills in new header info */
     21    if (VERBOSE) fprintf (stderr, "creating new file %s\n", catalog[0].filename);
    2022    break;
    2123  }
Note: See TracChangeset for help on using the changeset viewer.