Changeset 31606 for branches/czw_branch/20110406/psphot/src/psphotFitSourcesLinear.c

Timestamp:

Jun 6, 2011, 1:56:22 PM (15 years ago)

Author:

watersc1

Message:

merge from trunk before working on new stacking code

Location:

branches/czw_branch/20110406

Files:

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

branches/czw_branch/20110406/psphot/src/psphotFitSourcesLinear.c

@@ -137 +137 @@
         if (source->mode & PM_SOURCE_MODE_CR_LIMIT) continue;
 
+        // do not include MOMENTS_FAILURES in the fit
+        if (source->mode & PM_SOURCE_MODE_MOMENTS_FAILURE) continue;
+
         // XXX count saturated stars
         if (source->mode & PM_SOURCE_MODE_SATSTAR) {
@@ -164 +167 @@
 
         // check the integral of the model : is it large enough?
+        // apply mask?
         float modelSum = 0.0;
+        float maskedSum = 0.0;
         for (int iy = 0; iy < source->modelFlux->numRows; iy++) {
             for (int ix = 0; ix < source->modelFlux->numCols; ix++) {
                 modelSum += source->modelFlux->data.F32[iy][ix];
+                if (source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[iy][ix] & maskVal) continue;
+                maskedSum += source->modelFlux->data.F32[iy][ix];
             }
         }
         if (modelSum < 0.5) continue; // skip sources with no model constraint (somewhat arbitrary limit)
-        // if (modelSum < 0.01) continue; // skip sources with no model constraint (somewhat arbitrary limit)
         if (modelSum < 0.8) {
-            fprintf (stderr, "low-sig model @ %f, %f (%f sum, %f peak)\n",
-                     source->peak->xf, source->peak->yf, modelSum, source->peak->rawFlux);
+            fprintf (stderr, "low-sig model @ %f, %f (%f masked sum, %f sum, %f peak)\n",
+                     source->peak->xf, source->peak->yf, maskedSum, modelSum, source->peak->rawFlux);
         }
-
-        pmModel *model = pmSourceGetModel (NULL, source);
+        if (maskedSum < 0.5) {
+            fprintf (stderr, "worrying model @ %f, %f (%f masked sum, %f sum, %f peak)\n",
+                     source->peak->xf, source->peak->yf, maskedSum, modelSum, source->peak->rawFlux);
+        }
+
+        bool isPSF = false;
+        pmModel *model = pmSourceGetModel (&isPSF, source);
 
         psImageMaskPixels (source->maskObj, "AND", PS_NOT_IMAGE_MASK(markVal));
         psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, model->fitRadius, "OR", markVal);
 
-        source->mode |= PM_SOURCE_MODE_LINEAR_FIT;
+        // we call this function multiple times. for the first time, we have only PSF models for all objects
+        // the second time has extended sources.  If we ever fit the PSF model, we should raise this bit
+        source->mode |= PM_SOURCE_MODE_LINEAR_FIT;
+        if (isPSF) {
+            source->mode |= PM_SOURCE_MODE_PSFMODEL;
+        }           
+        
         psArrayAdd (fitSources, 100, source);
     }
@@ -260 +277 @@
         }
     }
+
+# if (0)
+    static int npass = 0;
+    char name[128];
+    FILE *f1 = NULL;
+    int fd = -1;
+
+    snprintf (name, 128, "sparse.Aij.%02d.dat", npass);
+    f1 = fopen (name, "w");
+    psAssert (f1, "failed to open file\n");
+    fd = fileno (f1);
+    p_psVectorPrint (fd, sparse->Aij, "Aij");
+    fclose (f1);
+
+    snprintf (name, 128, "sparse.Bfj.%02d.dat", npass);
+    f1 = fopen (name, "w");
+    psAssert (f1, "failed to open file\n");
+    fd = fileno (f1);
+    p_psVectorPrint (fd, sparse->Bfj, "Bfj");
+    fclose (f1);
+
+    snprintf (name, 128, "sparse.Qii.%02d.dat", npass);
+    f1 = fopen (name, "w");
+    psAssert (f1, "failed to open file\n");
+    fd = fileno (f1);
+    p_psVectorPrint (fd, sparse->Qii, "Qii");
+    fclose (f1);
+    npass ++;
+# endif
 
     psSparseResort (sparse);