Changeset 28426 for trunk/psphot/src/psphotFitSourcesLinearStack.c

Timestamp:

Jun 22, 2010, 3:00:02 PM (16 years ago)

Author:

Paul Price

Message:

Linear fit was ignoring pixels with any mask bit set (including the 'advisory' mask bits: SUSPECT/BURNTOOL,CONV.POOR), rather than using the set of bad mask bits. This meant that linear photometry fits resulted in a peak flux of 0, and therefore a bad PSF magnitude. This also resulted in bright sources (meeting the first S/N cut) being detected twice because they were not subtracted properly.

File:

• trunk/psphot/src/psphotFitSourcesLinearStack.c (modified) (5 diffs)

trunk/psphot/src/psphotFitSourcesLinearStack.c

@@ -43 +43 @@
     for (int i = 0; i < objects->n; i++) {
         pmPhotObj *object = objects->data[i];
-        if (!object) continue;
-        if (!object->sources) continue;
+        if (!object) continue;
+        if (!object->sources) continue;
 
-        // XXX check an element of the group to see if we should use it
-        // if (!object->flags & PM_PHOT_OBJ_BAD) continue;
+        // XXX check an element of the group to see if we should use it
+        // if (!object->flags & PM_PHOT_OBJ_BAD) continue;
 
-        for (int j = 0; j < object->sources->n; j++) {
-          pmSource *source = object->sources->data[j];
-          if (!source) continue;
+        for (int j = 0; j < object->sources->n; j++) {
+          pmSource *source = object->sources->data[j];
+          if (!source) continue;
 
-          // turn this bit off and turn it on again if we keep this source
-          source->mode &= ~PM_SOURCE_MODE_LINEAR_FIT;
+          // turn this bit off and turn it on again if we keep this source
+          source->mode &= ~PM_SOURCE_MODE_LINEAR_FIT;
 
-          // generate model for sources without, or skip if we can't
-          if (!source->modelFlux) {
+          // generate model for sources without, or skip if we can't
+          if (!source->modelFlux) {
             if (!pmSourceCacheModel (source, maskVal)) continue;
-          }
+          }
 
-          source->mode |= PM_SOURCE_MODE_LINEAR_FIT;
-          psArrayAdd (fitSources, 100, source);
-        }
+          source->mode |= PM_SOURCE_MODE_LINEAR_FIT;
+          psArrayAdd (fitSources, 100, source);
+        }
     }
     psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "built fitSources: %f sec (%ld objects)\n", psTimerMark ("psphot.linear"), objects->n);
@@ -85 +85 @@
 
         // diagonal elements of the sparse matrix (auto-cross-product)
-        f = pmSourceModelDotModel (SRCi, SRCi, CONSTANT_PHOTOMETRIC_WEIGHTS, COVAR_FACTOR);
+        f = pmSourceModelDotModel (SRCi, SRCi, CONSTANT_PHOTOMETRIC_WEIGHTS, COVAR_FACTOR, maskVal);
         psSparseMatrixElement (sparse, i, i, f);
 
         // the formal error depends on the weighting scheme
         if (CONSTANT_PHOTOMETRIC_WEIGHTS) {
-            float var = pmSourceModelDotModel (SRCi, SRCi, false, COVAR_FACTOR);
+            float var = pmSourceModelDotModel (SRCi, SRCi, false, COVAR_FACTOR, maskVal);
             errors->data.F32[i] = 1.0 / sqrt(var);
         } else {
@@ -97 +97 @@
 
         // find the image x model value
-        f = pmSourceDataDotModel (SRCi, SRCi, CONSTANT_PHOTOMETRIC_WEIGHTS, COVAR_FACTOR);
+        f = pmSourceDataDotModel (SRCi, SRCi, CONSTANT_PHOTOMETRIC_WEIGHTS, COVAR_FACTOR, maskVal);
         psSparseVectorElement (sparse, i, f);
 
@@ -104 +104 @@
             pmSource *SRCj = fitSources->data[j];
 
-            // we only need to generate dot terms for source on the same image
-            if (SRCj->imageID != SRCi->imageID) { continue; }
+            // we only need to generate dot terms for source on the same image
+            if (SRCj->imageID != SRCi->imageID) { continue; }
 
             // skip over disjoint source images, break after last possible overlap
@@ -114 +114 @@
 
             // got an overlap; calculate cross-product and add to output array
-            f = pmSourceModelDotModel (SRCi, SRCj, CONSTANT_PHOTOMETRIC_WEIGHTS, COVAR_FACTOR);
+            f = pmSourceModelDotModel (SRCi, SRCj, CONSTANT_PHOTOMETRIC_WEIGHTS, COVAR_FACTOR, maskVal);
             psSparseMatrixElement (sparse, j, i, f);
         }