Changeset 13983

Timestamp:

Jun 26, 2007, 9:43:28 AM (19 years ago)

Author:

eugene

Message:

setting up the extended source fitting functions

Location:

trunk/psphot/src

Files:

• Makefile.am (modified) (1 diff)
• psphot.h (modified) (1 diff)
• psphotAnnuli.c (added)
• psphotExtendedSources.c (added)
• psphotIsophotal.c (added)
• psphotKernelFromPSF.c (added)
• psphotKron.c (added)
• psphotModelWithPSF.c (modified) (12 diffs)
• psphotPSFConvModel.c (added)
• psphotPetrosian.c (added)
• psphotReadout.c (modified) (1 diff)

trunk/psphot/src/Makefile.am

@@ -17 +17 @@
 
 libpsphot_la_SOURCES = \
-        psphotErrorCodes.c      \
-        pmFootprint.c           \
-        psphotVersion.c         \
-        psphotModelGroupInit.c  \
-        psphotMaskReadout.c     \
-        psphotDefineFiles.c     \
-        psphotReadout.c         \
-        psphotImageMedian.c     \
-        psphotFindPeaks.c       \
-        psphotSourceStats.c     \
-        psphotRoughClass.c      \
-        psphotBasicDeblend.c    \
-        psphotChoosePSF.c       \
-        psphotGuessModels.c     \
+        psphotErrorCodes.c       \
+        pmFootprint.c            \
+        psphotVersion.c          \
+        psphotModelGroupInit.c   \
+        psphotMaskReadout.c      \
+        psphotDefineFiles.c      \
+        psphotReadout.c          \
+        psphotImageMedian.c      \
+        psphotFindPeaks.c        \
+        psphotSourceStats.c      \
+        psphotRoughClass.c       \
+        psphotBasicDeblend.c     \
+        psphotChoosePSF.c        \
+        psphotGuessModels.c      \
         psphotFitSourcesLinear.c \
-        psphotBlendFit.c        \
-        psphotReplaceUnfit.c    \
-        psphotApResid.c         \
-        psphotMagnitudes.c      \
-        psphotSkyReplace.c      \
-        psphotEvalPSF.c         \
-        psphotEvalFLT.c         \
-        psphotSourceFits.c      \
-        psphotRadiusChecks.c    \
-        psphotSortBySN.c        \
-        psphotOutput.c          \
-        psphotGrowthCurve.c     \
-        psphotFakeSources.c     \
-        psphotModelTest.c       \
-        psphotFitSet.c          \
+        psphotBlendFit.c         \
+        psphotReplaceUnfit.c     \
+        psphotApResid.c          \
+        psphotMagnitudes.c       \
+        psphotSkyReplace.c       \
+        psphotEvalPSF.c          \
+        psphotEvalFLT.c          \
+        psphotSourceFits.c       \
+        psphotRadiusChecks.c     \
+        psphotSortBySN.c         \
+        psphotOutput.c           \
+        psphotGrowthCurve.c      \
+        psphotFakeSources.c      \
+        psphotModelWithPSF.c     \
+        psphotExtendedSources.c  \
+        psphotPetrosian.c        \
+        psphotIsophotal.c        \
+        psphotAnnuli.c           \
+        psphotKron.c             \
+        psphotKernelFromPSF.c    \
+        psphotPSFConvModel.c     \
+        psphotModelTest.c        \
+        psphotFitSet.c           \
         psphotSourceFreePixels.c \
         psphotSummaryPlots.c     \
         psphotMergeSources.c     \
-        psphotLoadPSF.c  \
+        psphotLoadPSF.c          \
         psphotReadoutCleanup.c   \
         psphotSourcePlots.c      \

trunk/psphot/src/psphot.h

@@ -114 +114 @@
 bool            psphotMakeResiduals (psArray *sources, psMetadata *recipe, pmPSF *psf, psMaskType maskVal);
 
+bool psphotExtendedSources (pmReadout *readout, psArray *sources, psMetadata *recipe, psMaskType maskVal);
+bool psphotPSFConvModel (pmSource *source, psMetadata *recipe, psMaskType maskVal);
+psKernel *psphotKernelFromPSF (pmSource *source);
+
+bool psphotPetrosian (pmSource *source, psMetadata *recipe, psMaskType maskVal);
+bool psphotIsophotal (pmSource *source, psMetadata *recipe, psMaskType maskVal);
+bool psphotAnnuli (pmSource *source, psMetadata *recipe, psMaskType maskVal);
+bool psphotKron (pmSource *source, psMetadata *recipe, psMaskType maskVal);
+
+// psf-convolved model fitting
+bool psphotModelWithPSF_LMM (
+    psMinimization *min,
+    psImage *covar,
+    psVector *params,
+    psMinConstraint *constraint,
+    const pmSource *source,
+    const psKernel *psf,
+    psMinimizeLMChi2Func func);
+
+psF32 psphotModelWithPSF_SetABX(
+    psImage  *alpha,
+    psVector *beta,
+    const psVector *params,
+    const psVector *paramMask,
+    const pmSource *source,
+    const psKernel *psf,
+    psMinimizeLMChi2Func func);
+
+
 #endif

trunk/psphot/src/psphotModelWithPSF.c

@@ -1 +1 @@
 # include "psphot.h"
-
-// XXX elevate the p_psMinLM_ functions to psMinLM_...
-
 
 bool psphotModelWithPSF_LMM (
@@ -69 +66 @@
 
         // set a new guess for Alpha, Beta, Params
-        if (!p_psMinLM_GuessABP(Alpha, Beta, Params, alpha, beta, params, paramMask, checkLimits, lambda)) {
+        if (!psMinLM_GuessABP(Alpha, Beta, Params, alpha, beta, params, paramMask, checkLimits, lambda)) {
             min->iter ++;
             lambda *= 10.0;
@@ -76 +73 @@
 
         // measure linear model prediction
-        psF32 dLinear = p_psMinLM_dLinear(Beta, beta, lambda);
+        psF32 dLinear = psMinLM_dLinear(Beta, beta, lambda);
 
         // dump some useful info if trace is defined
@@ -88 +85 @@
 
         // calculate Chisq for new guess, update Alpha & Beta
-        Chisq = p_psMinLM_SetABX(Alpha, Beta, Params, paramMask, source, func);
+        Chisq = psphotModelWithPSF_SetABX(Alpha, Beta, Params, paramMask, source, psf, func);
         if (isnan(Chisq)) {
             min->iter ++;
@@ -112 +109 @@
         /* if (Chisq < min->value) {  */
         if (rho > 0.0) {
-            min->lastDelta = (min->value - Chisq) / (dy->n - params->n);
+            min->lastDelta = (min->value - Chisq) / (source->pixels->numCols*source->pixels->numRows - params->n);
             min->value = Chisq;
             alpha  = psImageCopy(alpha, Alpha, PS_TYPE_F32);
@@ -127 +124 @@
     // construct & return the covariance matrix (if requested)
     if (covar != NULL) {
-        if (!p_psMinLM_GuessABP(covar, Beta, Params, alpha, beta, params, paramMask, NULL, 0.0)) {
+        if (!psMinLM_GuessABP(covar, Beta, Params, alpha, beta, params, paramMask, NULL, 0.0)) {
             psTrace ("psLib.math", 5, "failure to calculate covariance matrix\n");
         }
@@ -172 +169 @@
     }
 
-    psF32 chisq;
-    psF32 delta;
-    psF32 weight;
-    psF32 ymodel;
     psVector *deriv = psVectorAlloc(params->n, PS_TYPE_F32);
 
@@ -191 +184 @@
 
     // fill in the coordinate and value entries
-    nPix = 0;
     for (psS32 i = 0; i < source->pixels->numRows; i++) {
         for (psS32 j = 0; j < source->pixels->numCols; j++) {
@@ -239 +231 @@
     psImageInit (alpha, 0.0);
     psVectorInit (beta, 0.0);
-    chisq = 0.0;
+    float chisq = 0.0;
 
     for (psS32 i = 0; i < source->pixels->numRows; i++) {
@@ -257 +249 @@
             }
 
-            ymodel  = modelConv->data.F32[i][j];
-            yweight = 1.0 / source->weight->data.F32[i][j];
-            delta = ymodel - source->pixels->data.F32[i][j];
-
-            chisq += PS_SQR(delta) * var;
+            float ymodel  = modelConv->data.F32[i][j];
+            float yweight = 1.0 / source->weight->data.F32[i][j];
+            float delta = ymodel - source->pixels->data.F32[i][j];
+
+            chisq += PS_SQR(delta) * yweight;
 
             if (isnan(delta))
@@ -273 +265 @@
               }
               psImage *dmodel = dmodelsConv->data[n1];
-              weight = dmodel->data.F32[i][j] * yweight;
+              float weight = dmodel->data.F32[i][j] * yweight;
               for (psS32 n2 = 0; n2 <= n1; n2++) {
                 if ((paramMask != NULL) && (paramMask->data.U8[n2])) {
@@ -281 +273 @@
                 alpha->data.F32[n1][n2] += weight * dmodel->data.F32[i][j];
               }
-              beta->data.F32[jn] += weight * delta;
+              beta->data.F32[n1] += weight * delta;
             }
         }

trunk/psphot/src/psphotReadout.c

@@ -246 +246 @@
     if (dump) psphotSaveImage (NULL, readout->image,  "image.v6.fits");
 
+    psphotExtendedSources (readout, sources, recipe, maskVal);
+
 finish: