Changeset 38552 for branches/eam_branches/ipp-20150616/psphot/src/psphotReplaceUnfit.c

Timestamp:

Jun 25, 2015, 10:05:06 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150616

Files:

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

branches/eam_branches/ipp-20150616/psphot/src/psphotReplaceUnfit.c

@@ -316 +316 @@
     }
 
+    pmSourceFitOptions *fitOptions = NULL;
+    if (psMetadataLookupBool (&status, recipe, "EXTENDED_SOURCE_FITS")) {
+        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 +373 @@
             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 +395 @@
 
             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) {
+                pmPCMCacheModel (source, maskVal, psfSize, pcm->nsigma);
+                psFree(pcm);
+            } else {
+                psAssert (pcm, "pmPCMinit failed!");
+            }
+          
+        } else {
+            pmSourceCacheModel (source, maskVal);  // ALLOC x14 (!)
+        }
     }