IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 27583


Ignore:
Timestamp:
Apr 2, 2010, 3:57:21 PM (16 years ago)
Author:
eugene
Message:

created dvoconvert

Location:
trunk/Ohana/src/dvomerge
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/dvomerge/Makefile

    r27435 r27583  
    1 default: dvomerge
     1default: all
    22help:
    33        @echo "make options: dvomerge (default)"
    … …  
    1818
    1919dvomerge     : $(BIN)/dvomerge.$(ARCH)
    20 all: dvomerge
     20dvomerge     : $(BIN)/dvoconvert.$(ARCH)
     21
     22all: dvomerge dvoconvert
    2123
    2224DVOMERGE = \
    … …  
    4143$(BIN)/dvomerge.$(ARCH) : $(DVOMERGE)
    4244
    43 INSTALL = dvomerge
     45DVOCONVERT = \
     46$(SRC)/dvoconvert.$(ARCH).o \
     47$(SRC)/SetSignals.$(ARCH).o \
     48$(SRC)/ConfigInit.$(ARCH).o \
     49$(SRC)/Shutdown.$(ARCH).o \
     50$(SRC)/help.$(ARCH).o \
     51$(SRC)/args.$(ARCH).o \
     52$(SRC)/SkyTablePopulatedRange.$(ARCH).o \
     53$(SRC)/LoadCatalog.$(ARCH).o \
     54$(SRC)/merge_catalogs_new.$(ARCH).o
     55
     56$(DVOCONVERT)  : $(INC)/dvomerge.h
     57
     58$(BIN)/dvoconvert.$(ARCH) : $(DVOCONVERT)
     59
     60INSTALL = dvomerge dvoconvert
    4461
    4562# dependancy rules for binary code #########################

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

    r27435 r27583  
    4646int        Shutdown               PROTO((char *format, ...)) OHANA_FORMAT(printf, 1, 2);
    4747
    48 void       usage                  PROTO((void));
    49 void       help                   PROTO((int argc, char **argv));
    50 int        args                   PROTO((int *argc, char **argv));
     48void       dvomerge_usage         PROTO((void));
     49void       dvomerge_help          PROTO((int argc, char **argv));
     50int        dvomerge_args          PROTO((int *argc, char **argv));
     51
     52void       dvoconvert_usage       PROTO((void));
     53void       dvoconvert_help        PROTO((int argc, char **argv));
     54int        dvoconvert_args        PROTO((int *argc, char **argv));
    5155
    5256int        SkyTablePopulatedRange PROTO((off_t *ns, off_t *ne, SkyTable *sky, off_t Nstart));

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

    r27435 r27583  
    22
    33/*** check for command line options ***/
    4 int args (int *argc, char **argv) {
     4int dvomerge_args (int *argc, char **argv) {
    55 
    6   int N, CONFIRM;
    7 
    8   /*** provide additional data ***/
    9   /* restrict to a portion of the sky? (REFCAT only) */
    10   UserPatch.Rmin = 0;
    11   UserPatch.Rmax = 360;
    12   UserPatch.Dmin = -90;
    13   UserPatch.Dmax = +90;
    14   CONFIRM = TRUE;
    15   if ((N = get_argument (*argc, argv, "-region"))) {
    16     remove_argument (N, argc, argv);
    17     UserPatch.Rmin = atof (argv[N]);
    18     remove_argument (N, argc, argv);
    19     UserPatch.Rmax = atof (argv[N]);
    20     remove_argument (N, argc, argv);
    21     UserPatch.Dmin = atof (argv[N]);
    22     remove_argument (N, argc, argv);
    23     UserPatch.Dmax = atof (argv[N]);
    24     remove_argument (N, argc, argv);
    25     CONFIRM = FALSE;
    26   }
     6  int N;
    277
    288  /* extra error messages */
    … …  
    3313  }
    3414
    35   if ((*argc != 6) && (*argc != 4)) usage();
     15  if ((*argc != 6) && (*argc != 4)) dvomerge_usage();
    3616  return TRUE;
    3717}
     18
     19/*** check for command line options ***/
     20int dvoconvert_args (int *argc, char **argv) {
     21 
     22  int N;
     23
     24  /* extra error messages */
     25  VERBOSE = FALSE;
     26  if ((N = get_argument (*argc, argv, "-v"))) {
     27    VERBOSE = TRUE;
     28    remove_argument (N, argc, argv);
     29  }
     30
     31  if (*argc != 4) dvoconvert_usage();
     32  return TRUE;
     33}

  • trunk/Ohana/src/dvomerge/src/dvomerge.c

    r27435 r27583  
    44
    55  SetSignals ();
    6   help (argc, argv);
     6  dvomerge_help (argc, argv);
    77  ConfigInit (&argc, argv);
    8   args (&argc, argv);
     8  dvomerge_args (&argc, argv);
    99
    1010  if (argc == 6) dvomergeCreate (argc, argv);
    1111  if (argc == 4) dvomergeUpdate (argc, argv);
    12   usage();
     12  dvomerge_usage();
    1313  exit (2); // cannot reach here.
    1414}

  • trunk/Ohana/src/dvomerge/src/dvomergeCreate.c

    r27435 r27583  
    1313  IDmapType IDmap1, IDmap2;
    1414
    15   if (strcasecmp (argv[2], "and")) usage();
    16   if (strcasecmp (argv[4], "to")) usage();
     15  if (strcasecmp (argv[2], "and")) dvomerge_usage();
     16  if (strcasecmp (argv[4], "to")) dvomerge_usage();
    1717
    1818  input1 = argv[1];

  • trunk/Ohana/src/dvomerge/src/dvomergeUpdate.c

    r27435 r27583  
    1111  IDmapType IDmap;
    1212
    13   if (strcasecmp (argv[2], "into")) usage();
     13  if (strcasecmp (argv[2], "into")) dvomerge_usage();
    1414
    1515  input  = argv[1];

  • trunk/Ohana/src/dvomerge/src/help.c

    r27435 r27583  
    11# include "dvomerge.h"
    22
    3 void usage (void) {
     3void dvomerge_usage (void) {
    44  fprintf (stderr, "USAGE: dvomerge (input1) and (input2) to (output)\n");
    55  fprintf (stderr, "   OR: dvomerge (input) into (output)\n");
    … …  
    77}
    88
    9 void help (int argc, char **argv) {
     9void dvoconvert_usage(void) {
     10
     11  fprintf (stderr, "USAGE: dvoconvert (input) to (output)\n");
     12
     13  exit (2);
     14}
     15
     16void dvomerge_help (int argc, char **argv) {
    1017
    1118  /* check for help request */
    … …  
    1724
    1825  fprintf (stderr, "USAGE\n");
    19   fprintf (stderr, "  dvosplit (newlevel)\n\n");
     26  fprintf (stderr, "  dvomerge (input1) and (input2) to (output)\n");
     27  fprintf (stderr, "  dvomerge (input) into (output)\n\n");
     28  fprintf (stderr, "  merge DVO databases\n");
    2029  fprintf (stderr, "  optional flags:\n");
    21   fprintf (stderr, "  -region ra ra dec dec       : migrate catalogs in specified region\n");
    2230  fprintf (stderr, "  -v                          : verbose mode\n");
    2331  fprintf (stderr, "  -help                       : this list\n");
    … …  
    2634}
    2735
    28 /** addstar modes:
     36void dvoconvert_help (int argc, char **argv) {
     37
     38  /* check for help request */
     39  if (get_argument (argc, argv, "-help")) goto show_help;
     40  if (get_argument (argc, argv, "-h"))    goto show_help;
     41  return;
     42
     43show_help:
     44
     45  fprintf (stderr, "USAGE\n");
     46  fprintf (stderr, "  dvoconvert (input) to (output)\n\n");
     47
     48  fprintf (stderr, "  change output format and mode with\n");
     49  fprintf (stderr, "  -D CATFORMAT (format)\n");
     50  fprintf (stderr, "  -D CATMODE (mode)\n\n");
    2951 
    30     addstar (image.smp)  - add cmp/smp image data to db
    31     addstar -ref (file.dat) (photcode)
    32     addstar -cat (USNO/2MASS/GSC) -region (ra dec - ra dec)
     52  fprintf (stderr, "  optional flags:\n");
     53  fprintf (stderr, "  -v                          : verbose mode\n");
     54  fprintf (stderr, "  -help                       : this list\n");
     55  fprintf (stderr, "  -h                          : this list\n\n");
     56  exit (2);
     57}
    3358
    34     -replace : ref/cat - replace existing match (photcode/time)
    35     -match   : ref/cat - only add measures to existing averages
    36 
    37     ref types:
    38     ASCII - RA,DEC,M,dM in a table
    39 
    40     addstar
    41 
    42 **/

  • trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c

    r27435 r27583  
    260260
    261261    output[0].average[Nave].Xp             = 0;
    262     output[0].average[Nave].ChiSq          = 0.0;
     262    output[0].average[Nave].ChiSqAve       = 0.0;
     263    output[0].average[Nave].ChiSqPM        = 0.0;
     264    output[0].average[Nave].ChiSqPar       = 0.0;
     265    output[0].average[Nave].Tmean          = 0;
     266    output[0].average[Nave].Trange         = 0;
    263267    output[0].average[Nave].Npos           = 0;
    264268
Note: See TracChangeset for help on using the changeset viewer.