IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 37948


Ignore:
Timestamp:
Mar 4, 2015, 2:30:52 PM (11 years ago)
Author:
watersc1
Message:

Merge from trunk of difftool/pxspace changes needed to get the PV3 warpstack diffs going.

Location:
tags/ipp-pv3-20140717/ippTools/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • tags/ipp-pv3-20140717/ippTools/src/difftool.c

    r36572 r37948  
    4242static bool definepoprunMode(pxConfig *config);
    4343static bool definewarpstackMode(pxConfig *config);
     44//static bool definewarpstackOldMethodMode(pxConfig *config);
    4445static bool definewarpwarpMode(pxConfig *config);
    4546static bool definestackstackMode(pxConfig *config);
    … …  
    9596        MODECASE(DIFFTOOL_MODE_DEFINEPOPRUN,          definepoprunMode);
    9697        MODECASE(DIFFTOOL_MODE_DEFINEWARPSTACK,       definewarpstackMode);
     98        //      MODECASE(DIFFTOOL_MODE_DEFINEWARPSTACKOLDMETHOD,       definewarpstackOldMethodMode);
    9799        MODECASE(DIFFTOOL_MODE_DEFINEWARPWARP,        definewarpwarpMode);
    98100        MODECASE(DIFFTOOL_MODE_DEFINESTACKSTACK,      definestackstackMode);
    … …  
    12441246  PXOPT_COPY_STR(config->args, where, "-stack_data_group", "stackRun.data_group", "==");
    12451247
     1248  // Add position dependence here.
     1249  if (!pxspaceBoxAddWhere(config,where)) {
     1250    psError(psErrorCodeLast(), false, "pxSpaceBoxAddWhere failed");
     1251    return false;
     1252  }
     1253 
     1254  PXOPT_LOOKUP_BOOL(available, config->args, "-available", false);
    12461255  PXOPT_LOOKUP_BOOL(bothways, config->args, "-bothways", false);
    12471256 
    … …  
    13271336    return true;
    13281337  }
     1338 
    13291339  if (pretend) {
    13301340    // negative simple so the default is true
    … …  
    15181528
    15191529#if (0)
    1520 static bool definewarpstackMode(pxConfig *config)
     1530static bool definewarpstackOldMethodMode(pxConfig *config)
    15211531{
    15221532    PS_ASSERT_PTR_NON_NULL(config, false);
    … …  
    15301540    PXOPT_COPY_STR(config->args, expWhere, "-filter", "filter", "==");
    15311541    PXOPT_COPY_STR(config->args, expWhere, "-comment", "comment", "LIKE");
     1542   
    15321543    PXOPT_COPY_S64(config->args, warp1Where, "-warp_id", "warpRun.warp_id", "==");
    15331544    PXOPT_COPY_STR(config->args, warp1Where, "-warp_label", "warpRun.label", "==");
    … …  
    17981809        }
    17991810
     1811        // CZW force available off.  If we're using this very-expensive mode, we need to get the one thing it does correctly.
     1812        available = false;;
    18001813        if (!available && (num != skycell_count)) {
    18011814            psTrace("difftool", PS_LOG_INFO, "%" PRId64 " skyfiles with stack found for warp_id %" PRId64

  • tags/ipp-pv3-20140717/ippTools/src/difftool.h

    r29416 r37948  
    5454    DIFFTOOL_MODE_LISTSSRUN,
    5555    DIFFTOOL_MODE_SETSKYFILETOUPDATE,
     56    //    DIFFTOOL_MODE_DEFINEWARPSTACKOLDMETHOD,
    5657} difftoolMode;
    5758

  • tags/ipp-pv3-20140717/ippTools/src/difftoolConfig.c

    r34770 r37948  
    272272    psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-pretend", 0, "list results but to not queue", false);
    273273
     274    pxspaceBoxAddArguments(definewarpstackArgs);
     275
     276#if (0)   
     277    // -definewarpstackOldMethod
     278    psMetadata *definewarpstackOldMethodArgs = psMetadataAlloc();
     279    psMetadataAddS64(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warp ID", 0);
     280    psMetadataAddS64(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", 0);
     281    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", NULL);
     282    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID", NULL);
     283    psMetadataAddBool(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-bothways",  0,          "do the subtraction both ways?", false);
     284    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-filter", 0, "search by filter", NULL);
     285    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-comment", 0, "search by comment (LIKE)", NULL);
     286    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-stack_label", 0, "search by stack label", NULL);
     287    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-stack_data_group", 0, "search by stack data_group", NULL);
     288    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-warp_label", 0, "search by warp label", NULL);
     289    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-data_group", 0, "search by data_group", NULL);
     290    psMetadataAddF32(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-good_frac", 0, "minimum good fraction of skycell", NAN);
     291    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-set_workdir", 0, "define workdir (required)", NULL);
     292    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-set_label",  0, "define label", NULL);
     293    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-set_reduction",  0, "define reduction class", NULL);
     294    psMetadataAddTime(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-set_registered", 0, "time detrend run was registered", now);
     295    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-set_data_group",  0,     "define data group", NULL);
     296    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-set_dist_group",  0,     "define dist group", NULL);
     297    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-set_note",  0,           "define note", NULL);
     298    psMetadataAddBool(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-new-templates", 0, "also search for diffs with new template", false);
     299    psMetadataAddBool(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-rerun", 0, "define new run even if one exists", false);
     300    psMetadataAddBool(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-available", 0, "define new run even if no stacks available for some skycells", false);
     301    psMetadataAddBool(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
     302    psMetadataAddBool(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-pretend", 0, "list results but to not queue", false);
     303
     304    pxspaceBoxAddArguments(definewarpstackOldMethodArgs);
     305#endif
     306   
    274307    // -definewarpwarp
    275308    psMetadata *definewarpwarpArgs = psMetadataAlloc();
    … …  
    478511    PXOPT_ADD_MODE("-definepoprun",     "", DIFFTOOL_MODE_DEFINEPOPRUN,      definepoprunArgs);
    479512    PXOPT_ADD_MODE("-definewarpstack",  "", DIFFTOOL_MODE_DEFINEWARPSTACK,   definewarpstackArgs);
     513    //    PXOPT_ADD_MODE("-definewarpstackOldMethod",  "", DIFFTOOL_MODE_DEFINEWARPSTACKOLDMETHOD,   definewarpstackOldMethodArgs);
    480514    PXOPT_ADD_MODE("-definewarpwarp",   "", DIFFTOOL_MODE_DEFINEWARPWARP,    definewarpwarpArgs);
    481515    PXOPT_ADD_MODE("-definestackstack", "", DIFFTOOL_MODE_DEFINESTACKSTACK,  definestackstackArgs);

  • tags/ipp-pv3-20140717/ippTools/src/pxspace.c

    r35040 r37948  
    5757}
    5858
     59bool pxspaceBoxAddWhere(pxConfig *config, psMetadata *where)
     60{
     61  PXOPT_LOOKUP_F64(ra_min, config->args, "-ra_min", false, false);
     62  PXOPT_LOOKUP_F64(ra_max, config->args, "-ra_max", false, false);
     63  PXOPT_LOOKUP_F64(dec_min, config->args, "-dec_min", false, false);
     64  PXOPT_LOOKUP_F64(dec_max, config->args, "-dec_max", false, false);
     65
     66  if (ra_min) {
     67    ra_min *= PS_RAD_DEG;
     68    psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.ra",PS_META_DUPLICATE_OK, ">=", ra_min);
     69  }
     70  if (ra_max) {
     71    ra_max *= PS_RAD_DEG;
     72    psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.ra",PS_META_DUPLICATE_OK, "<=", ra_max);
     73  }
     74  if (dec_min) {
     75    dec_min *= PS_RAD_DEG;
     76    psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.decl",PS_META_DUPLICATE_OK, ">=", dec_min);
     77  }
     78  if (dec_max) {
     79    dec_max *= PS_RAD_DEG;
     80    psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.decl",PS_META_DUPLICATE_OK, "<=", dec_max);
     81  }
     82   
     83  return true;
     84}
     85
     86void pxspaceBoxAddArguments(psMetadata *md)
     87{
     88    psMetadataAddF64(md,  PS_LIST_TAIL, "-ra_min",            0, "search by right ascension (degrees)", NAN);
     89    psMetadataAddF64(md,  PS_LIST_TAIL, "-dec_min",           0, "search by declination (degrees)", NAN);
     90    psMetadataAddF64(md,  PS_LIST_TAIL, "-ra_max",            0, "search by right ascension (degrees)", NAN);
     91    psMetadataAddF64(md,  PS_LIST_TAIL, "-dec_max",           0, "search by declination (degrees)", NAN);
     92}
     93 
     94
    5995void pxskycellAddArguments(psMetadata *md)
    6096{

  • tags/ipp-pv3-20140717/ippTools/src/pxspace.h

    r33921 r37948  
    2424extern void pxspaceAddArguments(psMetadata *md);
    2525
     26extern bool pxspaceBoxAddWhere(pxConfig *config, psMetadata *where);
     27extern void pxspaceBoxAddArguments(psMetadata *md);
     28
    2629extern bool pxskycellAddWhere(pxConfig *config, psMetadata *where);
    2730extern void pxskycellAddArguments(psMetadata *md);
Note: See TracChangeset for help on using the changeset viewer.