Changeset 34247 for branches/eam_branches/ipp-20120627/psphot/src/psphotFitSourcesLinear.c

Timestamp:

Jul 31, 2012, 11:50:18 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627/psphot

Files:

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

branches/eam_branches/ipp-20120627/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;
@@ -51 +51 @@
         psAssert (readout, "missing readout?");
 
+        if (psMetadataLookupBool (&status, readout->analysis, "PSPHOT.SKIP.INPUT")) {
+            psLogMsg ("psphot", PS_LOG_DETAIL, "skipping fit sources for input file %d", i);
+            continue;
+        }
+
+
         pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
         psAssert (detections, "missing detections?");
@@ -60 +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;
@@ -79 +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;
@@ -130 +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;
@@ -177 +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;
     }
@@ -252 +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);
         }