Changeset 38515 for trunk/psphot/src/psphotReplaceUnfit.c

Timestamp:

Jun 22, 2015, 3:23:53 PM (11 years ago)

Author:

bills

Message:

Handle pcm extended source models correctly in psphotSourceChildrenByReadout and psphotResetModels.
Avoid extra model convolutions.

File:

• trunk/psphot/src/psphotReplaceUnfit.c (modified) (3 diffs)

trunk/psphot/src/psphotReplaceUnfit.c

@@ -316 +316 @@
     }
 
+    pmSourceFitOptions *fitOptions = psMetadataLookupPtr (&status, readout->analysis, "PCM_FIT_OPTIONS");
+    psAssert (fitOptions, "missing pcm fit options");
 
     // XXX the sources have already been copied (merge into here?)
@@ -368 +370 @@
             source->modelPSF = modelPSF;
             source->modelPSF->fitRadius = radius;
-            model = source->modelPSF;
+            //  model = source->modelPSF;
         }
 
         if (model->isPCM) {
+#if 0
             psAssert(false, "this section is not complete");
 
@@ -389 +392 @@
 
             psImageConvolveFFT (source->modelFlux, rawModelFlux, NULL, 0, psfKernel);
-          
             psFree (psfKernel);
             psFree (rawModelFlux);
-        }
-
-        pmSourceCacheModel (source, maskVal);  // ALLOC x14 (!)
+#endif
+           pmPCMdata *pcm = pmPCMinit (source, fitOptions, model, maskVal, psfSize);
+            if (pcm) {
+                // pmPCMMakeModel (source, model, pcm->nsigma, maskVal, psfSize);
+                pmPCMCacheModel (source, maskVal, psfSize, pcm->nsigma);
+                psFree(pcm);
+            } else {
+                psAssert (pcm, "pmPCMinit failed!");
+            }
+          
+        } else {
+            pmSourceCacheModel (source, maskVal);  // ALLOC x14 (!)
+        }
     }