IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 39771


Ignore:
Timestamp:
Oct 18, 2016, 11:27:57 AM (10 years ago)
Author:
eugene
Message:

add chipmaploop and chiporderloop; report extra args; dX,dYsys are all now in arcsec (not pixels)

Location:
branches/czw_branch/20160809/Ohana/src/relastro/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/czw_branch/20160809/Ohana/src/relastro/src/UpdateStacks.c

    r39731 r39771  
    4848
    4949    // XXX: I need to convert dLsig, dMsig from degrees to pixels
    50     dLsig *= 3600.0 / 0.25;
    51     dMsig *= 3600.0 / 0.25;
     50    dLsig *= 3600.0;
     51    dMsig *= 3600.0;
    5252
    5353    image[i].dXpixSys = dLsig;

  • branches/czw_branch/20160809/Ohana/src/relastro/src/args.c

    r39766 r39771  
    11# include "relastro.h"
    2 void usage (void);
    3 void usage_client (void);
     2void usage (int argc, char **argv);
     3void usage_client (int argc, char **argv);
    44void usage_merge_source (void);
    55void usage_merge_source_id (char *name);
    … …  
    4040    remove_argument (N, &argc, argv);
    4141
    42     if (argc != 1) usage ();
     42    if (argc != 1) usage (argc, argv);
    4343    return TRUE;
    4444  }
    … …  
    106106    remove_argument (N, &argc, argv);
    107107    RELASTRO_OP = OP_PARALLEL_IMAGES;
    108     if (N >= argc) usage();
     108    if (N >= argc) usage (argc, argv);
    109109    IMAGE_TABLE = strcreate (argv[N]);
    110110    remove_argument (N, &argc, argv);
    111     if (!REGION_FILE) usage();
     111    if (!REGION_FILE) usage (argc, argv);
    112112  }
    113113
    … …  
    193193    remove_argument (N, &argc, argv);
    194194    RELASTRO_OP = OP_PARALLEL_REGIONS;
    195     if (!REGION_FILE) usage();
     195    if (!REGION_FILE) usage (argc, argv);
    196196    if ((N = get_argument (argc, argv, "-parallel-regions-manual"))) {
    197197      remove_argument (N, &argc, argv);
    … …  
    201201
    202202  if ((N = get_argument (argc, argv, "-testobj1"))) {
    203     if (N > argc - 3) usage ();
     203    if (N > argc - 3) usage (argc, argv);
    204204    remove_argument (N, &argc, argv);
    205205    OBJ_ID_SRC = strtol(argv[N], &endptr, 0);
    206     if (*endptr) usage ();
     206    if (*endptr) usage (argc, argv);
    207207    remove_argument (N, &argc, argv);
    208208    CAT_ID_SRC = strtol(argv[N], &endptr, 0);
    209     if (*endptr) usage ();
     209    if (*endptr) usage (argc, argv);
    210210    remove_argument (N, &argc, argv);
    211211  }
    212212
    213213  if ((N = get_argument (argc, argv, "-testobj2"))) {
    214     if (N > argc - 3) usage ();
     214    if (N > argc - 3) usage (argc, argv);
    215215    remove_argument (N, &argc, argv);
    216216    OBJ_ID_DST = strtol(argv[N], &endptr, 0);
    217     if (*endptr) usage ();
     217    if (*endptr) usage (argc, argv);
    218218    remove_argument (N, &argc, argv);
    219219    CAT_ID_DST = strtol(argv[N], &endptr, 0);
    220     if (*endptr) usage ();
     220    if (*endptr) usage (argc, argv);
    221221    remove_argument (N, &argc, argv);
    222222  }
    … …  
    240240  if ((N = get_argument (argc, argv, "-high-speed"))) {
    241241    // XXX include a parallax / no-parallax option
    242     if (N >= argc - 4) usage();
     242    if (N >= argc - 4) usage (argc, argv);
    243243    RELASTRO_OP = OP_HIGH_SPEED;
    244244    remove_argument (N, &argc, argv);
    … …  
    254254
    255255  if ((N = get_argument (argc, argv, "-hpm"))) {
    256     if (N >= argc - 2) usage();
     256    if (N >= argc - 2) usage (argc, argv);
    257257    RELASTRO_OP = OP_HPM;
    258258    remove_argument (N, &argc, argv);
    … …  
    308308  }
    309309
    310   if (RELASTRO_OP == OP_NONE) usage();
    311 
    312   if (((RELASTRO_OP == OP_IMAGES) || (RELASTRO_OP == OP_PARALLEL_REGIONS) || (RELASTRO_OP == OP_PARALLEL_IMAGES)) && (FIT_TARGET == TARGET_NONE)) usage();
     310  if (RELASTRO_OP == OP_NONE) usage (argc, argv);
     311
     312  if (((RELASTRO_OP == OP_IMAGES) || (RELASTRO_OP == OP_PARALLEL_REGIONS) || (RELASTRO_OP == OP_PARALLEL_IMAGES)) && (FIT_TARGET == TARGET_NONE)) usage (argc, argv);
    313313
    314314  /* specify portion of the sky : allow default of all sky? */
    … …  
    510510  }
    511511
    512   ChipOrderLoop = NULL;
    513   ChipOrderLoopStr = NULL;
    514   CHIPORDER = 1;
    515   if ((N = get_argument (argc, argv, "-chiporder"))) {
    516     remove_argument (N, &argc, argv);
    517     CHIPORDER = atoi(argv[N]);
    518     remove_argument (N, &argc, argv);
    519   }
    520   if ((N = get_argument (argc, argv, "-chiporderloop"))) {
    521     remove_argument (N, &argc, argv);
    522     ChipOrderLoopStr = strcreate(argv[N]);
    523     ChipOrderLoop = ParseLoopOrder (argv[N], 1);
    524     remove_argument (N, &argc, argv);
    525   }
    526 
    527   ChipMapLoop = NULL;
    528   ChipMapLoopStr = NULL;
    529   CHIPMAP = 0;
    530   if ((N = get_argument (argc, argv, "-chipmap"))) {
    531     remove_argument (N, &argc, argv);
    532     CHIPMAP = atoi(argv[N]);
    533     remove_argument (N, &argc, argv);
    534 
    535   }
    536   if ((N = get_argument (argc, argv, "-chipmaploop"))) {
    537     remove_argument (N, &argc, argv);
    538     ChipMapLoopStr = strcreate(argv[N]);
    539     ChipMapLoop = ParseLoopOrder (argv[N], 0);
    540     remove_argument (N, &argc, argv);
    541   }
    542  
    543 
    544512  SAVEPLOT = FALSE;
    545513  PLOTSTUFF = FALSE;
    … …  
    668636  }
    669637
     638  // e.g., -chiporderloop 3,4,5
     639  // NOTE: this must come after -nloop above
     640  ChipOrderLoop = NULL;
     641  ChipOrderLoopStr = NULL;
     642  CHIPORDER = 1;
     643  if ((N = get_argument (argc, argv, "-chiporder"))) {
     644    remove_argument (N, &argc, argv);
     645    CHIPORDER = atoi(argv[N]);
     646    remove_argument (N, &argc, argv);
     647  }
     648  if ((N = get_argument (argc, argv, "-chiporderloop"))) {
     649    remove_argument (N, &argc, argv);
     650    ChipOrderLoopStr = strcreate(argv[N]);
     651    ChipOrderLoop = ParseLoopOrder (argv[N], 1);
     652    remove_argument (N, &argc, argv);
     653  }
     654
     655  ChipMapLoop = NULL;
     656  ChipMapLoopStr = NULL;
     657  CHIPMAP = 0;
     658  if ((N = get_argument (argc, argv, "-chipmap"))) {
     659    remove_argument (N, &argc, argv);
     660    CHIPMAP = atoi(argv[N]);
     661    remove_argument (N, &argc, argv);
     662
     663  }
     664  if ((N = get_argument (argc, argv, "-chipmaploop"))) {
     665    remove_argument (N, &argc, argv);
     666    ChipMapLoopStr = strcreate(argv[N]);
     667    ChipMapLoop = ParseLoopOrder (argv[N], 0);
     668    remove_argument (N, &argc, argv);
     669  }
     670 
     671
    670672  // e.g., -loop-weights-2mass 1000,300,300,200,200,100
    671673  // NOTE: this must come after -nloop above
    … …  
    718720  }
    719721
    720   if (argc != 1) usage ();
     722  if (argc != 1) usage (argc, argv);
    721723  return TRUE;
    722724}
    … …  
    731733  FREE (LoopWeightTycho);
    732734  FREE (LoopWeightGAIA);
     735
     736  FREE (ChipMapLoop);
     737  FREE (ChipMapLoopStr);
     738  FREE (ChipOrderLoop);
     739  FREE (ChipOrderLoopStr);
    733740
    734741  FREE (PHOTCODE_SKIP_LIST);
    … …  
    791798    remove_argument (N, &argc, argv);
    792799  }
    793   if (!HOST_ID) usage_client();
     800  if (!HOST_ID) usage_client (argc, argv);
    794801
    795802  HOSTDIR = NULL;
    … …  
    799806    remove_argument (N, &argc, argv);
    800807  }
    801   if (!HOSTDIR) usage_client();
     808  if (!HOSTDIR) usage_client (argc, argv);
    802809
    803810  if ((N = get_argument (argc, argv, "-load-objects"))) {
    … …  
    903910  if ((N = get_argument (argc, argv, "-high-speed"))) {
    904911    // XXX include a parallax / no-parallax option
    905     if (N >= argc - 5) usage_client();
     912    if (N >= argc - 5) usage_client (argc, argv);
    906913    RELASTRO_OP = OP_HIGH_SPEED;
    907914    remove_argument (N, &argc, argv);
    … …  
    917924
    918925  if ((N = get_argument (argc, argv, "-hpm"))) {
    919     if (N >= argc - 3) usage();
     926    if (N >= argc - 3) usage_client (argc, argv);
    920927    RELASTRO_OP = OP_HPM;
    921928    remove_argument (N, &argc, argv);
    … …  
    927934
    928935  if ((N = get_argument (argc, argv, "-testobj1"))) {
    929     if (N > argc - 3) usage ();
     936    if (N > argc - 3) usage_client (argc, argv);
    930937    remove_argument (N, &argc, argv);
    931938    OBJ_ID_SRC = strtol(argv[N], &endptr, 0);
    932     if (*endptr) usage ();
     939    if (*endptr) usage_client (argc, argv);
    933940    remove_argument (N, &argc, argv);
    934941    CAT_ID_SRC = strtol(argv[N], &endptr, 0);
    935     if (*endptr) usage ();
     942    if (*endptr) usage_client (argc, argv);
    936943    remove_argument (N, &argc, argv);
    937944  }
    938945
    939946  if ((N = get_argument (argc, argv, "-testobj2"))) {
    940     if (N > argc - 3) usage ();
     947    if (N > argc - 3) usage_client (argc, argv);
    941948    remove_argument (N, &argc, argv);
    942949    OBJ_ID_DST = strtol(argv[N], &endptr, 0);
    943     if (*endptr) usage ();
     950    if (*endptr) usage_client (argc, argv);
    944951    remove_argument (N, &argc, argv);
    945952    CAT_ID_DST = strtol(argv[N], &endptr, 0);
    946     if (*endptr) usage ();
     953    if (*endptr) usage_client (argc, argv);
    947954    remove_argument (N, &argc, argv);
    948955  }
    … …  
    982989  }
    983990
    984   if (RELASTRO_OP == OP_NONE) usage_client();
     991  if (RELASTRO_OP == OP_NONE) usage_client (argc, argv);
    985992
    986993  /* specify portion of the sky : allow default of all sky? */
    … …  
    12091216  }
    12101217
    1211   if (argc != 1) usage_client ();
     1218  if (argc != 1) usage_client (argc, argv);
    12121219  return TRUE;
    12131220}
    … …  
    12441251}
    12451252
    1246 void usage () {
     1253void usage (int argc, char **argv) {
    12471254  fprintf (stderr, "ERROR: USAGE: relastro -images -update-simple [options]\n");
    12481255  fprintf (stderr, "       OR:    relastro -images -update-chips [options]\n");
    … …  
    12941301  fprintf (stderr, "  -v\n");
    12951302  fprintf (stderr, "  \n");
     1303
     1304  fprintf (stderr, "remaining args: ");
     1305  for (int i = 0; i < argc; i++) {
     1306    fprintf (stderr, "%s ", argv[i]);
     1307  }
     1308  fprintf (stderr, "\n");
     1309
    12961310  exit (2);
    12971311}
    12981312
    1299 void usage_client () {
     1313void usage_client (int argc, char **argv) {
    13001314  fprintf (stderr, "ERROR: USAGE: relastro_client -load\n");
    13011315  fprintf (stderr, "       OR:    relastro_client -update-offsets\n");
    … …  
    13281342  fprintf (stderr, "  -v\n");
    13291343  fprintf (stderr, "  \n");
     1344
     1345  fprintf (stderr, "remaining args: ");
     1346  for (int i = 0; i < argc; i++) {
     1347    fprintf (stderr, "%s ", argv[i]);
     1348  }
     1349  fprintf (stderr, "\n");
     1350
    13301351  exit (2);
    13311352}

  • branches/czw_branch/20160809/Ohana/src/relastro/src/bcatalog.c

    r39731 r39771  
    7272
    7373  int myNskip1 = 0, myNskip2 = 0, myNskip3 = 0, myNskip4 = 0, myNskip5 = 0, myNskip6 = 0;
     74
     75  int NgaiaObject = 0;
    7476
    7577  /* exclude stars not in range or with too few measurements */
    … …  
    256258      }
    257259
     260      if (catalog[0].measure[offset].photcode == 1030) { NgaiaObject ++; }
     261
    258262      CopyMeasureToTiny (&subcatalog[0].measureT[Nmeasure], &catalog[0].measure[offset]);
    259263      // subcatalog[0].measure[Nmeasure] = catalog[0].measure[offset];
    … …  
    287291    }
    288292  }
    289   fprintf (stderr, "skips: %d %d %d %d %d %d\n", myNskip1, myNskip2, myNskip3, myNskip4, myNskip5, myNskip6);
     293  fprintf (stderr, "skips: %d %d %d %d %d %d, Ngaia: %d\n", myNskip1, myNskip2, myNskip3, myNskip4, myNskip5, myNskip6, NgaiaObject);
    290294  REALLOCATE (subcatalog[0].average,  Average,     MAX (Naverage, 1));
    291295  REALLOCATE (subcatalog[0].measureT, MeasureTiny, MAX (Nmeasure, 1));
Note: See TracChangeset for help on using the changeset viewer.