Changeset 35769 for trunk/psphot/src/psphotGuessModels.c

Timestamp:

Jul 3, 2013, 2:43:13 PM (13 years ago)

Author:

eugene

Message:

thread psphotModelBackground, psphotAddOrSubNoise, psphotGuessModel; add recipe options to control selection of extended models fitted; iterate on the trail window a bit

Location:

trunk/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotGuessModels.c (modified) (5 diffs)

trunk/psphot/src/psphotGuessModels.c

@@ -29 +29 @@
 }
 
+int NpixTotal = 0;
+
 // construct an initial PSF model for each object (new sources only)
 bool psphotGuessModelsReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index) {
@@ -86 +88 @@
 
     psArray *cellGroups = psphotAssignSources (Cx, Cy, sources);
+
+    NpixTotal = 0;
 
     for (int i = 0; i < cellGroups->n; i++) {
@@ -103 +107 @@
             PS_ARRAY_ADD_SCALAR(job->args, markVal,  PS_TYPE_IMAGE_MASK);
 
+# if (1)
             if (!psThreadJobAddPending(job)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");
                 return false;
             }
-        }
+# else
+            if (!psphotGuessModel_Threaded(job)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");
+                return false;
+            }
+            psFree(job);
+# endif
+        }
+
 
         // wait for the threads to finish and manage results
@@ -143 +156 @@
     psFree (cellGroups);
 
-    psLogMsg ("psphot.models", PS_LOG_WARN, "built models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.models"));
+    psLogMsg ("psphot.models", PS_LOG_WARN, "built models for %ld objects: %f sec (%d pixels)\n", sources->n, psTimerMark ("psphot.models"), NpixTotal);
     return true;
 }
@@ -240 +253 @@
 
         pmSourceCacheModel (source, maskVal);  // ALLOC x14 (!)
+        NpixTotal += source->pixels->numCols * source->pixels->numRows;
     }