Changeset 36320 for branches/eam_branches/ipp-20130904/psModules

Timestamp:

Nov 28, 2013, 4:12:34 AM (13 years ago)

Author:

eugene

Message:

make sure the convolution scale is passed to all functions that need it; for DEV Reff guess, scale R1 by 2.3 (Graham & Driver)

Location:

branches/eam_branches/ipp-20130904/psModules/src/objects

Files:

• models/pmModel_DEV.c (modified) (1 diff)
• pmPCM_MinimizeChisq.c (modified) (1 diff)
• pmPCMdata.c (modified) (7 diffs)
• pmPCMdata.h (modified) (1 diff)
• pmSourceFitModel.c (modified) (1 diff)
• pmSourceFitModel.h (modified) (1 diff)
• pmSourceFitPCM.c (modified) (1 diff)

branches/eam_branches/ipp-20130904/psModules/src/objects/models/pmModel_DEV.c

@@ -269 +269 @@
 
     // Mxx, Mxy, Myy define the elliptical shape, but Mrf defines the width 
-    float scale = moments->Mrf / axes.major;
+    // the factor of 2.3 comes from Table 1 of Graham and Driver (2005)
+    float scale = moments->Mrf / axes.major / 2.3;
     axes.major *= scale;
     axes.minor *= scale;

branches/eam_branches/ipp-20130904/psModules/src/objects/pmPCM_MinimizeChisq.c

@@ -135 +135 @@
         }
 
-        if (0) {
+        if (1) {
             fprintf (stderr, "%d : ", min->iter);
             for (int ti = 0; ti < params->n; ti++) {

branches/eam_branches/ipp-20130904/psModules/src/objects/pmPCMdata.c

@@ -43 +43 @@
 
 # define USE_DELTA_PSF 0
-# define KERNEL_NSIGMA 5.0
 
 // TEST: factor to increase the convolution sigma. psphot modifies this global variable.
@@ -108 +107 @@
     // convolution with a Gaussian approximation to the kernel
     pcm->use1Dgauss = false;
-    pcm->nsigma = KERNEL_NSIGMA; 
+    pcm->nsigma = NAN; // this is set to something defined by the user
     pcm->sigma = 1.0; // this should be set to something sensible when the psf is known
 
@@ -414 +413 @@
 
     pcm->poissonErrors = fitOptions->poissonErrors;
+    pcm->nsigma = fitOptions->nsigma;
 
     pcm->nPix = nPix;
@@ -538 +538 @@
 
 // construct a realization of the source model
-bool pmPCMCacheModel (pmSource *source, psImageMaskType maskVal, int psfSize) {
+bool pmPCMCacheModel (pmSource *source, psImageMaskType maskVal, int psfSize, float nsigma) {
 
     PS_ASSERT_PTR_NON_NULL(source, false);
@@ -560 +560 @@
 
         if (USE_1D_CACHE) {
-            psImageSmoothCacheData *smdata = psImageSmoothCacheSetKernel (&sigma, &kappa, KERNEL_NSIGMA, source->modelFlux, source->modelPSF);
+            psImageSmoothCacheData *smdata = psImageSmoothCacheSetKernel (&sigma, &kappa, nsigma, source->modelFlux, source->modelPSF);
             psImageSmoothCache_F32 (source->modelFlux, smdata);
             psFree (smdata);
         } else {
-            psImageSmooth2dCacheData *smdata = psImageSmooth2dCacheSetKernel (&sigma, &kappa, KERNEL_NSIGMA, source->modelFlux, source->modelPSF);
+            psImageSmooth2dCacheData *smdata = psImageSmooth2dCacheSetKernel (&sigma, &kappa, nsigma, source->modelFlux, source->modelPSF);
             psImageSmooth2dCache_F32 (source->modelFlux, smdata);
             psFree (smdata);
@@ -588 +588 @@
 
 // construct a realization of the source model
-bool pmPCMMakeModel (pmSource *source, pmModel *model, psImageMaskType maskVal, int psfSize) {
+bool pmPCMMakeModel (pmSource *source, pmModel *model, float Nsigma, psImageMaskType maskVal, int psfSize) {
 
     PS_ASSERT_PTR_NON_NULL(source, false);
@@ -607 +607 @@
 
         if (USE_1D_CACHE) {
-            psImageSmoothCacheData *smdata = psImageSmoothCacheSetKernel (&sigma, &kappa, KERNEL_NSIGMA, source->modelFlux, source->modelPSF);
+            psImageSmoothCacheData *smdata = psImageSmoothCacheSetKernel (&sigma, &kappa, Nsigma, source->modelFlux, source->modelPSF);
             psImageSmoothCache_F32 (source->modelFlux, smdata);
             psFree (smdata);
         } else {
-            psImageSmooth2dCacheData *smdata = psImageSmooth2dCacheSetKernel (&sigma, &kappa, KERNEL_NSIGMA, source->modelFlux, source->modelPSF);
+            psImageSmooth2dCacheData *smdata = psImageSmooth2dCacheSetKernel (&sigma, &kappa, Nsigma, source->modelFlux, source->modelPSF);
             psImageSmooth2dCache_F32 (source->modelFlux, smdata);
             psFree (smdata);

branches/eam_branches/ipp-20130904/psModules/src/objects/pmPCMdata.h

@@ -105 +105 @@
 bool pmSourceFitPCM (pmPCMdata *pcm, pmSource *source, pmSourceFitOptions *fitOptions, psImageMaskType maskVal, psImageMaskType markVal, int psfSize);
 
-bool pmPCMCacheModel (pmSource *source, psImageMaskType maskVal, int psfSize);
+bool pmPCMCacheModel (pmSource *source, psImageMaskType maskVal, int psfSize, float nsigma);
 
-bool pmPCMMakeModel (pmSource *source, pmModel *model, psImageMaskType maskVal, int psfSize);
+bool pmPCMMakeModel (pmSource *source, pmModel *model, float Nsigma, psImageMaskType maskVal, int psfSize);
 
 /// @}

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceFitModel.c

@@ -59 +59 @@
     opt->maxTol = 1.00;
     opt->weight = 1.00;
+    opt->nsigma = 5.00;
     opt->maxChisqDOF = NAN;
     opt->poissonErrors = true;

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceFitModel.h

@@ -34 +34 @@
     float weight;                       ///< use this weight for constant-weight fits
     float covarFactor;                  ///< covariance factor for calculating the chisq
+    float nsigma;                       ///< how far out to convolve
     bool poissonErrors;                 ///< use poisson errors for fits?
     bool saveCovariance;

branches/eam_branches/ipp-20130904/psModules/src/objects/pmSourceFitPCM.c

@@ -115 +115 @@
     } else {
         // xxx this is wrong because it does not convolve with the psf
-        pmPCMMakeModel (source, pcm->modelConv, maskVal, psfSize);
+        pmPCMMakeModel (source, pcm->modelConv, pcm->nsigma, maskVal, psfSize);
         pmSourceChisqModelFlux (source, pcm->modelConv, maskVal);
     }