Changeset 31522

Timestamp:

May 10, 2011, 6:47:00 PM (15 years ago)

Author:

eugene

Message:

do not print a message for every failed mag measurement (eg, CR); add MIN SX,SY for psf clump

Location:

branches/eam_branches/ipp-20110505/psphot/src

Files:

• psphotMagnitudes.c (modified) (1 diff)
• psphotRoughClass.c (modified) (1 diff)
• psphotSourceStats.c (modified) (2 diffs)

branches/eam_branches/ipp-20110505/psphot/src/psphotMagnitudes.c

@@ -212 +212 @@
         if (status && isfinite(source->apFlux)) {
             Nap ++;
-        } else {
-            fprintf (stderr, "failed to measure mag for source @ %f,%f\n", source->peak->xf, source->peak->yf);
-        }
+        } 
 
         // clear the mask bit

branches/eam_branches/ipp-20110505/psphot/src/psphotRoughClass.c

@@ -180 +180 @@
             psAssert (status, "missing MOMENTS_SY_MAX");
         }
-
-        psfClump = pmSourcePSFClump (NULL, region, sources, PSF_SN_LIM, PSF_CLUMP_GRID_SCALE, MOMENTS_SX_MAX, MOMENTS_SY_MAX, MOMENTS_AR_MAX);
+        float MOMENTS_SX_MIN = psMetadataLookupF32(&status, analysis, "MOMENTS_SX_MIN");
+        if (!status) {
+            MOMENTS_SX_MIN = psMetadataLookupF32(&status, recipe, "MOMENTS_SX_MIN");
+            if (!status) {
+                MOMENTS_SX_MIN = 0.5;
+            }
+        }
+        float MOMENTS_SY_MIN = psMetadataLookupF32(&status, analysis, "MOMENTS_SY_MIN");
+        if (!status) {
+            MOMENTS_SY_MIN = psMetadataLookupF32(&status, recipe, "MOMENTS_SY_MIN");
+            if (!status) {
+                MOMENTS_SY_MIN = 0.5;
+            }
+        }
+
+        psfClump = pmSourcePSFClump (NULL, region, sources, PSF_SN_LIM, PSF_CLUMP_GRID_SCALE, MOMENTS_SX_MAX, MOMENTS_SY_MAX, MOMENTS_SX_MIN, MOMENTS_SY_MIN, MOMENTS_AR_MAX);
 
         psMetadataAddF32 (regionMD, PS_LIST_TAIL, "PSF.CLUMP.X",  PS_META_REPLACE, "psf clump center", psfClump.X);

branches/eam_branches/ipp-20110505/psphot/src/psphotSourceStats.c

@@ -505 +505 @@
     psF32 MOMENTS_AR_MAX = psMetadataLookupF32(&status, recipe, "MOMENTS_AR_MAX"); psAssert (status, "missing MOMENTS_AR_MAX");
 
+    float MOMENTS_SX_MIN = psMetadataLookupF32(&status, recipe, "MOMENTS_SX_MIN");
+    if (!status) {
+        MOMENTS_SX_MIN = 0.5;
+    }
+    float MOMENTS_SY_MIN = psMetadataLookupF32(&status, recipe, "MOMENTS_SY_MIN");
+    if (!status) {
+        MOMENTS_SY_MIN = 0.5;
+    }
+
     // when we set the window, we are not attempting to measure spatial variations; we can use a somewhat higher S/N limit
     // since we are using all sources (true?)
@@ -544 +553 @@
 
         // determine the PSF parameters from the source moment values
-        pmPSFClump psfClump = pmSourcePSFClump (NULL, NULL, sources, PSF_SN_LIM, PSF_CLUMP_GRID_SCALE, MOMENTS_SX_MAX, MOMENTS_SY_MAX, MOMENTS_AR_MAX);
+        pmPSFClump psfClump = pmSourcePSFClump (NULL, NULL, sources, PSF_SN_LIM, PSF_CLUMP_GRID_SCALE, MOMENTS_SX_MAX, MOMENTS_SY_MAX, MOMENTS_SX_MIN, MOMENTS_SY_MIN, MOMENTS_AR_MAX);
         psLogMsg ("psphot", 3, "radius %.1f, nStars: %d of %d in clump, nSigma: %5.2f, X,  Y: %f, %f (%f, %f)\n", sigma[i], psfClump.nStars, psfClump.nTotal, psfClump.nSigma, psfClump.X, psfClump.Y, sqrt(psfClump.X) / sigma[i], sqrt(psfClump.Y) / sigma[i]);