Index: trunk/ippTools/src/pxtools.c
===================================================================
--- trunk/ippTools/src/pxtools.c	(revision 28091)
+++ trunk/ippTools/src/pxtools.c	(revision 28107)
@@ -59,19 +59,19 @@
 
     if (!version1) {
-	psStringAppend(&out, "%s", version2);
-	return(out);
+        psStringAppend(&out, "%s", version2);
+        return(out);
     }
     if (!version2) {
-	psStringAppend(&out, "%s", version1);
-	return(out);
-    }
-  
+        psStringAppend(&out, "%s", version1);
+        return(out);
+    }
+
     if (strchr(version1,'M')) {
-	psStringSubstitute(&version1,"M","");
-	mod1 = true;
+        psStringSubstitute(&version1,"M","");
+        mod1 = true;
     }
     if (strchr(version2,'M')) {
-	psStringSubstitute(&version2,"M","");
-	mod2 = true;
+        psStringSubstitute(&version2,"M","");
+        mod2 = true;
     }
 
@@ -80,13 +80,13 @@
 
     if (num1 >= num2) {
-	numO = num1;
+        numO = num1;
     }
     else {
-	numO = num2;
-    }
-  
+        numO = num2;
+    }
+
     psStringAppend(&out,"%" PRId32,numO);
     if (mod1 || mod2) {
-	psStringAppend(&out,"M");
+        psStringAppend(&out,"M");
     }
     return(out);
@@ -94,6 +94,6 @@
 
 bool pxCoalesceRunStatus(pxConfig *config, const psString dbQFile, psS64 stage_id, psString *software_ver,
-			 psS64 *maskfrac_npix, psF32 *maskfrac_static, psF32 *maskfrac_dynamic,
-			 psF32 *maskfrac_magic, psF32 *maskfrac_advisory) {
+                         psS64 *maskfrac_npix, psF32 *maskfrac_static, psF32 *maskfrac_dynamic,
+                         psF32 *maskfrac_magic, psF32 *maskfrac_advisory) {
     psString query = pxDataGet(dbQFile);
 /*   psString text_id = NULL; */
@@ -102,35 +102,38 @@
 /*   psFree(text_id); */
     if (!p_psDBRunQueryF(config->dbh, query, stage_id)) {
-	psError(PS_ERR_UNKNOWN, false, "database error");
-	psFree(query);
-	return(false);
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return(false);
     }
     psFree(query);
     psArray *output = p_psDBFetchResult(config->dbh);
     if (!output) {
-	psError(PS_ERR_UNKNOWN, false, "database error");
-	return(false);
-    }
-  
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return(false);
+    }
+
     for (long i = 0; i < psArrayLength(output); i++) {
-	psMetadata *row = output->data[i];
-
-	psS32 this_npix = psMetadataLookupS32(NULL, row, "maskfrac_npix");
-	psF32 this_static = psMetadataLookupF32(NULL, row, "maskfrac_static");
-	psF32 this_dynamic = psMetadataLookupF32(NULL, row, "maskfrac_dynamic");
-	psF32 this_magic = psMetadataLookupF32(NULL, row, "maskfrac_magic");
-	psF32 this_advisory = psMetadataLookupF32(NULL, row, "maskfrac_advisory");
-	psString this_version = psMetadataLookupStr(NULL, row, "software_ver");
-
-	*software_ver = pxMergeCodeVersions(*software_ver,this_version);
+        psMetadata *row = output->data[i];
+
+        psS32 this_npix = psMetadataLookupS32(NULL, row, "maskfrac_npix");
+        psF32 this_static = psMetadataLookupF32(NULL, row, "maskfrac_static");
+        psF32 this_dynamic = psMetadataLookupF32(NULL, row, "maskfrac_dynamic");
+        psF32 this_magic = psMetadataLookupF32(NULL, row, "maskfrac_magic");
+        psF32 this_advisory = psMetadataLookupF32(NULL, row, "maskfrac_advisory");
+        psString this_version = psMetadataLookupStr(NULL, row, "software_ver");
+
+        psTrace("pxtools", 3, "Mask stats: %d %f %f %f %f %s\n",
+                this_npix, this_static, this_dynamic, this_magic, this_advisory, this_version);
+
+        *software_ver = pxMergeCodeVersions(*software_ver,this_version);
 /*     printf("%ld : %d %f %f %f %f <-> %ld %f %f %f %f\n",i,this_npix,this_static,this_dynamic,this_magic,this_advisory, */
-/* 	   *maskfrac_npix,*maskfrac_static,*maskfrac_dynamic,*maskfrac_magic,*maskfrac_advisory); */
-	if (this_npix > 0) {
-	    *maskfrac_static = ((*maskfrac_static * *maskfrac_npix) + (this_npix * this_static)) / (this_npix + *maskfrac_npix);
-	    *maskfrac_dynamic = ((*maskfrac_dynamic * *maskfrac_npix) + (this_npix * this_dynamic)) / (this_npix + *maskfrac_npix);
-	    *maskfrac_magic = ((*maskfrac_magic * *maskfrac_npix) + (this_npix * this_magic)) / (this_npix + *maskfrac_npix);
-	    *maskfrac_advisory = ((*maskfrac_advisory * *maskfrac_npix) + (this_npix * this_advisory)) / (this_npix + *maskfrac_npix);
-	    *maskfrac_npix += this_npix;
-	}
+/*         *maskfrac_npix,*maskfrac_static,*maskfrac_dynamic,*maskfrac_magic,*maskfrac_advisory); */
+        if (this_npix > 0) {
+            *maskfrac_static = ((*maskfrac_static * *maskfrac_npix) + (this_npix * this_static)) / (this_npix + *maskfrac_npix);
+            *maskfrac_dynamic = ((*maskfrac_dynamic * *maskfrac_npix) + (this_npix * this_dynamic)) / (this_npix + *maskfrac_npix);
+            *maskfrac_magic = ((*maskfrac_magic * *maskfrac_npix) + (this_npix * this_magic)) / (this_npix + *maskfrac_npix);
+            *maskfrac_advisory = ((*maskfrac_advisory * *maskfrac_npix) + (this_npix * this_advisory)) / (this_npix + *maskfrac_npix);
+            *maskfrac_npix += this_npix;
+        }
     }
     psFree(output);
@@ -139,27 +142,27 @@
 
 bool pxSetRunSoftware(pxConfig *config, const psString tableName, const psString stage_id_name, const psS64 stage_id,
-		      psString software_ver) {
+                      psString software_ver) {
     char *query = "UPDATE %s SET software_ver = '%s' WHERE %s = %" PRId64;
 /*   printf(query,tableName,software_ver,stage_id_name,stage_id); */
     if (!p_psDBRunQueryF(config->dbh,query,tableName,software_ver,stage_id_name,stage_id)) {
-	psError(PS_ERR_UNKNOWN, false,
-		"failed to set software version for %s %" PRId64,stage_id_name,stage_id);
-	return(false);
-    }
-  
+        psError(PS_ERR_UNKNOWN, false,
+                "failed to set software version for %s %" PRId64,stage_id_name,stage_id);
+        return(false);
+    }
+
     return(true);
 }
 
 bool pxSetRunMaskfrac(pxConfig *config, const psString tableName, const psString stage_id_name, const psS64 stage_id,
-		      psS64 maskfrac_npix, psF32 maskfrac_static, psF32 maskfrac_dynamic,
-		      psF32 maskfrac_magic, psF32 maskfrac_advisory) {
+                      psS64 maskfrac_npix, psF32 maskfrac_static, psF32 maskfrac_dynamic,
+                      psF32 maskfrac_magic, psF32 maskfrac_advisory) {
     char *query = "UPDATE %s SET maskfrac_npix = %f, maskfrac_static = %f, maskfrac_dynamic = %f, maskfrac_magic = %f, maskfrac_advisory = %f WHERE %s = %" PRId64;
     if (!p_psDBRunQueryF(config->dbh,query,tableName,(float) maskfrac_npix,maskfrac_static,
-			 maskfrac_dynamic, maskfrac_magic,maskfrac_advisory,stage_id_name,stage_id)) {
-	psError(PS_ERR_UNKNOWN, false,
-		"failed to set maskfrac stats for %s %" PRId64,stage_id_name,stage_id);
-	return(false);
-    }
-  
+                         maskfrac_dynamic, maskfrac_magic,maskfrac_advisory,stage_id_name,stage_id)) {
+        psError(PS_ERR_UNKNOWN, false,
+                "failed to set maskfrac stats for %s %" PRId64,stage_id_name,stage_id);
+        return(false);
+    }
+
 
 
@@ -168,19 +171,19 @@
 
 bool pxCamSetRunMaskfrac(pxConfig *config, const psString tableName, const psString stage_id_name, const psS64 stage_id,
-			 psS64 maskfrac_ref_npix, psF32 maskfrac_ref_static, psF32 maskfrac_ref_dynamic,
-			 psF32 maskfrac_ref_magic, psF32 maskfrac_ref_advisory,
-			 psS64 maskfrac_max_npix, psF32 maskfrac_max_static, psF32 maskfrac_max_dynamic,
-			 psF32 maskfrac_max_magic, psF32 maskfrac_max_advisory) {
+                         psS64 maskfrac_ref_npix, psF32 maskfrac_ref_static, psF32 maskfrac_ref_dynamic,
+                         psF32 maskfrac_ref_magic, psF32 maskfrac_ref_advisory,
+                         psS64 maskfrac_max_npix, psF32 maskfrac_max_static, psF32 maskfrac_max_dynamic,
+                         psF32 maskfrac_max_magic, psF32 maskfrac_max_advisory) {
   char *query = "UPDATE %s SET maskfrac_ref_npix = %f, maskfrac_ref_static = %f, maskfrac_ref_dynamic = %f, maskfrac_ref_magic = %f, maskfrac_ref_advisory = %f, maskfrac_max_npix = %f, maskfrac_max_static = %f, maskfrac_max_dynamic = %f, maskfrac_max_magic = %f, maskfrac_max_advisory = %f WHERE %s = %" PRId64;
   if (!p_psDBRunQueryF(config->dbh,query,tableName,(float) maskfrac_ref_npix,maskfrac_ref_static,
-		       maskfrac_ref_dynamic, maskfrac_ref_magic,maskfrac_ref_advisory,
-		       (float) maskfrac_max_npix,maskfrac_max_static,
-		       maskfrac_max_dynamic, maskfrac_max_magic,maskfrac_max_advisory,
-		       stage_id_name,stage_id)) {
+                       maskfrac_ref_dynamic, maskfrac_ref_magic,maskfrac_ref_advisory,
+                       (float) maskfrac_max_npix,maskfrac_max_static,
+                       maskfrac_max_dynamic, maskfrac_max_magic,maskfrac_max_advisory,
+                       stage_id_name,stage_id)) {
     psError(PS_ERR_UNKNOWN, false,
-	    "failed to set maskfrac stats for %s %" PRId64,stage_id_name,stage_id);
+            "failed to set maskfrac stats for %s %" PRId64,stage_id_name,stage_id);
     return(false);
   }
-  
+
 
 
@@ -293,10 +296,10 @@
     char *comma = ",";
 
-#   define addColumn(_tab, _val)					\
-    do {								\
-	if (_val) {							\
-	    psStringAppend(pQuery, "%s %s.%s = '%s'", separator, _tab, #_val, _val); \
-	    separator = comma;						\
-	}								\
+#   define addColumn(_tab, _val)                                        \
+    do {                                                                \
+        if (_val) {                                                     \
+            psStringAppend(pQuery, "%s %s.%s = '%s'", separator, _tab, #_val, _val); \
+            separator = comma;                                          \
+        }                                                               \
     } while (0)
 
@@ -436,5 +439,5 @@
         if (import_version && strcmp(import_version, schema_version)) {
             psError(PS_ERR_UNKNOWN, true, "input file schema_version: %s does not match data base: %s",
-		    import_version, schema_version);
+                    import_version, schema_version);
             return false;
         } else if (!import_version) {