Changeset 36318 for branches/eam_branches/ipp-20130904/psphot/src/psphotGalaxyShape.c

Timestamp:

Nov 28, 2013, 4:09:45 AM (13 years ago)

Author:

eugene

Message:

make sure the convolution scale is passed to all functions that need it; update sersic search a bit

File:

• branches/eam_branches/ipp-20130904/psphot/src/psphotGalaxyShape.c (modified) (4 diffs)

branches/eam_branches/ipp-20130904/psphot/src/psphotGalaxyShape.c

@@ -97 +97 @@
     assert (status);
 
+    float fitNsigmaConv = psMetadataLookupF32 (&status, recipe, "EXT_FIT_NSIGMA_CONV"); // number of sigma for the convolutio
+    if (!status || !isfinite(fitNsigmaConv) || fitNsigmaConv <= 0) {
+        fitNsigmaConv = 5.0;
+    }
+
     // Define source fitting parameters for extended source fits
     // we are not doing LMM fitting, so most options are irrelevant
@@ -102 +107 @@
     fitOptions->mode           = PM_SOURCE_FIT_EXT_AND_SKY;
     fitOptions->covarFactor    = psImageCovarianceFactorForAperture(readout->covariance, 10.0); // Covariance matrix
+    fitOptions->nsigma         = fitNsigmaConv;
 
     // Poisson or Constant weight for chisq tests?
@@ -298 +304 @@
 
         // cache the model flux
-        pmPCMCacheModel (source, maskVal, psfSize);
+        pmPCMCacheModel (source, maskVal, psfSize, fitOptions->nsigma);
     }
 
@@ -316 +322 @@
     // need to reset here each time since we assign below to calculate the flux
     // XXX note that this does not add sky to model
-    pmPCMMakeModel (source, pcm->modelConv, maskVal, psfSize);
+    pmPCMMakeModel (source, pcm->modelConv, pcm->nsigma, maskVal, psfSize);
     pcm->modelConv->params->data.F32[PM_PAR_I0] = 1.0;