IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 3, 2015, 4:16:29 PM (11 years ago)
Author:
eugene
Message:

merge changes from eam_branches/ipp-20151113

Location:
trunk
Files:
9 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/Ohana

  • trunk/Ohana/src/dvomerge/Makefile

    r38986 r39225  
    125125$(SRC)/dvorepairFixCPT.$(ARCH).o \
    126126$(SRC)/dvorepairFixWarpIDs.$(ARCH).o \
     127$(SRC)/dvorepairFixStackIDs.$(ARCH).o \
    127128$(SRC)/dvorepairImagesVsMeasures.$(ARCH).o \
    128129$(SRC)/dvorepairDeleteImageList.$(ARCH).o \
    … …  
    171172$(SRC)/SetSignals.$(ARCH).o \
    172173$(SRC)/Shutdown.$(ARCH).o \
     174$(SRC)/LoadImages.$(ARCH).o \
    173175$(SRC)/dvoutils.$(ARCH).o \
    174176$(SRC)/dvoutils_args.$(ARCH).o \
    175177$(SRC)/dvoutils_uniq_images.$(ARCH).o \
     178$(SRC)/dvoutils_check_images.$(ARCH).o \
    176179$(SRC)/dvoutils_load_image_index.$(ARCH).o
    177180

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

    r39142 r39225  
    252252int dvorepair_by_objID (int argc, char **argv);
    253253int dvorepairFixWarpIDs (int argc, char **argv);
    254 
     254int dvorepairFixStackIDs (int argc, char **argv);
     255

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

    r38986 r39225  
    2020  DVOUTILS_NONE,
    2121  DVOUTILS_UNIQ_IMAGES,
     22  DVOUTILS_CHECK_IMAGES,
    2223} DVOUTILS_OP_TYPE;
    2324
    … …  
    3233
    3334char *IMAGES_LIST;
     35char *CATDIR;
     36char *EXTERN_ID_LIST;
    3437
    3538int main (int argc, char **argv);
    3639int dvoutils_args (int *argc, char **argv);
    3740int dvoutils_uniq_images (char *filename);
     41int dvoutils_check_images (void);
    3842
    3943ImageData *dvoutils_load_image_index (char *filename);

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

    r38986 r39225  
    1111 
    1212  if (!strcmp(argv[1], "-fix-warp-ids")) dvorepairFixWarpIDs(argc, argv);
     13  if (!strcmp(argv[1], "-fix-stack-ids")) dvorepairFixStackIDs(argc, argv);
    1314
    1415  if (!strcmp(argv[1], "-fix-cpt")) dvorepairFixCPT(argc, argv);

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

    r38986 r39225  
    1313      exit (0);
    1414
     15    case DVOUTILS_CHECK_IMAGES:
     16      dvoutils_check_images();
     17      exit (0);
     18
    1519    default:
    1620      fprintf (stderr, "ERROR: unknown option\n");

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

    r37807 r39225  
    2222    remove_argument (N, argc, argv);
    2323  }
     24  if ((N = get_argument (*argc, argv, "-check-images"))) {
     25    DVOUTILS_OP = DVOUTILS_CHECK_IMAGES;
     26    remove_argument (N, argc, argv);
     27    CATDIR = strcreate (argv[N]);
     28    remove_argument (N, argc, argv);
     29    EXTERN_ID_LIST = strcreate (argv[N]);
     30    remove_argument (N, argc, argv);
     31  }
     32
     33  if (*argc != 1) {
     34    fprintf (stderr, "USAGE: dvoutils -uniq-images (filename) [-v,-verbose]\n\n");
     35    fprintf (stderr, "USAGE: dvoutils -check-images (catdir) (externIDs) [-v,-verbose]\n\n");
     36    fprintf (stderr, "  -v : VERBOSE\n");
     37    exit (2);
     38  }
    2439
    2540  if (DVOUTILS_OP == DVOUTILS_NONE) {
    … …  
    2843  }
    2944
    30   if (*argc != 1) {
    31     fprintf (stderr, "USAGE: dvoutils -uniq-images (filename) [-v,-verbose]\n\n");
    32     fprintf (stderr, "  -v : VERBOSE\n");
    33     exit (2);
    34   }
    35 
    3645  return TRUE;
    3746}

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

    r38986 r39225  
    172172
    173173  fprintf (stderr, "USAGE\n");
    174   fprintf (stderr, "  dvorepair -fix-warp-ids (catdir) (idfile) - regenerate images.dat warp_skyfile_ids (EXTERN_ID) values\n");
     174  fprintf (stderr, "  dvorepair -fix-warp-ids (catdir.list) (idfile) - regenerate images.dat warp_skyfile_ids (EXTERN_ID) values\n");
     175  fprintf (stderr, "  dvorepair -fix-stack-ids (catdir.list) - regenerate images.dat stackID (EXTERN_ID) values\n");
    175176  fprintf (stderr, "  dvorepair -fix-cpt (images) (rootlist) - regenerate cpt & cps files from the cpm files\n");
    176177  fprintf (stderr, "  dvorepair -images-vs-measures (catdir) (Ntol) - find images with too many missing detections\n");
Note: See TracChangeset for help on using the changeset viewer.