Changeset 14338 for trunk/psphot/src/psphotPSFConvModel.c

Timestamp:

Jul 20, 2007, 10:34:30 AM (19 years ago)

Author:

eugene

Message:

finished PSFConvModel code; added structure to carry convolved model data

File:

• trunk/psphot/src/psphotPSFConvModel.c (modified) (5 diffs)

trunk/psphot/src/psphotPSFConvModel.c

@@ -7 +7 @@
 // static bool  PM_SOURCE_FIT_MODEL_PIX_WEIGHTS = true;
 
+// input source has both modelPSF and modelEXT.  on successful exit, we set the
+// modelConv to contain the fitted parameters, and the modelFlux to contain the 
+// convolved model image.
 bool psphotPSFConvModel (pmSource *source, psMetadata *recipe, psMaskType maskVal) {
     
-    // XXX make sure we save a cached copy of the source psf
+    // make sure we save a cached copy of the psf flux
+    pmSourceCachePSF (source, maskVal);
 
     // convert the cached cached psf model for this source to a psKernel
-    psKernel *psf = psphotKernelFromPSF (source);
+    // XXX for the moment, hard-wire the kernel to be 5x5 (2 pix radius)
+    psKernel *psf = psphotKernelFromPSF (source, 2);
 
     // generate copy of the model
@@ -48 +53 @@
     }
 
+    // set up the minimization process
     psMinimization *myMin = psMinimizationAlloc (PM_SOURCE_FIT_MODEL_NUM_ITERATIONS, PM_SOURCE_FIT_MODEL_TOLERANCE);
 
@@ -54 +60 @@
     bool fitStatus = psphotModelWithPSF_LMM (myMin, covar, params, constraint, source, psf, modelFunc);
     for (int i = 0; i < dparams->n; i++) {
-        if (psTraceGetLevel("psModules.objects") >= 4) {
+        if (psTraceGetLevel("psphot") >= 4) {
             fprintf (stderr, "%f ", params->data.F32[i]);
         }
@@ -61 +67 @@
         dparams->data.F32[i] = sqrt(covar->data.F32[i][i]);
     }
-    psTrace ("psModules.objects", 4, "niter: %d, chisq: %f", myMin->iter, myMin->value);
+    psTrace ("psphot", 4, "niter: %d, chisq: %f", myMin->iter, myMin->value);
 
     // save the resulting chisq, nDOF, nIter
@@ -91 +97 @@
 
     bool retval = (onPic && fitStatus);
-    psTrace("psModules.objects", 5, "---- %s(%d) end ----\n", __func__, retval);
+    psTrace("psphot", 5, "---- %s(%d) end ----\n", __func__, retval);
     return(retval);
 }