Changeset 19869

Timestamp:

Oct 2, 2008, 11:49:42 AM (18 years ago)

Author:

eugene

Message:

updates from eam_branch_20080926

Location:

trunk/psphot/src

Files:

• Makefile.am (modified) (1 diff)
• psphot.h (modified) (2 diffs)
• psphotArguments.c (modified) (1 diff)
• psphotBlendFit.c (modified) (1 diff)
• psphotFindDetections.c (modified) (1 diff)
• psphotFindFootprints.c (modified) (1 diff)
• psphotFitSourcesLinear.c (modified) (1 diff)
• psphotMosaicSubimage.c (modified) (2 diffs)
• psphotReadout.c (modified) (9 diffs)
• psphotReplaceUnfit.c (modified) (3 diffs)
• psphotSavePSFStars.c (modified) (3 diffs)
• psphotSourceFits.c (modified) (3 diffs)
• psphotSourcePlots.c (modified) (3 diffs)
• psphotVisual.c (added)

trunk/psphot/src/Makefile.am

@@ -74 +74 @@
         psphotMakeFluxScale.c          \
         psphotCheckStarDistribution.c  \
+        psphotVisual.c                 \
         psphotAddNoise.c
 

trunk/psphot/src/psphot.h

@@ -113 +113 @@
 bool            psphotRadialPlot (int *kapa, const char *filename, pmSource *source);
 bool            psphotSourcePlots (pmReadout *readout, psArray *sources, psMetadata *recipe);
-bool            psphotMosaicSubimage (psImage *outImage, pmSource *source, int Xo, int Yo, int DX, int DY);
+bool            psphotMosaicSubimage (psImage *outImage, pmSource *source, int Xo, int Yo, int DX, int DY, bool normalize);
 
 bool            psphotAddWithTest (pmSource *source, bool useState, psMaskType maskVal);
@@ -132 +132 @@
 bool            psphotAnnuli (pmSource *source, psMetadata *recipe, psMaskType maskVal);
 bool            psphotKron (pmSource *source, psMetadata *recipe, psMaskType maskVal);
+
+// psphotVisual functions
+bool psphotSetVisual (bool mode);
+bool psphotVisualShowImage (pmConfig *config, pmReadout *readout);
+bool psphotVisualShowBackground (pmConfig *config, const pmFPAview *view, pmReadout *readout);
+bool psphotVisualShowSignificance (psImage *image);
+bool psphotVisualShowPeaks (pmConfig *config, const pmFPAview *view, pmDetections *detections);
+bool psphotVisualShowFootprints (pmConfig *config, const pmFPAview *view, pmDetections *detections);
+bool psphotVisualShowMoments (pmConfig *config, const pmFPAview *view, psArray *sources);
+bool psphotVisualShowRoughClass (pmConfig *config, const pmFPAview *view, psArray *sources);
+bool psphotVisualShowPSFStars (pmConfig *config, const pmFPAview *view, pmPSF *psf, psArray *sources);
+bool psphotVisualShowSatStars (pmConfig *config, const pmFPAview *view, pmPSF *psf, psArray *sources);
+bool psphotVisualShowLinearFit (pmConfig *config, pmReadout *readout);
+bool psphotVisualShowPSFModel (pmConfig *config, pmReadout *readout, pmPSF *psf);
 
 // structures & functions to support psf-convolved model fitting

trunk/psphot/src/psphotArguments.c

@@ -67 +67 @@
     }
 
+    // visual : interactive display mode
+    if ((N = psArgumentGet (argc, argv, "-visual"))) {
+        psArgumentRemove (N, &argc, argv);
+        psphotSetVisual (true);
+    }
+
     // break : used from recipe throughout psphotReadout
     if ((N = psArgumentGet (argc, argv, "-break"))) {

trunk/psphot/src/psphotBlendFit.c

@@ -83 +83 @@
         Nfit ++;
 
+        // XXX TEST
+        // if ((fabs(source->peak->x - 1202) < 2) && (fabs(source->peak->y - 1065) < 2)) {
+        // psTraceSetLevel ("psLib.math.psMinimizeLMChi2", 6);
+        // }
+
         // try fitting PSFs, then try extended sources
         // these functions subtract the resulting fitted source (XXX and update the modelFlux?)

trunk/psphot/src/psphotFindDetections.c

@@ -41 +41 @@
     psImage *significance = psphotSignificanceImage (readout, recipe, pass, maskVal);
 
+    // display the backsub and backgnd images
+    psphotVisualShowSignificance (significance);
+
     // detect the peaks in the significance image
     detections->peaks = psphotFindPeaks (significance, readout, recipe, threshold, NMAX);

trunk/psphot/src/psphotFindFootprints.c

@@ -33 +33 @@
     // find the raw footprints & assign the peaks to those footprints 
     psArray *footprints = pmFootprintsFind (significance, threshold, npixMin);
+
     pmFootprintsAssignPeaks(footprints, detections->peaks);
     // XXX handle the error conditions here

trunk/psphot/src/psphotFitSourcesLinear.c

@@ -66 +66 @@
         if (source->type == PM_SOURCE_TYPE_DEFECT) continue;
         if (source->type == PM_SOURCE_TYPE_SATURATED) continue;
-        if (source->type == PM_SOURCE_TYPE_STAR &&
-            source->mode & PM_SOURCE_MODE_SATSTAR) continue;
+
+        // if (source->type == PM_SOURCE_TYPE_STAR &&
+        // source->mode & PM_SOURCE_MODE_SATSTAR) continue;
+
         if (final) {
             if (source->mode &  PM_SOURCE_MODE_SUBTRACTED) continue;

trunk/psphot/src/psphotMosaicSubimage.c

@@ -2 +2 @@
 
 // insert the source image into the outimage at Xo, Yo
-bool psphotMosaicSubimage (psImage *outImage, pmSource *source, int Xo, int Yo, int DX, int DY) {
+bool psphotMosaicSubimage (psImage *outImage, pmSource *source, int Xo, int Yo, int DX, int DY, bool normalize) {
 
     psRegion inRegion, outRegion;
@@ -35 +35 @@
     for (int iy = 0; iy < newImage->numRows; iy++) {
         for (int ix = 0; ix < newImage->numCols; ix++) {
-            newImage->data.F32[iy][ix] = subImage->data.F32[iy][ix] / peak;
+            if (normalize) {
+                newImage->data.F32[iy][ix] = subImage->data.F32[iy][ix] / peak;
+            } else {
+                newImage->data.F32[iy][ix] = subImage->data.F32[iy][ix] / peak;
+            }
         }
     }

trunk/psphot/src/psphotReadout.c

@@ -36 +36 @@
     }
 
+    // set up the Visual display, display the image, weight, mask (ch 1,2,3)
+    psphotVisualShowImage (config, readout);
+
     // generate a background model (median, smoothed image)
     if (!psphotModelBackground (config, view, "PSPHOT.INPUT")) {
@@ -46 +49 @@
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }
+
+    // display the backsub and backgnd images
+    psphotVisualShowBackground (config, view, readout);
 
     // run a single-model test if desired (exits from here if test is run)
@@ -63 +69 @@
     }
  
+    // display the backsub and backgnd images
+    psphotVisualShowPeaks (config, view, detections);
+    psphotVisualShowFootprints (config, view, detections);
+
     // XXX test write out the footprint image
     if (0) {
@@ -68 +78 @@
         psphotSaveImage (NULL, footprintImage, "footprints.1.fits");
         psFree (footprintImage);
-    }
-
-    // XXX test write out the footprint image
-    if (0) {
-        psImage *footprintImage = pmSetFootprintArrayIDs (detections->footprints, true);
-        psphotSaveImage (NULL, footprintImage, "footprints.1.fits");
-        psFree (footprintImage);
     }
 
@@ -84 +87 @@
     }
 
+    psphotVisualShowMoments (config, view, sources);
+
     // find blended neighbors of very saturated stars
     // XXX merge this with Basic Deblend?
@@ -102 +107 @@
         return psphotReadoutCleanup(config, readout, recipe, detections, psf, sources);
     }
+
+    psphotVisualShowRoughClass (config, view, sources);
 
     // if we were not supplied a PSF, choose one here
@@ -119 +126 @@
     }
 
+    psphotVisualShowPSFModel (config, readout, psf);
+
     // Define source fitting parameters for everything that follows PSF fits
     // This allows different parameters to be used from the PSF fitting
@@ -158 +167 @@
     psphotFitSourcesLinear (readout, sources, recipe, psf, FALSE);
 
+    // XXX we have to place this here because the models are not realized until psphotGuessModels
+    // or fitted until psphotFitSourcesLinear.  There is an example of generating a residual image 
+    // in pmPSFtry.c
+
+    psphotVisualShowPSFStars (config, view, psf, sources);
+    psphotVisualShowSatStars (config, view, psf, sources);
+    psphotVisualShowLinearFit (config, readout);
+
     if (0) {
         FILE *out = fopen ("out.pass1.dat", "w");
@@ -184 +201 @@
     }
 
+    // XXX psphotVisualShowSourceSize (config, view, sources);
+
     // non-linear PSF and EXT fit to brighter sources
     psphotBlendFit (readout, sources, recipe, psf);
+
+    // XXX psphotVisualShowNonLinearFit (config, view, sources);
 
     // replace all sources

trunk/psphot/src/psphotReplaceUnfit.c

@@ -71 +71 @@
 }
 
-// add source, if the source has been subtracted (or if we ignore the state)
+// add source, if the source has been subtracted; do not modify state
 bool psphotAddWithTest (pmSource *source, bool useState, psMaskType maskVal) {
 
@@ -78 +78 @@
     if (state && useState) return true;
 
-    // replace the model if 1) state says it is missing or 2) useState is false (just do it)
-    if (!state || !useState) {
-        pmSourceAdd (source, PM_MODEL_OP_FULL, maskVal);
-    }
+    pmSourceAdd (source, PM_MODEL_OP_FULL, maskVal);
     return true;
 }
 
-// sub source, if the source has been added (or if we ignore the state)
+// sub source, if the source has been added; do not modify state
 bool psphotSubWithTest (pmSource *source, bool useState, psMaskType maskVal) {
 
@@ -92 +89 @@
     if (state && useState) return true;
 
-    // replace the model if 1) state says it is missing or 2) useState is false (just do it)
-    if (!state || !useState) {
-        pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
-    }
+    pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
     return true;
 }
 
-// add or sub source replace or if the source has
+// add or sub source to match recorded state: supply current state as true (add) or false (sub)
 bool psphotSetState (pmSource *source, bool curState, psMaskType maskVal) {
 

trunk/psphot/src/psphotSavePSFStars.c

@@ -100 +100 @@
                 psphotAddWithTest (source, true); // replace source if subtracted
                 psphotRadialPlot (&kapa, "radial.plots.ps", source);
-                psphotMosaicSubimage (outpos, source, Xo, Yo, DX, DY);
+                psphotMosaicSubimage (outpos, source, Xo, Yo, DX, DY, true);
 
                 psphotSubWithTest (source, false); // remove source (force)
-                psphotMosaicSubimage (outsub, source, Xo, Yo, DX, DY);
+                psphotMosaicSubimage (outsub, source, Xo, Yo, DX, DY, true);
 
                 psphotSetState (source, false); // replace source (has been subtracted)
@@ -115 +115 @@
                 psphotAddWithTest (source, true); // replace source if subtracted
                 psphotRadialPlot (&kapa, "radial.plots.ps", source);
-                psphotMosaicSubimage (outpos, source, Xo, Yo, DX, DY);
+                psphotMosaicSubimage (outpos, source, Xo, Yo, DX, DY, true);
 
                 psphotSubWithTest (source, false); // remove source (force)
-                psphotMosaicSubimage (outsub, source, Xo, Yo, DX, DY);
+                psphotMosaicSubimage (outsub, source, Xo, Yo, DX, DY, true);
                 psphotSetState (source, false); // replace source (has been subtracted)
 
@@ -128 +128 @@
             psphotAddWithTest (source, true); // replace source if subtracted
             psphotRadialPlot (&kapa, "radial.plots.ps", source);
-            psphotMosaicSubimage (outpos, source, Xo, Yo, DX, DY);
+            psphotMosaicSubimage (outpos, source, Xo, Yo, DX, DY, true);
 
             psphotSubWithTest (source, false); // remove source (force)
-            psphotMosaicSubimage (outsub, source, Xo, Yo, DX, DY);
+            psphotMosaicSubimage (outsub, source, Xo, Yo, DX, DY, true);
             psphotSetState (source, false); // replace source (has been subtracted)
 

trunk/psphot/src/psphotSourceFits.c

@@ -16 +16 @@
 bool psphotFitSummary () {
 
-    fprintf (stderr, "fitted %5d psf, %5d blend, %5d ext, %5d dbl : %6.2f sec\n",
+    psLogMsg ("psphot.pspsf", PS_LOG_INFO, "fitted %5d psf, %5d blend, %5d ext, %5d dbl : %6.2f sec\n",
              NfitPSF, NfitBlend, NfitEXT, NfitDBL, psTimerMark ("psphot.fits"));
     return true;
@@ -47 +47 @@
     psArray *sourceSet = psArrayAllocEmpty (source->blends->n + 1);
     psArrayAdd (sourceSet, 16, source);
+
+    psTrace ("psphot", 4, "fitting blended source at %f %f : %f\n", source->peak->xf, source->peak->yf, source->peak->flux);
 
     // we need to include all blends in the fit (unless primary is saturated?)
@@ -77 +79 @@
         psArrayAdd (modelSet, 16, model);
         psArrayAdd (sourceSet, 16, blend);
+
+        psTrace ("psphot", 5, "adding source at %f %f : %f\n", blend->peak->xf, blend->peak->yf, blend->peak->flux);
 
         // free to avoid double counting model

trunk/psphot/src/psphotSourcePlots.c

@@ -113 +113 @@
                 psphotAddWithTest (source, true, maskVal); // replace source if subtracted
                 psphotRadialPlot (&kapa, "radial.plots.ps", source);
-                psphotMosaicSubimage (outpos, source, Xo, Yo, DX, DY);
+                psphotMosaicSubimage (outpos, source, Xo, Yo, DX, DY, true);
 
                 psphotSubWithTest (source, false, maskVal); // remove source (force)
-                psphotMosaicSubimage (outsub, source, Xo, Yo, DX, DY);
+                psphotMosaicSubimage (outsub, source, Xo, Yo, DX, DY, true);
 
                 psphotSetState (source, false, maskVal); // replace source (has been subtracted)
@@ -128 +128 @@
                 psphotAddWithTest (source, true, maskVal); // replace source if subtracted
                 psphotRadialPlot (&kapa, "radial.plots.ps", source);
-                psphotMosaicSubimage (outpos, source, Xo, Yo, DX, DY);
+                psphotMosaicSubimage (outpos, source, Xo, Yo, DX, DY, true);
 
                 psphotSubWithTest (source, false, maskVal); // remove source (force)
-                psphotMosaicSubimage (outsub, source, Xo, Yo, DX, DY);
+                psphotMosaicSubimage (outsub, source, Xo, Yo, DX, DY, true);
                 psphotSetState (source, false, maskVal); // replace source (has been subtracted)
 
@@ -141 +141 @@
             psphotAddWithTest (source, true, maskVal); // replace source if subtracted
             psphotRadialPlot (&kapa, "radial.plots.ps", source);
-            psphotMosaicSubimage (outpos, source, Xo, Yo, DX, DY);
+            psphotMosaicSubimage (outpos, source, Xo, Yo, DX, DY, true);
 
             psphotSubWithTest (source, false, maskVal); // remove source (force)
-            psphotMosaicSubimage (outsub, source, Xo, Yo, DX, DY);
+            psphotMosaicSubimage (outsub, source, Xo, Yo, DX, DY, true);
             psphotSetState (source, false, maskVal); // replace source (has been subtracted)