Changeset 21536 for branches/cnb_branch_20090215/psphot/src/psphotMagnitudes.c

Timestamp:

Feb 19, 2009, 7:59:50 AM (17 years ago)

Author:

beaumont

Message:

Added visualizations to ppSub. Set up a single variable in pmVisual to control when plots are drawn.

File:

• branches/cnb_branch_20090215/psphot/src/psphotMagnitudes.c (modified) (6 diffs)

branches/cnb_branch_20090215/psphot/src/psphotMagnitudes.c

@@ -1 +1 @@
 # include "psphotInternal.h"
-
-bool psphotMagnitudes_Unthreaded (int *nap, psArray *sources, pmPSF *psf, psImageBinning *binning, pmReadout *backModel, pmReadout *backStdev, pmSourcePhotometryMode photMode, psImageMaskType maskVal);
 
 bool psphotMagnitudes(pmConfig *config, pmReadout *readout, const pmFPAview *view, psArray *sources, pmPSF *psf) {
@@ -59 +57 @@
         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_MAGNITUDES");
-
-                psArrayAdd(job->args, 1, cells->data[j]); // sources
-                psArrayAdd(job->args, 1, psf);
-                psArrayAdd(job->args, 1, binning);
-                psArrayAdd(job->args, 1, backModel);
-                psArrayAdd(job->args, 1, backStdev);
-
-                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 nAp
-
-                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_MAGNITUDES");
+
+            psArrayAdd(job->args, 1, cells->data[j]); // sources
+            psArrayAdd(job->args, 1, psf);
+            psArrayAdd(job->args, 1, binning);
+            psArrayAdd(job->args, 1, backModel);
+            psArrayAdd(job->args, 1, backStdev);
+
+            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 nAp
+
+            if (!psThreadJobAddPending(job)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");
+                psFree (job);
+                return false;
+            }
+            psFree(job);
+
+# if (0)
                 int nap = 0;
                 if (!psphotMagnitudes_Unthreaded (&nap, cells->data[j], psf, binning, backModel, backStdev, photMode, maskVal)) {
@@ -86 +84 @@
                 }
                 Nap += nap;
-            }
-        }
-
-        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;
-            }
-
-            // 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 = job->args->data[7];
-                    Nap += scalar->data.S32;
-                }
-                psFree(job);
-            }
+# endif
+        }
+
+        // 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 = job->args->data[7];
+                Nap += scalar->data.S32;
+            }
+            psFree(job);
         }
     }
@@ -162 +158 @@
 }
 
+# if (0)
 bool psphotMagnitudes_Unthreaded (int *nap, psArray *sources, pmPSF *psf, psImageBinning *binning, pmReadout *backModel, pmReadout *backStdev, pmSourcePhotometryMode photMode, psImageMaskType maskVal) {
 
@@ -198 +195 @@
     return true;
 }
+# endif
 
 bool psphotPSFWeights(pmConfig *config, pmReadout *readout, const pmFPAview *view, psArray *sources) {
@@ -295 +293 @@
         }
 
-        status = pmSourcePixelWeight (&source->pixWeight, model, source->pixels, source->maskObj, maskVal);
+        status = pmSourcePixelWeight (&source->pixWeight, model, source->maskObj, maskVal);
         if (!status) {
           psTrace ("psphot", 3, "fail to measure pixel weight");