Changeset 30196

Timestamp:

Dec 28, 2010, 12:49:29 PM (15 years ago)

Author:

eugene

Message:

enable caching of the pcm models as well as regular ones

File:

• branches/eam_branches/ipp-20101205/psphot/src/psphotReplaceUnfit.c (modified) (4 diffs)

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

@@ -213 +213 @@
     psAssert (maskVal, "missing mask value?");
 
+    // what fraction of the PSF is used? (radius in pixels : 2 -> 5x5 box)
+    int psfSize = psMetadataLookupS32 (&status, recipe, "PCM_BOX_SIZE");
+    assert (status);
+
     pmPSF *psf = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.PSF");
     psAssert (psf, "missing psf?");
@@ -254 +258 @@
           pmSourceCachePSF (source, maskVal);
 
-# if (0)
           psKernel *psfKernel = pmPCMkernelFromPSF(source, psfSize);
           if (!psfKernel) { 
@@ -260 +263 @@
           }
 
-          psImage *modelFlux = getmodelflux(model);
-          psImageConvolveFFT (source->modelFlux, modelFlux, NULL, 0, psfKernel);
+          // generate an image of the right size
+          psImage *rawModelFlux = psImageCopy (NULL, source->pixels, PS_TYPE_F32);
+          psImageInit (rawModelFlux, 0.0);
+          
+          // insert the model image normalized to 1.0
+          pmModelAdd (rawModelFlux, NULL, model, PM_MODEL_OP_FULL | PM_MODEL_OP_NORM, maskVal);
+
+          psImageConvolveFFT (source->modelFlux, rawModelFlux, NULL, 0, psfKernel);
           
           psFree (psfKernel);
-          psFree (modelFlux);
-# endif
+          psFree (rawModelFlux);
       }
 
@@ -271 +279 @@
     }
 
-    // psphotSaveImage(NULL, readoutIn->image, "image.in.fits");
-    // psphotSaveImage(NULL, readoutOut->image, "image.out.sub.fits");
-    // psphotVisualShowImage (readout);
-
     psLogMsg ("psphot.replace", PS_LOG_INFO, "subtracted models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.replace"));
     return true;