Changeset 32633 for trunk/psphot/src/psphotKronIterate.c

Timestamp:

Nov 8, 2011, 2:56:56 PM (15 years ago)

Author:

eugene

Message:

add unofficial PS1_V4 output format (not yet standard); add clean radial profile to find sky limit; use sky limit to control kron analysis window; fix thread / memory problem for radial photometry; fix object matching for forced psf photometry; fix object matching to get the right matches

Location:

trunk/psphot

Files:

• . (modified) (1 prop)
• src/psphotKronIterate.c (modified) (3 diffs)

trunk/psphot/src/psphotKronIterate.c

@@ -151 +151 @@
             }
 # else
-            if (!psphotExtendedSourceFits_Threaded(job)) {
+            if (!psphotKronIterate_Threaded(job)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");
                 psFree(AnalysisRegion);
@@ -192 +192 @@
     float MIN_KRON_RADIUS           = PS_SCALAR_VALUE(job->args->data[6],F32);
 
-    for (int j = 0; j < 5; j++) {
+    // XXX TEST : set iteration to 1
+    for (int j = 0; j < 1; j++) {
         for (int i = 0; i < sources->n; i++) {
 
@@ -209 +210 @@
 
             // use S/N to control max window size
-            float kronSN = source->moments->KronFlux / source->moments->KronFluxErr;
+            // float kronSN = source->moments->KronFlux / source->moments->KronFluxErr;
 
             // maxWindow -> 1.5*RADIUS for kronSN = 5.0, keeping S.B. constant (kronSN ~ flux)
             // (kronSN / maxWindow^2) = (5.0 / (1.5 RADIUS)^2)
             // maxWindow = 1.5 * RADIUS * sqrt(kronSN / 5.0)
-            float maxWindow = (isfinite(kronSN) && (kronSN > 5.0)) ? 1.5 * RADIUS * sqrt(kronSN / 5.0) : 1.5*RADIUS;
+            // XXX float maxWindow = (isfinite(kronSN) && (kronSN > 5.0)) ? 1.5 * RADIUS * sqrt(kronSN / 5.0) : 1.5*RADIUS;
 
             // iterate to the window radius
-            float windowRadius = PS_MIN(PS_MAX(RADIUS, 4.0*source->moments->Mrf), maxWindow);
+            // XXX float windowRadius = PS_MIN(PS_MAX(RADIUS, 4.0*source->moments->Mrf), maxWindow);
+
+            // XXX TEST : use a window based on the radial profile numbers: max is skyRadius, min is RADIUS
+            float maxWindow = source->skyRadius;
+            float windowRadius = PS_MAX(RADIUS, maxWindow);
 
             // re-allocate image, weight, mask arrays for each peak with box big enough to fit BIG_RADIUS