Index: trunk/ippTools/share/staticskytool_definebyquery_inputs.sql
===================================================================
--- trunk/ippTools/share/staticskytool_definebyquery_inputs.sql	(revision 31687)
+++ trunk/ippTools/share/staticskytool_definebyquery_inputs.sql	(revision 31689)
@@ -11,4 +11,5 @@
       AND stackRun.tess_id = '%s'
       AND stackRun.skycell_id = '%s'
-  -- WHERE hook %s
+  -- WHERE hook 1 %s
+  -- WHERE hook 2 %s
   GROUP BY stackRun.filter
Index: trunk/ippTools/src/staticskytool.c
===================================================================
--- trunk/ippTools/src/staticskytool.c	(revision 31687)
+++ trunk/ippTools/src/staticskytool.c	(revision 31689)
@@ -242,7 +242,23 @@
             return false;
         }
+        psString by_data_group = NULL;
+        psString stack_data_group = NULL;
+        if (group_by_data_group) {
+            stack_data_group = psMetadataLookupStr(&status, row, "data_group");
+            if (!status) {
+                psError(PS_ERR_UNKNOWN, false, "failed to lookup tess_id");
+                psFree(output);
+                psFree(inputsSQL);
+                if (!psDBRollback(config->dbh)) {
+                    psError(PS_ERR_UNKNOWN, false, "database error");
+                }
+                return false;
+            }
+            psStringAppend(&by_data_group, " AND stackRun.data_group = '%s'", stack_data_group);
+        }
 
 	// query for the inputs
-	if (!p_psDBRunQueryF(config->dbh, inputsSQL, tess_id, skycell_id, where)) {
+	if (!p_psDBRunQueryF(config->dbh, inputsSQL, tess_id, skycell_id, where, 
+                                                        by_data_group ? by_data_group : "")) {
 	    psError(PS_ERR_UNKNOWN, false, "database error");
             psFree(output);
@@ -302,5 +318,5 @@
 				workdir,
 				label,
-				data_group ? data_group : label,
+				data_group ? data_group : (stack_data_group ? stack_data_group : label),
 				dist_group,
 				reduction,