IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 40736


Ignore:
Timestamp:
May 14, 2019, 2:52:18 PM (7 years ago)
Author:
eugene
Message:

add option to accept incoming astrometry

Location:
branches/eam_branches/ohana.20190329/src/dvomerge
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ohana.20190329/src/dvomerge/include/dvomerge.h

    r40377 r40736  
    3131int    IMAGES_ONLY;
    3232int    ACCEPT_MOTION;
     33int    ACCEPT_ASTROM;
    3334char   CATDIR[DVO_MAX_PATH];
    3435char   GSCFILE[DVO_MAX_PATH];

  • branches/eam_branches/ohana.20190329/src/dvomerge/src/args.c

    r40704 r40736  
    107107  }
    108108
    109   /* limit the impact of a dvomerge -parallel */
     109  /* accept input database average astrometry motions */
    110110  ACCEPT_MOTION = FALSE;
    111111  if ((N = get_argument (*argc, argv, "-accept-motion"))) {
    … …  
    113113    ACCEPT_MOTION = TRUE;
    114114  }
    115 
    116   /* limit the impact of a dvomerge -parallel */
     115  /* accept input database average astrometry information */
    117116  ACCEPT_ASTROM = FALSE;
    118117  if ((N = get_argument (*argc, argv, "-accept-astrom"))) {
    … …  
    331330  }
    332331
    333   /* limit the impact of a dvomerge -parallel */
     332  /* accept input database average astrometry motions */
    334333  ACCEPT_MOTION = FALSE;
    335334  if ((N = get_argument (*argc, argv, "-accept-motion"))) {
    … …  
    337336    ACCEPT_MOTION = TRUE;
    338337  }
    339   /* limit the impact of a dvomerge -parallel */
     338  /* accept input database average astrometry information */
    340339  ACCEPT_ASTROM = FALSE;
    341340  if ((N = get_argument (*argc, argv, "-accept-astrom"))) {

  • branches/eam_branches/ohana.20190329/src/dvomerge/src/dvomergeUpdate_catalogs.c

    r40377 r40736  
    328328    if (FORCE_MERGE)         { strextend (&command, "-force-merge"); }
    329329    if (ACCEPT_MOTION)       { strextend (&command, "-accept-motion"); }
     330    if (ACCEPT_ASTROM)       { strextend (&command, "-accept-astrom"); }
    330331    if (MATCHED_TABLES)      { strextend (&command, "-matched-tables"); }
    331332    if (MATCH_BY_EXTERN_ID)  { strextend (&command, "-match-by-extern-id"); }

  • branches/eam_branches/ohana.20190329/src/dvomerge/src/merge_catalogs_old.c

    r40704 r40736  
    362362    }
    363363
    364   XXX: add choice of secfilt
     364    // XXX: add choice of secfilt
    365365    // update the average properties to reflect the incoming entries:
    366366    // if the original value is NAN but the input value is not, accept the input:
Note: See TracChangeset for help on using the changeset viewer.