Context Navigation

difftool.c

Timestamp:

May 5, 2011, 10:05:10 AM (15 years ago)

Author:

eugene

Message:

merging updates from trunk

Location:

branches/eam_branches/ipp-20110404/ippTools/src

Files:

Property svn:ignore

Property svn:mergeinfo changed

/branches/czw_branch/20110406/ippTools/src (added)	merged: 31253,31338,31385,31396-31397,31407,31409,31417,31428-31430,31433-31434
/branches/haf_branches/haf_add2011/ippTools/src (added)	merged: 31280
/trunk/ippTools/src (added)	merged: 31205,31237,31247,31249,31293,31301,31375,31383,31435

-              r30907
+              r31439
     PXOPT_COPY_S64(config->args, selectWhere, "-exp_id", "inputRawExp.exp_id", "==");
     PXOPT_COPY_S64(config->args, selectWhere, "-template_exp_id", "templateRawExp.exp_id", "==");
+    PXOPT_COPY_S64(config->args, selectWhere, "-template_warp_id", "templateWarpRun.warp_id", "==");
     PXOPT_COPY_STR(config->args, selectWhere, "-filter", "inputRawExp.filter", "==");
     PXOPT_COPY_STR(config->args, selectWhere, "-obs_mode", "inputRawExp.obs_mode", "==");
 …
     pxAddLabelSearchArgs (config, where, "-data_group", "diffRun.data_group", "LIKE");
     pxAddLabelSearchArgs (config, where, "-dist_group", "diffRun.dist_group", "LIKE");
+    PXOPT_COPY_S64(config->args, where, "-template_exp_id", "rawTemplate.exp_id", "==");
     PXOPT_LOOKUP_BOOL(template, config->args, "-template", false);

Note: See TracChangeset for help on using the changeset viewer.