Index: trunk/ippTools/src/stacktool.c
===================================================================
--- trunk/ippTools/src/stacktool.c	(revision 28376)
+++ trunk/ippTools/src/stacktool.c	(revision 28600)
@@ -78,8 +78,8 @@
         MODECASE(STACKTOOL_MODE_ADDSUMSKYFILE,         addsumskyfileMode);
         MODECASE(STACKTOOL_MODE_SUMSKYFILE,            sumskyfileMode);
-	MODECASE(STACKTOOL_MODE_SASSSKYFILE,            sassskyfileMode);
+        MODECASE(STACKTOOL_MODE_SASSSKYFILE,            sassskyfileMode);
         MODECASE(STACKTOOL_MODE_REVERTSUMSKYFILE,      revertsumskyfileMode);
-	MODECASE(STACKTOOL_MODE_TOSUMMARY,             tosummaryMode);
-	MODECASE(STACKTOOL_MODE_ADDSUMMARY,            addsummaryMode);
+        MODECASE(STACKTOOL_MODE_TOSUMMARY,             tosummaryMode);
+        MODECASE(STACKTOOL_MODE_ADDSUMMARY,            addsummaryMode);
         MODECASE(STACKTOOL_MODE_PENDINGCLEANUPRUN,     pendingcleanuprunMode);
         MODECASE(STACKTOOL_MODE_PENDINGCLEANUPSKYFILE, pendingcleanupskyfileMode);
@@ -155,8 +155,8 @@
 
     printf("%" PRId64 " %s %s %s %s\n",psMetadataLookupS64(NULL,row,"sass_id"),
-	   psMetadataLookupStr(NULL,row,"data_group"),
-	   psMetadataLookupStr(NULL,row,"tess_id"),
-	   psMetadataLookupStr(NULL,row,"filter"),
-	   psMetadataLookupStr(NULL,row,"projection_cell"));
+           psMetadataLookupStr(NULL,row,"data_group"),
+           psMetadataLookupStr(NULL,row,"tess_id"),
+           psMetadataLookupStr(NULL,row,"filter"),
+           psMetadataLookupStr(NULL,row,"projection_cell"));
 
     if (psMetadataLookupS64(NULL,row,"sass_id") == PS_MAX_S64) {
@@ -170,12 +170,12 @@
     psMetadataAddStr(outrow,PS_LIST_TAIL,"filter",PS_META_REPLACE,"",psMetadataLookupStr(NULL,row,"filter"));
     psMetadataAddStr(outrow,PS_LIST_TAIL,"projection_cell",PS_META_REPLACE,"",
-		     psMetadataLookupStr(NULL,row,"projection_cell"));
+                     psMetadataLookupStr(NULL,row,"projection_cell"));
   }
   printf("%" PRId64 " %s %s %s %s\n",psMetadataLookupS64(NULL,outrow,"sass_id"),
-	 psMetadataLookupStr(NULL,outrow,"data_group"),
-	 psMetadataLookupStr(NULL,outrow,"tess_id"),
-	 psMetadataLookupStr(NULL,outrow,"filter"),
-	 psMetadataLookupStr(NULL,outrow,"projection_cell"));
-  
+         psMetadataLookupStr(NULL,outrow,"data_group"),
+         psMetadataLookupStr(NULL,outrow,"tess_id"),
+         psMetadataLookupStr(NULL,outrow,"filter"),
+         psMetadataLookupStr(NULL,outrow,"projection_cell"));
+
 
   psFree(output);
@@ -184,8 +184,8 @@
   return(sassRow);
 }
-      
-      
-  
-					      
+
+
+
+
 
 
@@ -239,4 +239,5 @@
     PXOPT_COPY_F32(config->args,  where, "-select_zpt_obs_min",        "camProcessedExp.zpt_obs", ">=");
     PXOPT_COPY_F32(config->args,  where, "-select_zpt_obs_max",        "camProcessedExp.zpt_obs", "<=");
+    PXOPT_COPY_F32(config->args,  where, "-select_astrom",             "sqrt(POWER(camProcessedExp.sigma_ra, 2) + POWER(camProcessedExp.sigma_dec, 2))", "<=");
 
     PXOPT_COPY_STR(config->args,  where, "-select_exp_type",           "rawExp.exp_type", "==");
@@ -483,48 +484,48 @@
         psFree(run);
 
-	//CZW Add an association entry here.
-	// Define the requested association, and insert it if it doesn't already exist
-	stackAssociationRow *association = pxStackAssociationDefine(config,stack_id);
-	psS64 sass_id;
-	if (!association->sass_id) {
-	  psTrace("stacktool.association",2,"No required Association found. Adding.");
-
-	  if (!stackAssociationInsertObject(config->dbh,association)) {
-	    if (!psDBRollback(config->dbh)) {
-	      psError(PS_ERR_UNKNOWN, false, "database error");
-	    }
-	    psError(PS_ERR_UNKNOWN, false, "database error");
-	    psFree(output);
-	    psFree(run);
-	    psFree(insert);
-	    psFree(list);
-	    psFree(association);
-	    if (!psDBRollback(config->dbh)) {
-	      psError(PS_ERR_UNKNOWN, false, "database error");
-	    }
-	    return(false);
-	  }
-	  sass_id = psDBLastInsertID(config->dbh);
-	  association->sass_id = sass_id;
-	}
-	// Insert the map entry for this row.
-	stackAssociationMapRow *maprow = stackAssociationMapRowAlloc(sass_id,stack_id);
-	if (!stackAssociationMapInsertObject(config->dbh,maprow)) {
-	  if (!psDBRollback(config->dbh)) {
-	    psError(PS_ERR_UNKNOWN, false, "database error");
-	  }
-	  psError(PS_ERR_UNKNOWN, false, "database error");
-	  psFree(output);
-	  psFree(run);
-	  psFree(insert);
-	  psFree(list);
-	  psFree(association);
-	  if (!psDBRollback(config->dbh)) {
-	    psError(PS_ERR_UNKNOWN, false, "database error");
-	  }
-	  return(false);
-	}
-	
-	
+        //CZW Add an association entry here.
+        // Define the requested association, and insert it if it doesn't already exist
+        stackAssociationRow *association = pxStackAssociationDefine(config,stack_id);
+        psS64 sass_id;
+        if (!association->sass_id) {
+          psTrace("stacktool.association",2,"No required Association found. Adding.");
+
+          if (!stackAssociationInsertObject(config->dbh,association)) {
+            if (!psDBRollback(config->dbh)) {
+              psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            psFree(output);
+            psFree(run);
+            psFree(insert);
+            psFree(list);
+            psFree(association);
+            if (!psDBRollback(config->dbh)) {
+              psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            return(false);
+          }
+          sass_id = psDBLastInsertID(config->dbh);
+          association->sass_id = sass_id;
+        }
+        // Insert the map entry for this row.
+        stackAssociationMapRow *maprow = stackAssociationMapRowAlloc(sass_id,stack_id);
+        if (!stackAssociationMapInsertObject(config->dbh,maprow)) {
+          if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+          }
+          psError(PS_ERR_UNKNOWN, false, "database error");
+          psFree(output);
+          psFree(run);
+          psFree(insert);
+          psFree(list);
+          psFree(association);
+          if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+          }
+          return(false);
+        }
+
+
         // Create a suitable insertion query for this run
         psString thisInsert = psStringCopy(insert);
@@ -685,5 +686,5 @@
 
     //CZW Add an association entry here.
-    
+
     // insert the stackInputSkyfile rows
     psListIterator *iter = psListIteratorAlloc(warp_ids->data.list, 0, false);
@@ -1348,5 +1349,5 @@
 static bool tosummaryMode(pxConfig *config) {
   PS_ASSERT_PTR_NON_NULL(config, NULL);
-  
+
   psMetadata *where = psMetadataAlloc();
   PXOPT_COPY_S64(config->args, where, "-stack_id",    "stackSumSkyfile.warp_id", "==");
@@ -1357,10 +1358,10 @@
   pxAddLabelSearchArgs (config, where, "-label",   "stackRun.label", "LIKE");
   pxAddLabelSearchArgs (config, where, "-data_group",   "stackRun.data_group", "LIKE");
-  
+
   PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
 
   PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
   PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
-  
+
   // find all rawImfiles matching the default query
   psString query = pxDataGet("stacktool_tosummary.sql");
@@ -1380,5 +1381,5 @@
     return false;
   }
-  
+
   psFree(where);
 
@@ -1408,5 +1409,5 @@
       psError(PXTOOLS_ERR_PROG, false, "unknown error");
     }
-    
+
     return false;
   }
@@ -1416,5 +1417,5 @@
     return true;
   }
-  
+
   if (psArrayLength(output)) {
     // negative simple so the default is true
@@ -1425,5 +1426,5 @@
     }
   }
-  
+
   psFree(output);
   return(true);
@@ -1447,5 +1448,5 @@
   }
   psS64 numUpdated = psDBAffectedRows(config->dbh);
-  
+
   if (numUpdated != 1) {
     psError(PS_ERR_UNKNOWN, false, "should have affected 1 row");
@@ -1453,9 +1454,9 @@
     return false;
   }
-  
+
   psFree(query);
 
   // Print anything here?
-  
+
   return(true);
 }
@@ -1471,5 +1472,5 @@
     PXOPT_COPY_S64(config->args, where, "-stack_id", "stackRun.stack_id", "==");
     PXOPT_COPY_S64(config->args, where, "-sass_id", "stackAssociationMap.sass_id", "==");
-    
+
     pxAddLabelSearchArgs (config, where, "-label", "stackRun.label", "==");