Index: trunk/ippTools/src/dqstatstool.c
===================================================================
--- trunk/ippTools/src/dqstatstool.c	(revision 28427)
+++ trunk/ippTools/src/dqstatstool.c	(revision 30466)
@@ -92,5 +92,5 @@
   }
   else {
-    psStringAppend(&query, " AND (invalid IS NULL OR invalid = 1) ");
+    psStringAppend(&query, " AND (warp_id IS NOT NULL AND invalid IS NULL) ");
   }
 
@@ -402,7 +402,17 @@
 
     if (psMetadataLookupStr(&status,enginedef,"COLNAME")&&
-	isfinite(psMetadataLookupF32(&status,enginedef,"MINIMUM"))&&
-	isfinite(psMetadataLookupF32(&status,enginedef,"MAXIMUM"))) {
+	(strcmp(psMetadataLookupStr(&status,enginedef,"RULETYPE"),"STRICT") == 0)&&
+	(isfinite(psMetadataLookupF32(&status,enginedef,"MINIMUM"))&&
+	 isfinite(psMetadataLookupF32(&status,enginedef,"MAXIMUM")))) {
       psArrayAdd(decisionRules,decisionRules->n,enginedef);
+    }
+    else if (psMetadataLookupStr(&status,enginedef,"COLNAME")&&
+	     (strcmp(psMetadataLookupStr(&status,enginedef,"RULETYPE"),"CDF") == 0)&&
+	     (isfinite(psMetadataLookupF32(&status,enginedef,"CDF00"))&&
+	      isfinite(psMetadataLookupF32(&status,enginedef,"CDF50"))&&
+	      isfinite(psMetadataLookupF32(&status,enginedef,"CDF100")))) {
+      psArrayAdd(decisionRules,decisionRules->n, enginedef);
+    }
+    else if (strcmp(psMetadataLookupStr(&status,enginedef,"RULETYPE"),"UNUSED") == 0) {
     }
     else {
@@ -637,4 +647,5 @@
     // Calculate if this exposure was "good" or not.
     bool accept = true;
+    psF32 quality = 1.0;
     for (long j = 0; j < decisionRules->n; j++) {
       psMetadata *rule = decisionRules->data[j];
@@ -644,29 +655,10 @@
 	psError(PS_EXIT_CONFIG_ERROR, false, "Unable to find column name");
 	return(false);
-      }      
-      psF32 min_value  = psMetadataLookupF32(&status,rule,"MINIMUM");
-      if (!status) {
-	psError(PS_EXIT_CONFIG_ERROR, false, "Unable to find min value for %s",colname);
-	return(false);
-      }      
-      psF32 max_value  = psMetadataLookupF32(&status,rule,"MAXIMUM");
-      if (!status) {
-	psError(PS_EXIT_CONFIG_ERROR, false, "Unable to find max value for %s",colname);
-	return(false);
-      }
-      psString filter = psMetadataLookupStr(&status,rule,"FILTER");
-      if (!status) {
-	status = true;
-      }
-      if (filter) {
-	psString imfilter = psMetadataLookupStr(&status,tableRow,"FILTER");
-	if (strcmp(filter,imfilter) != 0) {
-	  continue;
-	}
       }
       // Not happy with this being set to a F32. Can this ever be something else?
       psF32 value      = psMetadataLookupF32(&status,tableRow,colname);
       if (!status) {
-	psError(PS_EXIT_CONFIG_ERROR, false, "Unable to find column %s (%f %f %f) in compare with rule.",colname,min_value,max_value,value);
+	psError(PS_EXIT_CONFIG_ERROR, false, "Unable to find column %s (%f) in compare with rule.",
+		colname,value);
 	psFree(colNames);
 	psFree(colTypes);
@@ -677,7 +669,92 @@
 	return(false);
       }
-      if ((value > max_value)||(value < min_value)) {
-	accept = false;
-      }      
+      psString filter = psMetadataLookupStr(&status,rule,"FILTER");
+      if (!status) {
+	status = true;
+      }
+      if (filter) {
+	psString imfilter = psMetadataLookupStr(&status,tableRow,"FILTER");
+	if (strcmp(filter,imfilter) != 0) {
+	  continue;
+	}
+      }
+      
+      if (strcmp(psMetadataLookupStr(&status,rule,"RULETYPE"),"STRICT") == 0) {
+	psF32 min_value  = psMetadataLookupF32(&status,rule,"MINIMUM");
+	if (!status) {
+	  psError(PS_EXIT_CONFIG_ERROR, false, "Unable to find min value for %s",colname);
+	  return(false);
+	}      
+	psF32 max_value  = psMetadataLookupF32(&status,rule,"MAXIMUM");
+	if (!status) {
+	  psError(PS_EXIT_CONFIG_ERROR, false, "Unable to find max value for %s",colname);
+	  return(false);
+	}
+
+	if ((value > max_value)||(value < min_value)) {
+	  accept = false;
+	}
+      } // End STRICT min/max rule parsing
+      else if (strcmp(psMetadataLookupStr(&status,rule,"RULETYPE"),"CDF") == 0) {
+	// I'm just going to implement a quick linear interpolation over the points that exist.
+	psF32 min_value,max_value = 99;
+	psF32 min_cdf = 0.0,max_cdf = 1.0;
+	psF32 cdf;
+	psF32 try[22] = {0.00,0.05,0.10,0.15,0.20,0.25,0.30,0.35,0.40,0.45,0.50,
+			 0.55,0.60,0.65,0.70,0.75,0.80,0.85,0.90,0.95,0.99,1.00};
+	int i;
+	int done = 0;
+	status = true;
+	min_value = psMetadataLookupF32(&status,rule,"CDF00");
+	min_cdf   = 0.0;
+	if (!isfinite(value)) {
+	  quality = 0.0;
+	  continue;
+	}
+	if (!status) {
+	  status = true;
+	  psError(PS_EXIT_CONFIG_ERROR, false, "Unable to find CDF00 value for %s",colname);
+	}
+	if (value < min_value) {
+	  if (quality > min_cdf) {
+	    quality = 0.0;
+	    continue;
+	  }
+	}
+
+	for (i = 1; i < 22; i++) {
+	  psString label = psStringCopy("");
+	  psStringAppend(&label,"CDF%02d",(int) (100 * try[i]));
+	  
+	  max_value = psMetadataLookupF32(&status,rule,label);
+	  max_cdf   = try[i];
+	  if (!status) {
+	    status = true;
+	    psError(PS_EXIT_CONFIG_ERROR, false, "Unable to find %s value for %s",label,colname);
+	  }
+	  if ((value < max_value)&&(value > min_value)) {
+	    cdf = ((value - min_value) * max_cdf + (max_value - value) * min_cdf) / (max_value - min_value);
+	    //	    fprintf(stderr,"value: %f %f %f %f %f %f %d %d %f\n",value,quality,min_cdf,min_value,max_cdf,max_value, value < max_value, value > min_value,cdf);
+	    if (quality > cdf) {
+	      quality = cdf;
+	      done = 1;
+	      i = 25;
+	    }
+	  }
+	  min_value = max_value;
+	  min_cdf = max_cdf;
+	}
+	if (done) {
+	  continue;
+	}
+	// Reached end of array without finding the value;
+	if (value > min_value) {
+	  if (quality > min_cdf) {
+	    quality = 1.0;
+	  }
+	}
+
+
+      } // End CDF rule parsing
     }
     bool success;
@@ -695,4 +772,17 @@
       return(false);
     }
+    success = psMetadataAddF32(tableRow,PS_LIST_TAIL,"QUALITY",0,"",quality);
+    if (!success) {
+      psError(PS_ERR_UNKNOWN,false, "Error adding exposure quality to fits table row.");
+      psFree(colNames);
+      psFree(colTypes);
+      psFree(contents);
+      psFree(query);
+      psFree(outTable);
+      psFree(statsoutput);
+      psFree(statIter);
+      psFree(tableRow);
+      return(false);
+    }
 
     // Add the row to the table array.