Index: /branches/eam_branch_20090203/psphot/src/psphotApResid.c
===================================================================
--- /branches/eam_branch_20090203/psphot/src/psphotApResid.c	(revision 21276)
+++ /branches/eam_branch_20090203/psphot/src/psphotApResid.c	(revision 21277)
@@ -31,4 +31,5 @@
 	nThreads = 0;
     }
+    nThreads = 0;
 
     bool measureAptrend = psMetadataLookupBool (&status, recipe, "MEASURE.APTREND");
@@ -95,5 +96,5 @@
 	for (int j = 0; j < cells->n; j++) {
 
-	    if (nThreads > 1) {
+	    if (nThreads) {
 		// allocate a job -- if threads are not defined, this just runs the job
 		psThreadJob *job = psThreadJobAlloc ("PSPHOT_APRESID_MAGS");
@@ -127,5 +128,5 @@
 	}
 
-	if (nThreads > 1) {
+	if (nThreads) {
 	    // wait for the threads to finish and manage results
 	    if (!psThreadPoolWait (false)) {
Index: /branches/eam_branch_20090203/psphot/src/psphotBlendFit.c
===================================================================
--- /branches/eam_branch_20090203/psphot/src/psphotBlendFit.c	(revision 21276)
+++ /branches/eam_branch_20090203/psphot/src/psphotBlendFit.c	(revision 21277)
@@ -23,4 +23,5 @@
 	nThreads = 0;
     }
+    nThreads = 0;
 
     // source fitting parameters for extended source fits
@@ -64,5 +65,5 @@
 	for (int j = 0; j < cells->n; j++) {
 
-	    if (nThreads > 1) {
+	    if (nThreads) {
 		// allocate a job -- if threads are not defined, this just runs the job
 		psThreadJob *job = psThreadJobAlloc ("PSPHOT_BLEND_FIT");
@@ -111,5 +112,5 @@
 	}
 
-	if (nThreads > 1) {
+	if (nThreads) {
 	    // wait for the threads to finish and manage results
 	    if (!psThreadPoolWait (false)) {
Index: /branches/eam_branch_20090203/psphot/src/psphotGuessModels.c
===================================================================
--- /branches/eam_branch_20090203/psphot/src/psphotGuessModels.c	(revision 21276)
+++ /branches/eam_branch_20090203/psphot/src/psphotGuessModels.c	(revision 21277)
@@ -40,5 +40,5 @@
 	nThreads = 0;
     }
-    // nThreads = 0; // XXX until testing is complete, do not thread this function
+    nThreads = 0; // XXX until testing is complete, do not thread this function
 
     // bit-masks to test for good/bad pixels
@@ -68,5 +68,5 @@
 	for (int j = 0; j < cells->n; j++) {
 
-	    if (nThreads > 1) {
+	    if (nThreads) {
 		// allocate a job -- if threads are not defined, this just runs the job
 		psThreadJob *job = psThreadJobAlloc ("PSPHOT_GUESS_MODEL");
@@ -93,5 +93,5 @@
 	}
 
-	if (nThreads > 1) {
+	if (nThreads) {
 	    // wait for the threads to finish and manage results
 	    // wait here for the threaded jobs to finish
Index: /branches/eam_branch_20090203/psphot/src/psphotMagnitudes.c
===================================================================
--- /branches/eam_branch_20090203/psphot/src/psphotMagnitudes.c	(revision 21276)
+++ /branches/eam_branch_20090203/psphot/src/psphotMagnitudes.c	(revision 21277)
@@ -19,4 +19,5 @@
 	nThreads = 0;
     }
+    nThreads = 0;
 
     // if backModel or backStdev are missing, the values of sky and/or skyErr will be set to NAN
@@ -59,5 +60,5 @@
 	for (int j = 0; j < cells->n; j++) {
 
-	    if (nThreads > 1) {
+	    if (nThreads) {
 		// allocate a job -- if threads are not defined, this just runs the job
 		psThreadJob *job = psThreadJobAlloc ("PSPHOT_MAGNITUDES");
@@ -89,5 +90,5 @@
 	}
 
-	if (nThreads > 1) {
+	if (nThreads) {
 	    // wait for the threads to finish and manage results
 	    if (!psThreadPoolWait (false)) {
Index: /branches/eam_branch_20090203/psphot/src/psphotSourceStats.c
===================================================================
--- /branches/eam_branch_20090203/psphot/src/psphotSourceStats.c	(revision 21276)
+++ /branches/eam_branch_20090203/psphot/src/psphotSourceStats.c	(revision 21277)
@@ -19,4 +19,5 @@
 	nThreads = 0;
     }
+    nThreads = 0;
 
     // determine properties (sky, moments) of initial sources
@@ -80,5 +81,5 @@
 	for (int j = 0; j < cells->n; j++) {
 
-	    if (nThreads > 1) {
+	    if (nThreads) {
 		// allocate a job -- if threads are not defined, this just runs the job
 		psThreadJob *job = psThreadJobAlloc ("PSPHOT_SOURCE_STATS");
@@ -107,5 +108,5 @@
 	}
 
-	if (nThreads > 1) {
+	if (nThreads) {
 	    // wait for the threads to finish and manage results
 	    if (!psThreadPoolWait (false)) {