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

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)

File:

• branches/eam_branches/ipp-20130904/psModules/src/objects/pmPCMdata.c (modified) (7 diffs)

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);