Changeset 21519 for trunk/psphot/src/psphotApResid.c

Timestamp:

Feb 16, 2009, 12:34:24 PM (17 years ago)

Author:

eugene

Message:

added additional flag values, threaded functions always use the threaded version

File:

• trunk/psphot/src/psphotApResid.c (modified) (6 diffs)

trunk/psphot/src/psphotApResid.c

@@ -1 +1 @@
 # include "psphotInternal.h"
-
-bool psphotApResidMags_Unthreaded (int *nskip, int *nfail, psArray *sources, pmPSF *psf, pmSourcePhotometryMode photMode, psImageMaskType maskVal);
 
 # define SKIPSTAR(MSG) { psTrace ("psphot", 3, "invalid : %s", MSG); continue; }
@@ -95 +93 @@
         for (int j = 0; j < cells->n; j++) {
 
-            if (nThreads) {
-                // allocate a job -- if threads are not defined, this just runs the job
-                psThreadJob *job = psThreadJobAlloc ("PSPHOT_APRESID_MAGS");
-
-                psArrayAdd(job->args, 1, cells->data[j]); // sources
-                psArrayAdd(job->args, 1, psf);
-                PS_ARRAY_ADD_SCALAR(job->args, photMode, PS_TYPE_S32);
-                PS_ARRAY_ADD_SCALAR(job->args, maskVal,  PS_TYPE_IMAGE_MASK);
-
-                PS_ARRAY_ADD_SCALAR(job->args, 0,        PS_TYPE_S32); // this is used as a return value for Nskip
-                PS_ARRAY_ADD_SCALAR(job->args, 0,        PS_TYPE_S32); // this is used as a return value for Nfail
-
-                if (!psThreadJobAddPending(job)) {
-                    psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");
-                    psFree (job);
-                    return false;
-                }
-                psFree(job);
-            } else {
+            // allocate a job -- if threads are not defined, this just runs the job
+            psThreadJob *job = psThreadJobAlloc ("PSPHOT_APRESID_MAGS");
+
+            psArrayAdd(job->args, 1, cells->data[j]); // sources
+            psArrayAdd(job->args, 1, psf);
+            PS_ARRAY_ADD_SCALAR(job->args, photMode, PS_TYPE_S32);
+            PS_ARRAY_ADD_SCALAR(job->args, maskVal,  PS_TYPE_IMAGE_MASK);
+
+            PS_ARRAY_ADD_SCALAR(job->args, 0,        PS_TYPE_S32); // this is used as a return value for Nskip
+            PS_ARRAY_ADD_SCALAR(job->args, 0,        PS_TYPE_S32); // this is used as a return value for Nfail
+
+            if (!psThreadJobAddPending(job)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");
+                psFree (job);
+                return false;
+            }
+            psFree(job);
+
+# if (0)
                 int nskip = 0;
                 int nfail = 0;
@@ -123 +121 @@
                 Nskip += nskip;
                 Nfail += nfail;
-            }           
+# endif
 
         }
 
-        if (nThreads) {
-            // wait for the threads to finish and manage results
-            if (!psThreadPoolWait (false)) {
-                psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");
-                return false;
+        // wait for the threads to finish and manage results
+        if (!psThreadPoolWait (false)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");
+            return false;
+        }
+
+        // we have only supplied one type of job, so we can assume the types here
+        psThreadJob *job = NULL;
+        while ((job = psThreadJobGetDone()) != NULL) {
+            if (job->args->n < 1) {
+                fprintf (stderr, "error with job\n");
+            } else {
+                psScalar *scalar = NULL;
+                scalar = job->args->data[4];
+                Nskip += scalar->data.S32;
+                scalar = job->args->data[5];
+                Nfail += scalar->data.S32;
             }
-
-            // we have only supplied one type of job, so we can assume the types here
-            psThreadJob *job = NULL;
-            while ((job = psThreadJobGetDone()) != NULL) {
-                if (job->args->n < 1) {
-                    fprintf (stderr, "error with job\n");
-                } else {
-                    psScalar *scalar = NULL;
-                    scalar = job->args->data[4];
-                    Nskip += scalar->data.S32;
-                    scalar = job->args->data[5];
-                    Nfail += scalar->data.S32;
-                }
-                psFree(job);
-            }
+            psFree(job);
         }
     }
@@ -497 +493 @@
             continue;
         }
+        source->mode |= PM_SOURCE_MODE_AP_MAGS;
     }
 
@@ -509 +506 @@
 }
 
+# if (0)
 bool psphotApResidMags_Unthreaded (int *nskip, int *nfail, psArray *sources, pmPSF *psf, pmSourcePhotometryMode photMode, psImageMaskType maskVal) {
 
@@ -542 +540 @@
     return true;
 }
+# endif