Changeset 41681

Timestamp:

Jul 2, 2021, 8:35:25 AM (5 years ago)

Author:

eugene

Message:

allow cross-filter stack-stack diffs with -relaxed-filters

Location:

trunk/ippTools

Files:

• share/difftool_definestackstack_part0.sql (modified) (1 diff)
• share/difftool_definestackstack_part1.sql (modified) (1 diff)
• src/difftool.c (modified) (4 diffs)
• src/difftoolConfig.c (modified) (1 diff)

trunk/ippTools/share/difftool_definestackstack_part0.sql

@@ -26 +26 @@
            skycell_id,
            filter
-) AS template ON stackRun.filter = template.filter 
-              AND stackRun.tess_id = template.tess_id 
-              AND stackRun.skycell_id = template.skycell_id 
+) AS template ON stackRun.tess_id = template.tess_id 
+              AND stackRun.skycell_id = template.skycell_id 
+              @FILT0_QUERY@  -- include filter constraint if requested
 LEFT JOIN (
      SELECT 

trunk/ippTools/share/difftool_definestackstack_part1.sql

@@ -27 +27 @@
            skycell_id,
            filter
-) AS template ON stackRun.filter = template.filter 
-              AND stackRun.tess_id = template.tess_id 
+) AS template ON stackRun.tess_id = template.tess_id 
               AND stackRun.skycell_id = template.skycell_id 
+              @FILT1_QUERY@  -- include filter constraint if requested
 LEFT JOIN (
      SELECT 

trunk/ippTools/src/difftool.c

@@ -2414 +2414 @@
 
     PXOPT_LOOKUP_BOOL(bothways, config->args, "-bothways", false);
+    PXOPT_LOOKUP_BOOL(relaxedFilters, config->args, "-relaxed-filters", false);
 
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -2452 +2453 @@
     }
 
+    // restrict input and templated to the same filter unless not restricted
+    psString filtQuery0 = NULL;
+    psString filtQuery1 = NULL;
+    if (! relaxedFilters) {
+        psStringAppend(&filtQuery0, "AND stackRun.filter = template.filter");
+        psStringAppend(&filtQuery1, "AND stackRun.filter = template.filter");
+    }
+
     // find the distinct set of data_groups and filters
     psString query = pxDataGet("difftool_definestackstack_part0.sql");
@@ -2468 +2477 @@
     psStringSubstitute(&query, stack2Query, "@STACK2_QUERY@");
     psStringSubstitute(&query, diffQuery0,  "@DIFF0_QUERY@");
+    psStringSubstitute(&query, filtQuery0,  "@FILT0_QUERY@");
 
     if (!p_psDBRunQuery(config->dbh, query)) {
@@ -2546 +2556 @@
         psStringSubstitute(&query, stack2Query,      "@STACK2_QUERY@");
         psStringSubstitute(&query, diffQuery1,       "@DIFF1_QUERY@");
+        psStringSubstitute(&query, filtQuery1,       "@FILT1_QUERY@");
 
         psTrace("difftool", 1, "%s", query);

trunk/ippTools/src/difftoolConfig.c

@@ -372 +372 @@
     psMetadataAddStr(definestackstackArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID", NULL);
     psMetadataAddBool(definestackstackArgs, PS_LIST_TAIL, "-bothways",  0,          "do the subtraction both ways?", false);
+    psMetadataAddBool(definestackstackArgs, PS_LIST_TAIL, "-relaxed-filters",  0, "allow mismatched filters between input and template?", false);
     psMetadataAddStr(definestackstackArgs, PS_LIST_TAIL, "-filter", 0, "search by filter", NULL);
     psMetadataAddStr(definestackstackArgs, PS_LIST_TAIL, "-input_label", 0, "search by stack label for input", NULL);