Changeset 34215

Timestamp:

Jul 27, 2012, 11:28:57 AM (14 years ago)

Author:

bills

Message:

Add argument skipNegativeFluxSources to psphotFitSourcesLinear.
Do not enable it's use in psphotStack yet.

Location:

trunk/psphot/src

Files:

• psphot.h (modified) (1 diff)
• psphotEfficiency.c (modified) (1 diff)
• psphotFitSourcesLinear.c (modified) (6 diffs)
• psphotForcedReadout.c (modified) (1 diff)
• psphotReadout.c (modified) (4 diffs)
• psphotReadoutForcedKnownSources.c (modified) (1 diff)
• psphotReadoutKnownSources.c (modified) (1 diff)
• psphotReadoutMinimal.c (modified) (1 diff)
• psphotStackReadout.c (modified) (5 diffs)

trunk/psphot/src/psphot.h

@@ -101 +101 @@
 bool            psphotMergeSourcesReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index);
 
-bool            psphotFitSourcesLinear (pmConfig *config, const pmFPAview *view, const char *filerule, bool final);
-bool            psphotFitSourcesLinearReadout (psMetadata *recipe, pmReadout *readout, psArray *sources, pmPSF *psf, bool final, pmSourceFitVarMode fitVarMode);
+bool            psphotFitSourcesLinear (pmConfig *config, const pmFPAview *view, const char *filerule, bool final, bool skipNegativeFluxSources);
+bool            psphotFitSourcesLinearReadout (psMetadata *recipe, pmReadout *readout, psArray *sources, pmPSF *psf, bool final, pmSourceFitVarMode fitVarMode, bool skipNegativeFluxSources);
 
 bool            psphotSourceSize (pmConfig *config, const pmFPAview *view, const char *filerule, bool getPSFsize);

trunk/psphot/src/psphotEfficiency.c

@@ -420 +420 @@
 
     // psphotFitSourcesLinearReadout subtracts the model fits
-    if (!psphotFitSourcesLinearReadout(recipe, readout, fakeSourcesAll, psf, true, PM_SOURCE_PHOTFIT_CONST)) {
+    if (!psphotFitSourcesLinearReadout(recipe, readout, fakeSourcesAll, psf, true, PM_SOURCE_PHOTFIT_CONST, false)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to perform linear fit on fake sources.");
         psFree(fakeSources);

trunk/psphot/src/psphotFitSourcesLinear.c

@@ -13 +13 @@
 
 // for now, let's store the detections on the readout->analysis for each readout
-bool psphotFitSourcesLinear (pmConfig *config, const pmFPAview *view, const char *filerule, bool final)
+bool psphotFitSourcesLinear (pmConfig *config, const pmFPAview *view, const char *filerule, bool final, bool skipNegativeFluxSources)
 {
     bool status = true;
@@ -66 +66 @@
         psAssert (psf, "missing psf?");
 
-        if (!psphotFitSourcesLinearReadout (recipe, readout, sources, psf, final, fitVarModePass1)) {
+        if (!psphotFitSourcesLinearReadout (recipe, readout, sources, psf, final, fitVarModePass1, skipNegativeFluxSources)) {
             psError (PSPHOT_ERR_CONFIG, false, "failed to fit sources (linear) for %s entry %d", filerule, i);
             return false;
@@ -85 +85 @@
 
             // rerun fit with correct fitVarMode
-            if (!psphotFitSourcesLinearReadout (recipe, readout, sources, psf, final, fitVarMode)) {
+            // XXX: does skipNegativeFlux work here?
+            if (!psphotFitSourcesLinearReadout (recipe, readout, sources, psf, final, fitVarMode, skipNegativeFluxSources)) {
                 psError (PSPHOT_ERR_CONFIG, false, "failed to fit sources (linear) for %s entry %d", filerule, i);
                 return false;
@@ -136 +137 @@
 }
 
-bool psphotFitSourcesLinearReadout (psMetadata *recipe, pmReadout *readout, psArray *sources, pmPSF *psf, bool final, pmSourceFitVarMode fitVarMode) {
+bool psphotFitSourcesLinearReadout (psMetadata *recipe, pmReadout *readout, psArray *sources, pmPSF *psf, bool final, pmSourceFitVarMode fitVarMode, bool skipNegativeFluxSources) {
     bool status;
     float x;
@@ -183 +184 @@
     float MIN_VALID_FLUX = psMetadataLookupF32(&status, recipe, "PSF_FIT_MIN_VALID_FLUX");
     if (!status) {
+        MIN_VALID_FLUX = 0.0;
+    }
+    if (skipNegativeFluxSources && MIN_VALID_FLUX < 0) {
         MIN_VALID_FLUX = 0.0;
     }
@@ -258 +262 @@
         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 masked sum, %f sum, %f peak)\n",
+            psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "low-sig model @ %f, %f (%f masked sum, %f sum, %f peak)\n",
                      source->peak->xf, source->peak->yf, maskedSum, modelSum, source->peak->rawFlux);
         }
         if (maskedSum < 0.5) {
-            fprintf (stderr, "worrying model @ %f, %f (%f masked sum, %f sum, %f peak)\n",
+            psLogMsg ("psphot.ensemble",  PS_LOG_MINUTIA, "worrying model @ %f, %f (%f masked sum, %f sum, %f peak)\n",
                      source->peak->xf, source->peak->yf, maskedSum, modelSum, source->peak->rawFlux);
         }

trunk/psphot/src/psphotForcedReadout.c

@@ -64 +64 @@
 
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
-    psphotFitSourcesLinear (config, view, filerule, false);
+    psphotFitSourcesLinear (config, view, filerule, false, false);
 
     // identify CRs and extended sources

trunk/psphot/src/psphotReadout.c

@@ -185 +185 @@
 
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
-    psphotFitSourcesLinear (config, view, filerule, false); // pass 1 (detections->allSources)
+    psphotFitSourcesLinear (config, view, filerule, false, false); // pass 1 (detections->allSources)
 
     // measure the radial profiles to the sky
@@ -212 +212 @@
     // linear fit to include all sources (subtract again)
     // NOTE : apply to ALL sources (extended + psf)
-    psphotFitSourcesLinear (config, view, filerule, true); // pass 2 (detections->allSources)
+    psphotFitSourcesLinear (config, view, filerule, true, false); // pass 2 (detections->allSources)
 
     // if we only do one pass, skip to extended source analysis
@@ -261 +261 @@
 
         // NOTE: apply to ALL sources
-        psphotFitSourcesLinear (config, view, filerule, true); // pass 3 (detections->allSources)
+        psphotFitSourcesLinear (config, view, filerule, true, false); // pass 3 (detections->allSources)
     }
 
@@ -302 +302 @@
 
         // NOTE: apply to ALL sources
-        psphotFitSourcesLinear (config, view, filerule, true); // pass 3 (detections->allSources)
+        psphotFitSourcesLinear (config, view, filerule, true, false); // pass 3 (detections->allSources)
     }
 

trunk/psphot/src/psphotReadoutForcedKnownSources.c

@@ -45 +45 @@
 
     // linear PSF fit to source peaks
-    psphotFitSourcesLinear (config, view, filerule, false);
+    psphotFitSourcesLinear (config, view, filerule, false, false);
 
     // calculate source magnitudes

trunk/psphot/src/psphotReadoutKnownSources.c

@@ -57 +57 @@
 
     // linear PSF fit to source peaks
-    psphotFitSourcesLinear (config, view, filerule, false);
+    psphotFitSourcesLinear (config, view, filerule, false, false);
 
     // measure aperture photometry corrections

trunk/psphot/src/psphotReadoutMinimal.c

@@ -70 +70 @@
 
     // linear PSF fit to source peaks
-    psphotFitSourcesLinear (config, view, filerule, false);
+    psphotFitSourcesLinear (config, view, filerule, false, false);
 
 // XXX eventually, add the extended source fits here

trunk/psphot/src/psphotStackReadout.c

@@ -187 +187 @@
 
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
-    psphotFitSourcesLinear (config, view, STACK_SRC, false);
+    psphotFitSourcesLinear (config, view, STACK_SRC, false, false);
     psphotStackVisualFilerule(config, view, STACK_SRC);
 
@@ -215 +215 @@
     // NOTE : apply to ALL sources (extended + psf)
     // NOTE 2 : this function subtracts the models from the given filerule (SRC), not DET
-    psphotFitSourcesLinear (config, view, STACK_SRC, true); // pass 2 (detections->allSources)
+    psphotFitSourcesLinear (config, view, STACK_SRC, true, false); // pass 2 (detections->allSources)
 
     // NOTE: possibly re-measure background model here with objects subtracted / or masked
@@ -288 +288 @@
 pass1finish:
 
+#ifdef notyet
+    // Split the fit of detected sources from matched sources. But not yet.
+    // NOTE: apply to ALL sources. Only include sources with postitive flux in the fit
+    psphotFitSourcesLinear (config, view, STACK_SRC, true, true); // pass 3 (detections->allSources)
+#endif
+
     // generate the objects (objects unify the sources from the different images) NOTE: could
     // this just match the detections for the chisq image, and not bother measuring the source
@@ -302 +308 @@
     psphotStackObjectsSelectForAnalysis (config, view, STACK_SRC, objects);
 
-    // NOTE: apply to ALL sources
-    psphotFitSourcesLinear (config, view, STACK_SRC, true); // pass 3 (detections->allSources)
+#ifdef notyet
+    // NOTE: apply to Matched sources. Since the sources that we fit above are subtracted, they will
+    // not be included in this fit.
+    psphotFitSourcesLinear (config, view, STACK_SRC, true, false); // pass 4 (detections->allSources)
+#else
+    psphotFitSourcesLinear (config, view, STACK_SRC, true, false); // pass 3 (detections->allSources)
+#endif
 
     // measure the radial profiles to the sky (only measures new objects)
@@ -369 +380 @@
 
             // this is necessary to get the right normalization for the new models
-            psphotFitSourcesLinear (config, view, STACK_OUT, false);
+            psphotFitSourcesLinear (config, view, STACK_OUT, false, false);
 
             // measure circular, radial apertures (objects sorted by S/N)