Changeset 31313

Timestamp:

Apr 18, 2011, 8:55:26 AM (15 years ago)

Author:

eugene

Message:

raise bit for PASS1 detections; set MODE_PSFMODEL in linear fit as well as nonlinear fit; move flags for fitting results into pmSourceFits not the calling function (more explicitly sets the bits in the right cases); adding test MaskedKron function

Location:

branches/eam_branches/ipp-20110404/psphot

Files:

• src/Makefile.am (modified) (1 diff)
• src/psphot.h (modified) (1 diff)
• src/psphotBlendFit.c (modified) (2 diffs)
• src/psphotFitSourcesLinear.c (modified) (3 diffs)
• src/psphotFitSourcesLinearStack.c (modified) (1 diff)
• src/psphotMagnitudes.c (modified) (1 diff)
• src/psphotReadout.c (modified) (1 diff)
• src/psphotSourceFits.c (modified) (4 diffs)
• src/psphotSourceStats.c (modified) (2 diffs)
• test/tap_psphot_stackphot.pro (modified) (1 diff)

branches/eam_branches/ipp-20110404/psphot/src/Makefile.am

@@ -167 +167 @@
         psphotSourcePlots.c            \
         psphotRadialPlot.c             \
+        psphotKronMasked.c             \
         psphotDeblendSatstars.c        \
         psphotMosaicSubimage.c         \

branches/eam_branches/ipp-20110404/psphot/src/psphot.h

@@ -149 +149 @@
 bool            psphotPSFstats (pmReadout *readout, pmPSF *psf);
 bool            psphotMomentsStats (pmReadout *readout, psArray *sources);
+
+bool            psphotKronMasked (pmConfig *config, const pmFPAview *view, const char *filerule);
+bool            psphotKronMaskedReadout(pmConfig *config, psMetadata *recipe, const pmFPAview *view, pmReadout *readout, psArray *sources, pmPSF *psf);
 
 // in psphotGuessModel.c

branches/eam_branches/ipp-20110404/psphot/src/psphotBlendFit.c

@@ -280 +280 @@
         if (source->mode & PM_SOURCE_MODE_EXT_LIMIT) {
             if (psphotFitBlob (readout, source, newSources, psf, fitOptions, maskVal, markVal)) {
-                source->type = PM_SOURCE_TYPE_EXTENDED;
                 psTrace ("psphot", 5, "source at %7.1f, %7.1f is ext", source->peak->xf, source->peak->yf);
                 Next ++;
-                source->mode |= PM_SOURCE_MODE_NONLINEAR_FIT;
                 continue;
             }
@@ -291 +289 @@
                 psTrace ("psphot", 5, "source at %7.1f, %7.1f is psf", source->peak->xf, source->peak->yf);
                 Npsf ++;
-                source->mode |= PM_SOURCE_MODE_NONLINEAR_FIT;
                 continue;
             }

branches/eam_branches/ipp-20110404/psphot/src/psphotFitSourcesLinear.c

@@ -164 +164 @@
 
         // check the integral of the model : is it large enough?
+        // apply mask?
         float modelSum = 0.0;
         for (int iy = 0; iy < source->modelFlux->numRows; iy++) {
@@ -171 +172 @@
         }
         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",
@@ -177 +177 @@
         }
 
-        pmModel *model = pmSourceGetModel (NULL, source);
+        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);
     }

branches/eam_branches/ipp-20110404/psphot/src/psphotFitSourcesLinearStack.c

@@ -69 +69 @@
             if (!pmSourceCacheModel (source, maskVal)) continue;
           }
+
+          // check the integral of the model : is it large enough?
+          float modelSum = 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 (modelSum < 0.5) 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);
+          }
 
           source->mode |= PM_SOURCE_MODE_LINEAR_FIT;

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

@@ -177 +177 @@
 
         status = pmSourceMagnitudes (source, psf, photMode, maskVal, markVal, source->apRadius);
-        if (status && isfinite(source->apMag)) Nap ++;
+        if (status && isfinite(source->apMag)) {
+            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-20110404/psphot/src/psphotReadout.c

@@ -146 +146 @@
     }
 
+    // psphotKronMasked(config, view, filerule);
+
     // find blended neighbors of very saturated stars (detections->newSources)
     // if (!psphotDeblendSatstars (config, view, filerule)) {

branches/eam_branches/ipp-20110404/psphot/src/psphotSourceFits.c

@@ -146 +146 @@
     pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
     source->mode |=  PM_SOURCE_MODE_BLEND_FIT;
+    source->mode |= PM_SOURCE_MODE_NONLINEAR_FIT;
     return true;
 }
@@ -186 +187 @@
 
     // build cached model and subtract
+    source->mode |= PM_SOURCE_MODE_NONLINEAR_FIT;
     pmSourceCacheModel (source, maskVal);
     pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
@@ -319 +321 @@
     source->type = PM_SOURCE_TYPE_EXTENDED;
     source->mode |= PM_SOURCE_MODE_EXTMODEL;
+    source->mode |= PM_SOURCE_MODE_NONLINEAR_FIT;
 
     // build cached model and subtract
@@ -346 +349 @@
     source->modelPSF = psMemIncrRefCounter (DBL->data[0]);
     source->mode     |= PM_SOURCE_MODE_PAIR;
+    source->mode |= PM_SOURCE_MODE_NONLINEAR_FIT;
 
     // copy most data from the primary source (modelEXT, blends stay NULL)

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

@@ -98 +98 @@
 
     // generate the array of sources, define the associated pixel
+    bool firstPass = false;
     if (!detections->newSources) {
         detections->newSources = psArrayAllocEmpty (peaks->n);
+        firstPass = true;
     }
     sources = detections->newSources;
@@ -125 +127 @@
         if (source->mode & PM_SOURCE_MODE_MOMENTS_FAILURE) {
             fprintf (stderr, "moment failure\n");
+        }
+
+        if (firstPass) {
+            source->mode2 |= PM_SOURCE_MODE2_PASS1_SRC;
         }
 

branches/eam_branches/ipp-20110404/psphot/test/tap_psphot_stackphot.pro

@@ -1 +1 @@
 #!/usr/bin/env mana
 # -*-sh-*-
+
+$KAPA = kapa -noX
 
 # config for ppImage to generate chip, mask, weight