Changeset 35421 for branches/eam_branches/ipp-20130419/psphot/src/psphotExtendedSourceFits.c

Timestamp:

Apr 19, 2013, 4:45:57 PM (13 years ago)

Author:

eugene

Message:

carry over changes from eam_branch/20130307

Location:

branches/eam_branches/ipp-20130419

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotExtendedSourceFits.c (modified) (6 diffs)

branches/eam_branches/ipp-20130419/psphot/src/psphotExtendedSourceFits.c

@@ -90 +90 @@
     assert (markVal);
 
+    // source fitting parameters for extended source fits
+    int fitIter = psMetadataLookupS32(&status, recipe, "EXT_FIT_ITER"); // Max number of fit iterations
+    assert (status && fitIter > 0);
+
+    float fitMinTol = psMetadataLookupF32 (&status, recipe, "EXT_FIT_MIN_TOL"); // Fit tolerance
+    if (!status || !isfinite(fitMinTol) || fitMinTol <= 0) {
+        fitMinTol = psMetadataLookupF32 (&status, recipe, "PSF_FIT_TOL"); // Fit tolerance
+        if (!status || !isfinite(fitMinTol) || fitMinTol <= 0) {
+            psAbort("PSF_FIT_MIN_TOL (and PSF_FIT_TOL) not defined or positive");
+        }
+    }
+
+    float fitMaxTol = psMetadataLookupF32 (&status, recipe, "EXT_FIT_MAX_TOL"); // Fit tolerance
+    if (!status || !isfinite(fitMaxTol) || fitMaxTol <= 0) {
+        fitMaxTol = 1.0;
+    }
+
     // maskVal is used to test for rejected pixels, and must include markVal
     maskVal |= markVal;
@@ -181 +198 @@
 
             PS_ARRAY_ADD_SCALAR(job->args, psfSize, PS_TYPE_S32);
+            PS_ARRAY_ADD_SCALAR(job->args, fitIter, PS_TYPE_S32);
+            PS_ARRAY_ADD_SCALAR(job->args, fitMinTol, PS_TYPE_F32);
+            PS_ARRAY_ADD_SCALAR(job->args, fitMaxTol, PS_TYPE_F32);
+
             PS_ARRAY_ADD_SCALAR(job->args, maskVal, PS_TYPE_IMAGE_MASK);
             PS_ARRAY_ADD_SCALAR(job->args, markVal, PS_TYPE_IMAGE_MASK);
@@ -293 +314 @@
     psRegion *region        = job->args->data[4];
     int psfSize             = PS_SCALAR_VALUE(job->args->data[5],S32);
-    psImageMaskType maskVal = PS_SCALAR_VALUE(job->args->data[6],PS_TYPE_IMAGE_MASK_DATA);
-    psImageMaskType markVal = PS_SCALAR_VALUE(job->args->data[7],PS_TYPE_IMAGE_MASK_DATA);
+    int fitIter             = PS_SCALAR_VALUE(job->args->data[6],S32);
+    float fitMinTol         = PS_SCALAR_VALUE(job->args->data[7],F32);
+    float fitMaxTol         = PS_SCALAR_VALUE(job->args->data[8],F32);
+    psImageMaskType maskVal = PS_SCALAR_VALUE(job->args->data[9],PS_TYPE_IMAGE_MASK_DATA);
+    psImageMaskType markVal = PS_SCALAR_VALUE(job->args->data[10],PS_TYPE_IMAGE_MASK_DATA);
 
     // Define source fitting parameters for extended source fits
@@ -301 +325 @@
     fitOptions->saveCovariance = true;  // XXX make this a user option?
     fitOptions->covarFactor    = psImageCovarianceFactorForAperture(readout->covariance, 10.0); // Covariance matrix
-
-    // XXX for now, use the defaults for the rest:
-    // fitOptions->nIter         = fitIter;
-    // fitOptions->tol           = fitTol;
-    // fitOptions->poissonErrors = poisson;
-    // fitOptions->weight        = PS_SQR(skySig);
+    fitOptions->nIter          = fitIter;
+    fitOptions->minTol         = fitMinTol;
+    fitOptions->maxTol         = fitMaxTol;
 
     // choose the sources of interest
@@ -335 +356 @@
         // set the fit radius based on the first radial moment (also sets the mask pixels)
         psphotSetRadiusMomentsExact(&fitRadius, &windowRadius, readout, source, markVal); // NOTE : 6 allocs
+
+        // XXX WATCH OUT HERE!!
+        // fitRadius = 30;
 
         // UPDATE : we have changed the moments calculation.  There is now an iteration within 
@@ -498 +522 @@
 
     // change the value of a scalar on the array (wrap this and put it in psArray.h)
-    scalar = job->args->data[8];
+    scalar = job->args->data[11];
     scalar->data.S32 = Next;
 
-    scalar = job->args->data[9];
+    scalar = job->args->data[12];
     scalar->data.S32 = Nconvolve;
 
-    scalar = job->args->data[10];
+    scalar = job->args->data[13];
     scalar->data.S32 = NconvolvePass;
 
-    scalar = job->args->data[11];
+    scalar = job->args->data[14];
     scalar->data.S32 = Nplain;
 
-    scalar = job->args->data[12];
+    scalar = job->args->data[15];
     scalar->data.S32 = NplainPass;
 
-    scalar = job->args->data[13];
+    scalar = job->args->data[16];
     scalar->data.S32 = Nfaint;
 
-    scalar = job->args->data[14];
+    scalar = job->args->data[17];
     scalar->data.S32 = Nfail;