Changeset 24576 for trunk/psModules/src/objects/pmSource.c

Timestamp:

Jun 25, 2009, 3:43:25 PM (17 years ago)

Author:

eugene

Message:

rename PSF_CLUMP_SN_LIM to PSF_SN_LIM; drop extra satstar moments analysis (already done elsewhere)

File:

• trunk/psModules/src/objects/pmSource.c (modified) (5 diffs)

trunk/psModules/src/objects/pmSource.c

@@ -291 +291 @@
 
     bool status = true;                 // Status of MD lookup
-    float PSF_CLUMP_SN_LIM = psMetadataLookupF32(&status, recipe, "PSF_CLUMP_SN_LIM");
+    float PSF_SN_LIM = psMetadataLookupF32(&status, recipe, "PSF_SN_LIM");
     if (!status) {
-        PSF_CLUMP_SN_LIM = 0;
+        PSF_SN_LIM = 0;
     }
     float PSF_CLUMP_GRID_SCALE = psMetadataLookupF32(&status, recipe, "PSF_CLUMP_GRID_SCALE");
@@ -342 +342 @@
             }
 
-            if (src->moments->SN < PSF_CLUMP_SN_LIM) {
+            if (src->moments->SN < PSF_SN_LIM) {
                 psTrace("psModules.objects", 10, "Rejecting source from clump because of low S/N (%f)\n",
                         src->moments->SN);
@@ -450 +450 @@
             if (tmpSrc->moments == NULL)
                 continue;
-            if (tmpSrc->moments->SN < PSF_CLUMP_SN_LIM)
+            if (tmpSrc->moments->SN < PSF_SN_LIM)
                 continue;
 
@@ -534 +534 @@
     bool status;
     float PSF_SN_LIM = psMetadataLookupF32 (&status, recipe, "PSF_SN_LIM");
-    if (!status)
-        PSF_SN_LIM = 20.0;
+    if (!status) PSF_SN_LIM = 20.0;
     float PSF_CLUMP_NSIGMA = psMetadataLookupF32 (&status, recipe, "PSF_CLUMP_NSIGMA");
-    if (!status)
-        PSF_CLUMP_NSIGMA = 1.5;
-    float INNER_RADIUS = psMetadataLookupF32 (&status, recipe, "SKY_INNER_RADIUS");
+    if (!status) PSF_CLUMP_NSIGMA = 1.5;
+
+    // float INNER_RADIUS = psMetadataLookupF32 (&status, recipe, "SKY_INNER_RADIUS");
 
     pmSourceMode noMoments = PM_SOURCE_MODE_MOMENTS_FAILURE | PM_SOURCE_MODE_SKYVAR_FAILURE | PM_SOURCE_MODE_SKY_FAILURE | PM_SOURCE_MODE_BELOW_MOMENTS_SN;
@@ -582 +581 @@
             source->type = PM_SOURCE_TYPE_STAR;
             source->mode |= PM_SOURCE_MODE_SATSTAR;
-            // recalculate moments here with larger box?
-            pmSourceMoments (source, INNER_RADIUS);
+            // why do we recalculate moments here?
+            // we already attempt to do this in psphotSourceStats
+            // pmSourceMoments (source, INNER_RADIUS);
             Nsatstar ++;
             continue;