IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 33585


Ignore:
Timestamp:
Mar 21, 2012, 3:29:02 PM (14 years ago)
Author:
eugene
Message:

parallelize photdbc

Location:
branches/eam_branches/ipp-20111122/Ohana/src/photdbc
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20111122/Ohana/src/photdbc/Makefile

    r33574 r33585  
    1 default: photdbc dvodist
     1default: photdbc photdbc_client dvodist
    22help:
    3         @echo "make options: photdbc (default)"
     3        @echo "make options: photdbc photdbc_client dvodist"
    44
    55include ../../Makefile.System
    … …  
    1818
    1919photdbc: $(BIN)/photdbc.$(ARCH)
     20photdbc_client: $(BIN)/photdbc_client.$(ARCH)
     21
    2022dvodist: $(BIN)/dvodist.$(ARCH)
    21 install: $(DESTBIN)/photdbc $(DESTBIN)/dvodist
     23
     24install: $(DESTBIN)/photdbc $(DESTBIN)/photdbc_client $(DESTBIN)/dvodist
    2225
    2326PHOTDBC = \
    2427$(SRC)/photdbc.$(ARCH).o           \
     28$(SRC)/photdbc_catalogs.$(ARCH).o  \
     29$(SRC)/initialize.$(ARCH).o        \
     30$(SRC)/ConfigInit.$(ARCH).o        \
     31$(SRC)/args.$(ARCH).o              \
     32$(SRC)/copy_images.$(ARCH).o       \
     33$(SRC)/Shutdown.$(ARCH).o          \
     34$(SRC)/join_stars.$(ARCH).o        \
     35$(SRC)/make_subcatalog.$(ARCH).o       
     36
     37PHOTDBC_CLIENT = \
     38$(SRC)/photdbc_client.$(ARCH).o    \
    2539$(SRC)/photdbc_catalogs.$(ARCH).o  \
    2640$(SRC)/initialize.$(ARCH).o        \
    … …  
    7286$(BIN)/photdbc.$(ARCH): $(PHOTDBC)
    7387
     88$(PHOTDBC_CLIENT): $(INC)/photdbc.h
     89$(BIN)/photdbc_client.$(ARCH): $(PHOTDBC_CLIENT)
     90
    7491$(DVODIST): $(INC)/dvodist.h
    7592$(BIN)/dvodist.$(ARCH): $(DVODIST)

  • branches/eam_branches/ipp-20111122/Ohana/src/photdbc/include/dvodist.h

    r33518 r33585  
    2626char     *srcHostname;
    2727char     *dstHostname;
     28
     29# define MAX_PATH_LENGTH 1024
    2830
    2931void          usage();

  • branches/eam_branches/ipp-20111122/Ohana/src/photdbc/include/photdbc.h

    r33574 r33585  
    3030// need to get RADIUS from Config
    3131
     32# define MAX_PATH_LENGTH 1024
     33
    3234/* global variables */
    3335int    SHOW_PARAMS;
    … …  
    3638double UNIQ_RADIUS;
    3739double DMCAL_MIN;;
    38 char   ImageCat[256];
    39 char   GSCFILE[256];
    40 char   CATDIR[256];
    41 char   CATMODE[16];    /* raw, mef, split, mysql */
    42 char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
    43 char   PhotCodeFile[256];
     40char   ImageCat[MAX_PATH_LENGTH];
     41char   GSCFILE[MAX_PATH_LENGTH];
     42char   CATDIR[MAX_PATH_LENGTH];
     43char  *CATMODE;    /* raw, mef, split, mysql */
     44char  *CATFORMAT;  /* internal, elixir, loneos, panstarrs */
     45char   PhotCodeFile[MAX_PATH_LENGTH];
    4446
    4547double RMIN;
    … …  
    132134void usage();
    133135
    134 int photdbc_catalogs (SkyList *skylist, int hostID);
    135 int photdbc_parallel (SkyList *skylist);
     136int photdbc_catalogs (char *outroot, SkyList *skylist, int hostID);
     137int photdbc_parallel (char *outroot, SkyList *skylist);
     138int args_client (int argc, char **argv);
     139void initialize_client (int argc, char **argv);

  • branches/eam_branches/ipp-20111122/Ohana/src/photdbc/src/ConfigInit.c

    r30616 r33585  
    5252  ScanConfig (config, "NMEAS_MIN_FILTERED",     "%d",  0, &NMEAS_MIN_FILTERED);
    5353
    54   WarnConfig (config, "GSCFILE",                "%s",  0, GSCFILE);
     54  // do not apply this limit for now
     55  NCODE_MIN = 0;
     56
    5557  WarnConfig (config, "CATDIR",                 "%s",  0, CATDIR);
    56   ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
    57   ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
     58  char *tmpcatdir = abspath (CATDIR, MAX_PATH_LENGTH);
     59  strcpy (CATDIR, tmpcatdir);
     60  free (tmpcatdir);
     61
    5862  ScanConfig (config, "PHOTCODE_FILE",          "%s",  0, MasterPhotcodeFile);
    5963
    … …  
    6771  }
    6872
    69   if (*CATMODE == 0) strcpy (CATMODE, "RAW");
    70   if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
    71 
    7273  /* XXX this does not yet write out the master photcode table */
    7374  sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
    74   if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, TRUE)) {
    75     fprintf (stderr, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);
     75  if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, TRUE)) {
     76    fprintf (stderr, "error loading photcode table %s\n", CatdirPhotcodeFile);
    7677    exit (1);
    7778  }

  • branches/eam_branches/ipp-20111122/Ohana/src/photdbc/src/args.c

    r33574 r33585  
    4040    remove_argument (N, &argc, argv);
    4141    MAX_MIN_MAG = atof(argv[N]);
     42    remove_argument (N, &argc, argv);
     43  }
     44
     45  // override input catalog format (PS1_V1, PS1_REF, etc)
     46  CATFORMAT = NULL;
     47  if ((N = get_argument (argc, argv, "-set-format"))) {
     48    remove_argument (N, &argc, argv);
     49    CATFORMAT = strcreate (argv[N]);
     50    remove_argument (N, &argc, argv);
     51  }
     52
     53  // override input catalog mode (raw, mef, split, mysql)
     54  CATMODE = NULL;
     55  if ((N = get_argument (argc, argv, "-set-mode"))) {
     56    remove_argument (N, &argc, argv);
     57    CATMODE = strcreate (argv[N]);
    4258    remove_argument (N, &argc, argv);
    4359  }
    … …  
    127143}
    128144
     145int args_client (int argc, char **argv) {
     146
     147  int N;
     148
     149  PARALLEL = FALSE;
     150  PARALLEL_MANUAL = FALSE;
     151  PARALLEL_SERIAL = FALSE;
     152
     153  HOST_ID = 0;
     154  if ((N = get_argument (argc, argv, "-hostID"))) {
     155    remove_argument (N, &argc, argv);
     156    HOST_ID = atoi (argv[N]);
     157    remove_argument (N, &argc, argv);
     158  }
     159  if (!HOST_ID) usage();
     160
     161  HOSTDIR = NULL;
     162  if ((N = get_argument (argc, argv, "-hostdir"))) {
     163    remove_argument (N, &argc, argv);
     164    HOSTDIR = strcreate (argv[N]);
     165    remove_argument (N, &argc, argv);
     166  }
     167  if (!HOSTDIR) usage();
     168
     169  VERBOSE = FALSE;
     170  if ((N = get_argument (argc, argv, "-v"))) {
     171    VERBOSE = TRUE;
     172    remove_argument (N, &argc, argv);
     173  }
     174
     175  SHOW_PARAMS = FALSE;
     176  if ((N = get_argument (argc, argv, "-params"))) {
     177    remove_argument (N, &argc, argv);
     178    SHOW_PARAMS = TRUE;
     179  }
     180
     181  ExcludeByInstMag = FALSE;
     182  if ((N = get_argument (argc, argv, "-instmag"))) {
     183    ExcludeByInstMag = TRUE;
     184    remove_argument (N, &argc, argv);
     185    INST_MAG_MIN = atof(argv[N]);
     186    remove_argument (N, &argc, argv);
     187    INST_MAG_MAX = atof(argv[N]);
     188    remove_argument (N, &argc, argv);
     189  }
     190
     191  ExcludeByMinSigma = FALSE;
     192  if ((N = get_argument (argc, argv, "-min-sigma"))) {
     193    ExcludeByMinSigma = TRUE;
     194    remove_argument (N, &argc, argv);
     195    SIGMA_MIN_KEEP = atof(argv[N]);
     196    remove_argument (N, &argc, argv);
     197  }
     198
     199  ExcludeByMaxMinMag = FALSE;
     200  if ((N = get_argument (argc, argv, "-maxminmag"))) {
     201    ExcludeByMaxMinMag = TRUE;
     202    remove_argument (N, &argc, argv);
     203    MAX_MIN_MAG = atof(argv[N]);
     204    remove_argument (N, &argc, argv);
     205  }
     206
     207  // override input catalog format (PS1_V1, PS1_REF, etc)
     208  CATFORMAT = NULL;
     209  if ((N = get_argument (argc, argv, "-set-format"))) {
     210    remove_argument (N, &argc, argv);
     211    CATFORMAT = strcreate (argv[N]);
     212    remove_argument (N, &argc, argv);
     213  }
     214
     215  // override input catalog mode (raw, mef, split, mysql)
     216  CATMODE = NULL;
     217  if ((N = get_argument (argc, argv, "-set-mode"))) {
     218    remove_argument (N, &argc, argv);
     219    CATMODE = strcreate (argv[N]);
     220    remove_argument (N, &argc, argv);
     221  }
     222
     223  /* specify portion of the sky */
     224  REGION.Rmin = 0;
     225  REGION.Rmax = 360;
     226  REGION.Dmin = -90;
     227  REGION.Dmax = +90;
     228  if ((N = get_argument (argc, argv, "-region"))) {
     229    remove_argument (N, &argc, argv);
     230    REGION.Rmin = atof (argv[N]);
     231    remove_argument (N, &argc, argv);
     232    REGION.Rmax = atof (argv[N]);
     233    remove_argument (N, &argc, argv);
     234    REGION.Dmin = atof (argv[N]);
     235    remove_argument (N, &argc, argv);
     236    REGION.Dmax = atof (argv[N]);
     237    remove_argument (N, &argc, argv);
     238
     239    if (REGION.Rmin == REGION.Rmax) {
     240      fprintf (stderr, "ERROR: selected region is ill-defined: Rmin == Rmax\n");
     241      exit (2);
     242    }
     243    if (REGION.Dmin == REGION.Dmax) {
     244      fprintf (stderr, "ERROR: selected region is ill-defined: Dmin == Dmax\n");
     245      exit (2);
     246    }
     247  }
     248
     249  PHOTCODE_DROP_LIST = NULL;
     250  if ((N = get_argument (argc, argv, "-photcode-drop"))) {
     251    remove_argument (N, &argc, argv);
     252    PHOTCODE_DROP_LIST = strcreate(argv[N]);
     253    remove_argument (N, &argc, argv);
     254  }
     255
     256  PHOTCODE_SKIP_LIST = NULL;
     257  if ((N = get_argument (argc, argv, "-photcode-skip"))) {
     258    remove_argument (N, &argc, argv);
     259    PHOTCODE_SKIP_LIST = strcreate(argv[N]);
     260    remove_argument (N, &argc, argv);
     261  }
     262
     263  if (argc != 2) usage();
     264
     265  if ((REGION.Rmin == 0) && (REGION.Rmax == 360) && (REGION.Dmin == -90) && (REGION.Dmax == +90)) {
     266    int i;
     267    fprintf (stderr, "you have requested a copy of the entire sky in one pass\n");
     268    fprintf (stderr, "this could be a time consuming operation.  type Ctrl-C within 5 seconds to cancel\n");
     269    for (i = 5; i > 0; i--) {
     270      fprintf (stderr, "%d.. ", i);
     271      usleep (1000000);
     272    }
     273    fprintf (stderr, "\n");
     274  }
     275
     276  return (TRUE);
     277}
     278
    129279void usage() {
    130280

  • branches/eam_branches/ipp-20111122/Ohana/src/photdbc/src/copy_images.c

    r29001 r33585  
    4141  if (out.dbstate != LCK_EMPTY) Shutdown ("ERROR: image table exists %s", ImageOut);
    4242
    43   out.mode   = dvo_catalog_catmode (CATMODE);
    44   out.format = dvo_catalog_catformat (CATFORMAT);
     43  out.mode   = CATMODE   ? dvo_catalog_catmode (CATMODE)     : in.mode;
     44  out.format = CATFORMAT ? dvo_catalog_catformat (CATFORMAT) : in.format;
    4545  dvo_image_create (&out, ZERO_POINT);
    4646   

  • branches/eam_branches/ipp-20111122/Ohana/src/photdbc/src/initialize.c

    r33574 r33585  
    1212  args (argc, argv);
    1313
    14   photcodesDrop = ParsePhotcodeList (PHOTCODE_DROP_LIST, &NphotcodeDrop, FALSE);
    15   photcodesSkip = ParsePhotcodeList (PHOTCODE_SKIP_LIST, &NphotcodeSkip, FALSE);
     14  photcodesDrop = ParsePhotcodeList (PHOTCODE_DROP_LIST, &NphotcodesDrop, FALSE);
     15  photcodesSkip = ParsePhotcodeList (PHOTCODE_SKIP_LIST, &NphotcodesSkip, FALSE);
    1616
    1717  if (SHOW_PARAMS) {
    … …  
    4141  }
    4242}
     43
     44void initialize_client (int argc, char **argv) {
     45
     46  /* are these set correctly? */
     47  if (get_argument (argc, argv, "-h")) usage();
     48  if (get_argument (argc, argv, "--h")) usage();
     49  if (get_argument (argc, argv, "-help")) usage();
     50  if (get_argument (argc, argv, "--help")) usage();
     51
     52  ConfigInit (&argc, argv);
     53  args_client (argc, argv);
     54
     55  photcodesDrop = ParsePhotcodeList (PHOTCODE_DROP_LIST, &NphotcodesDrop, FALSE);
     56  photcodesSkip = ParsePhotcodeList (PHOTCODE_SKIP_LIST, &NphotcodesSkip, FALSE);
     57
     58  if (SHOW_PARAMS) {
     59    fprintf (stderr, "current parameter settings:\n");
     60    fprintf (stderr, "VERBOSE:                %d\n", VERBOSE);
     61    fprintf (stderr, "JOIN_RADIUS:           %lf\n", JOIN_RADIUS);
     62    fprintf (stderr, "UNIQ_RADIUS:           %lf\n", UNIQ_RADIUS);
     63                                                     
     64    fprintf (stderr, "XMIN:                  %lf\n", XMIN);
     65    fprintf (stderr, "XMAX:                  %lf\n", XMAX);
     66    fprintf (stderr, "YMIN:                  %lf\n", YMIN);
     67    fprintf (stderr, "YMAX:                  %lf\n", YMAX);
     68    fprintf (stderr, "MMIN:                  %lf\n", MMIN);
     69    fprintf (stderr, "MMAX:                  %lf\n", MMAX);
     70    fprintf (stderr, "DMCAL_MIN:             %lf\n", DMCAL_MIN);
     71    fprintf (stderr, "DMSYS:                 %lf\n", DMSYS);
     72                                                     
     73    fprintf (stderr, "CHISQ_MAX:             %lf\n", CHISQ_MAX);
     74    fprintf (stderr, "NMEAS_MIN:             %d\n",  NMEAS_MIN);
     75
     76    fprintf (stderr, "IMAGE_CATALOG          %s\n",  ImageCat);
     77    fprintf (stderr, "GSCFILE                %s\n",  GSCFILE);
     78    fprintf (stderr, "CATDIR                 %s\n",  CATDIR);
     79    fprintf (stderr, "PHOTCODE_FILE          %s\n",  PhotCodeFile);
     80
     81    exit (0);
     82  }
     83}

  • branches/eam_branches/ipp-20111122/Ohana/src/photdbc/src/md5_ops.c

    r33518 r33585  
    6060  IOBuffer buffer;
    6161
    62   char line[1024];
    63   int Nline = snprintf (line, 1024, "md5sum %s\n", filename);
    64   assert (Nline < 1024);
     62  char line[MAX_PATH_LENGTH];
     63  int Nline = snprintf (line, MAX_PATH_LENGTH, "md5sum %s\n", filename);
     64  assert (Nline < MAX_PATH_LENGTH);
    6565
    6666  write (host->stdio[0], line, Nline);
    … …  
    7272  fprintf (stderr, "buffer: %s\n", buffer.buffer);
    7373
    74   char result[1024], fileout[1024];
     74  char result[MAX_PATH_LENGTH], fileout[MAX_PATH_LENGTH];
    7575  int Nscan = sscanf (buffer.buffer, "%s %s", result, fileout);
    7676  assert (Nscan == 2);
    … …  
    8686  IOBuffer buffer, stdout_buf, stderr_buf;
    8787
    88   char line[1024];
    89   int Nline = snprintf (line, 1024, "job md5sum %s\n", filename);
    90   assert (Nline < 1024);
     88  char line[MAX_PATH_LENGTH];
     89  int Nline = snprintf (line, MAX_PATH_LENGTH, "job md5sum %s\n", filename);
     90  assert (Nline < MAX_PATH_LENGTH);
    9191
    9292  // fprintf (stderr, "command: %s\n", line);
    … …  
    119119  // fprintf (stderr, "result from md5sum: %s\n", stdout_buf.buffer);
    120120
    121   char result[1024], fileout[1024];
     121  char result[MAX_PATH_LENGTH], fileout[MAX_PATH_LENGTH];
    122122  int Nscan = sscanf (stdout_buf.buffer, "%s %s", result, fileout);
    123123  if (Nscan != 2) {

  • branches/eam_branches/ipp-20111122/Ohana/src/photdbc/src/photdbc.c

    r33574 r33585  
    1313
    1414  // the output catalog needs to inherit the SKY_DEPTH of the input catalog
    15   sky = SkyTableLoadOptimal (CATDIR, NULL, GSCFILE, TRUE, SKY_DEPTH_HST, VERBOSE);
     15  sky = SkyTableLoadOptimal (CATDIR, NULL, NULL, TRUE, 0, VERBOSE);
    1616  SkyTableSetFilenames (sky, CATDIR, "cpt");
    1717  skylist = SkyListByPatch (sky, -1, &REGION);
    1818
    1919  // hostID is 0 for master program
    20   photdbc_catalogs (skylist, 0);
     20  photdbc_catalogs (argv[1], skylist, 0);
     21
     22  char *skyfile = SkyTableFilename (argv[1]);
     23  SkyTableSave (sky, skyfile);
    2124  exit (0);
    2225}

  • branches/eam_branches/ipp-20111122/Ohana/src/photdbc/src/photdbc_catalogs.c

    r33574 r33585  
    11# include "photdbc.h"
     2# define DEBUG 1
    23
    3 int photdbc_catalogs (SkyList *skylist, int hostID) {
     4int photdbc_catalogs (char *outroot, SkyList *skylist, int hostID) {
    45
    56  int i;
    6   char *skyfile;
    77  Catalog incatalog;
    88  Catalog outcatalog;
    99
    1010  if (PARALLEL && !hostID) {
    11       photdbc_parallel (skylist);
    12       exit (0);
     11    photdbc_parallel (outroot, skylist);
     12    return FALSE;
    1313  }
    1414
    … …  
    2020
    2121    // set the parameters which guide catalog open/load/create
    22     char hostfile[1024];
    23     snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
     22    char hostfile[MAX_PATH_LENGTH];
     23    snprintf (hostfile, MAX_PATH_LENGTH, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
    2424    incatalog.filename  = hostID ? hostfile : skylist[0].filename[i];
    2525    incatalog.Nsecfilt = GetPhotcodeNsecfilt ();
    … …  
    3939
    4040    // create output catalog filename
    41     outcatalog.filename = strsubs (incatalog.filename, CATDIR, argv[1]);
     41    char outfile[MAX_PATH_LENGTH];
     42    snprintf (outfile, MAX_PATH_LENGTH, "%s/%s.cpt", outroot, skylist[0].regions[i]->name);
     43    outcatalog.filename = outfile;
    4244    if (outcatalog.filename == NULL) Shutdown ("error with input catalog name");
    4345
    4446    // define outcatalog open parameters
    45     outcatalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
    46     outcatalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
     47    outcatalog.catformat = CATFORMAT ? dvo_catalog_catformat (CATFORMAT) : incatalog.catformat;
     48    outcatalog.catmode   = CATMODE   ? dvo_catalog_catmode (CATMODE)     : incatalog.catmode;
    4749    outcatalog.Nsecfilt  = incatalog.Nsecfilt;                 // inherit from the incatalog
    4850    outcatalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    … …  
    7981  }
    8082
    81   skyfile = SkyTableFilename (argv[1]);
    82   SkyTableSave (sky, skyfile);
    83   exit (0);
     83  return TRUE;
    8484}
    8585
    86 int photdbc_parallel (SkyList *skylist) {
     86int photdbc_parallel (char *outroot, SkyList *skylist) {
    8787
    8888  // launch the photdbo_client jobs to the parallel hosts
    … …  
    103103    table->hosts[i].pathname = tmppath;
    104104
     105    // ensure that the paths are absolute path names
     106    char *tmproot = abspath (outroot, MAX_PATH_LENGTH);
     107
    105108    // options / arguments that can affect relastro_client -update-objects:
    106     char command[1024];
    107     snprintf (command, 1024, "photdbc_client -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f",
    108               table->hosts[i].hostID, CATDIR, table->hosts[i].pathname, REGION.Rmin, REGION.Rmax, REGION.Dmin, REGION.Dmax);
     109    char command[MAX_PATH_LENGTH];
     110    snprintf (command, MAX_PATH_LENGTH, "photdbc_client %s -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f -D NMEAS_MIN %d -D NMEAS_MIN_FILTERED %d -D AVE_SIGMA_LIM %f -D SIGMA_MAX %f",
     111              tmproot, table->hosts[i].hostID, CATDIR, table->hosts[i].pathname,
     112              REGION.Rmin, REGION.Rmax, REGION.Dmin, REGION.Dmax,
     113              NMEAS_MIN, NMEAS_MIN_FILTERED, AVE_SIGMA_LIM, SIGMA_MAX
     114      );
    109115
    110     char tmpline[1024];
    111     if (VERBOSE)            { snprintf (tmpline, 1024, "%s -v",                command);                             strcpy (command, tmpline); }
    112     if (ExcludeByInstMag)   { snprintf (tmpline, 1024, "%s -instmag %f %f",    command, INST_MAG_MIN, INST_MAG_MAX); strcpy (command, tmpline); }
    113     if (ExcludeByMinSigma)  { snprintf (tmpline, 1024, "%s -min-sigma %f",     command, SIGMA_MIN_KEEP);             strcpy (command, tmpline); }
    114     if (ExcludeByMaxMinMag) { snprintf (tmpline, 1024, "%s -maxminmag %f",     command, MAX_MIN_MAG);                strcpy (command, tmpline); }
    115     if (PHOTCODE_DROP_LIST) { snprintf (tmpline, 1024, "%s -photcode-drop %s", command, PHOTCODE_DROP_LIST);         strcpy (command, tmpline); }
    116     if (PHOTCODE_SKIP_LIST) { snprintf (tmpline, 1024, "%s -photcode-skip %s", command, PHOTCODE_SKIP_LIST);         strcpy (command, tmpline); }
     116    char tmpline[MAX_PATH_LENGTH];
     117    if (VERBOSE)            { snprintf (tmpline, MAX_PATH_LENGTH, "%s -v",                command);                             strcpy (command, tmpline); }
     118    if (ExcludeByInstMag)   { snprintf (tmpline, MAX_PATH_LENGTH, "%s -instmag %f %f",    command, INST_MAG_MIN, INST_MAG_MAX); strcpy (command, tmpline); }
     119    if (ExcludeByMinSigma)  { snprintf (tmpline, MAX_PATH_LENGTH, "%s -min-sigma %f",     command, SIGMA_MIN_KEEP);             strcpy (command, tmpline); }
     120    if (ExcludeByMaxMinMag) { snprintf (tmpline, MAX_PATH_LENGTH, "%s -maxminmag %f",     command, MAX_MIN_MAG);                strcpy (command, tmpline); }
     121    if (PHOTCODE_DROP_LIST) { snprintf (tmpline, MAX_PATH_LENGTH, "%s -photcode-drop %s", command, PHOTCODE_DROP_LIST);         strcpy (command, tmpline); }
     122    if (PHOTCODE_SKIP_LIST) { snprintf (tmpline, MAX_PATH_LENGTH, "%s -photcode-skip %s", command, PHOTCODE_SKIP_LIST);         strcpy (command, tmpline); }
     123    if (CATFORMAT)          { snprintf (tmpline, MAX_PATH_LENGTH, "%s -catformat %s",     command, CATFORMAT);                  strcpy (command, tmpline); }
     124    if (CATMODE)            { snprintf (tmpline, MAX_PATH_LENGTH, "%s -catmode %s",       command, CATMODE);                    strcpy (command, tmpline); }
    117125
    118126    fprintf (stderr, "command: %s\n", command);
Note: See TracChangeset for help on using the changeset viewer.