Changeset 29060 for branches/sc_branches/trunkTest/psphot/src/psphotExtendedSourceAnalysis.c

Timestamp:

Aug 26, 2010, 9:18:39 AM (16 years ago)

Author:

Serge CHASTEL

Message:

Merging trunk in branch

Location:

branches/sc_branches/trunkTest

Files:

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

branches/sc_branches/trunkTest/psphot/src/psphotExtendedSourceAnalysis.c

@@ -121 +121 @@
         if (source->peak->y > AnalysisRegion.y1) continue;
 
+        // fprintf (stderr, "xsrc: %f, %f : %f\n", source->peak->xf, source->peak->yf, source->peak->SN); 
+
         // replace object in image
         if (source->tmpFlags & PM_SOURCE_TMPF_SUBTRACTED) {
@@ -157 +159 @@
         }
 
-# if (0)
-        // Isophotal Mags
-        if (doIsophotal) {
-            if (!psphotIsophotal (source, recipe, maskVal)) {
-                psTrace ("psphot", 5, "failed to measure isophotal mags for source at %7.1f, %7.1f", source->moments->Mx, source->moments->My);
-            } else {
-                psTrace ("psphot", 5, "measured isophotal mags for source at %7.1f, %7.1f", source->moments->Mx, source->moments->My);
-                Nisophot ++;
-                source->mode |= PM_SOURCE_MODE_EXTENDED_STATS;
-            }
-        }
-        // Kron Mags
-        if (doKron) {
-            if (!psphotKron (source, recipe, maskVal)) {
-                psTrace ("psphot", 5, "failed to measure kron mags for source at %7.1f, %7.1f", source->moments->Mx, source->moments->My);
-            } else {
-                psTrace ("psphot", 5, "measure kron mags for source at %7.1f, %7.1f", source->moments->Mx, source->moments->My);
-                Nkron ++;
-                source->mode |= PM_SOURCE_MODE_EXTENDED_STATS;
-            }
-        }
-# endif
-
         // re-subtract the object, leave local sky
         pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
@@ -201 +180 @@
     }
 
+    // fprintf (stderr, "xsrc : tried %ld objects\n", sources->n);
+
     return true;
 }