Changeset 21277

Timestamp:

Feb 3, 2009, 3:35:39 PM (17 years ago)

Author:

eugene

Message:

deactivate threading

Location:

branches/eam_branch_20090203/psphot/src

Files:

• psphotApResid.c (modified) (3 diffs)
• psphotBlendFit.c (modified) (3 diffs)
• psphotGuessModels.c (modified) (3 diffs)
• psphotMagnitudes.c (modified) (3 diffs)
• psphotSourceStats.c (modified) (3 diffs)

branches/eam_branch_20090203/psphot/src/psphotApResid.c

@@ -31 +31 @@
         nThreads = 0;
     }
+    nThreads = 0;
 
     bool measureAptrend = psMetadataLookupBool (&status, recipe, "MEASURE.APTREND");
@@ -95 +96 @@
         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 +128 @@
         }
 
-        if (nThreads > 1) {
+        if (nThreads) {
             // wait for the threads to finish and manage results
             if (!psThreadPoolWait (false)) {

branches/eam_branch_20090203/psphot/src/psphotBlendFit.c

@@ -23 +23 @@
         nThreads = 0;
     }
+    nThreads = 0;
 
     // source fitting parameters for extended source fits
@@ -64 +65 @@
         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 +112 @@
         }
 
-        if (nThreads > 1) {
+        if (nThreads) {
             // wait for the threads to finish and manage results
             if (!psThreadPoolWait (false)) {

branches/eam_branch_20090203/psphot/src/psphotGuessModels.c

@@ -40 +40 @@
         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 +68 @@
         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 +93 @@
         }
 
-        if (nThreads > 1) {
+        if (nThreads) {
             // wait for the threads to finish and manage results
             // wait here for the threaded jobs to finish

branches/eam_branch_20090203/psphot/src/psphotMagnitudes.c

@@ -19 +19 @@
         nThreads = 0;
     }
+    nThreads = 0;
 
     // if backModel or backStdev are missing, the values of sky and/or skyErr will be set to NAN
@@ -59 +60 @@
         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 +90 @@
         }
 
-        if (nThreads > 1) {
+        if (nThreads) {
             // wait for the threads to finish and manage results
             if (!psThreadPoolWait (false)) {

branches/eam_branch_20090203/psphot/src/psphotSourceStats.c

@@ -19 +19 @@
         nThreads = 0;
     }
+    nThreads = 0;
 
     // determine properties (sky, moments) of initial sources
@@ -80 +81 @@
         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 +108 @@
         }
 
-        if (nThreads > 1) {
+        if (nThreads) {
             // wait for the threads to finish and manage results
             if (!psThreadPoolWait (false)) {