Changeset 12950

Timestamp:

Apr 21, 2007, 9:54:27 AM (19 years ago)

Author:

eugene

Message:

adding residual tables (from eam_02_branch)

Location:

trunk/psphot/src

Files:

• Makefile.am (modified) (1 diff)
• psphot.c (modified) (2 diffs)
• psphot.h (modified) (2 diffs)
• psphotChoosePSF.c (modified) (1 diff)
• psphotGuessModels.c (modified) (1 diff)
• psphotMakeResiduals.c (added)
• psphotReadout.c (modified) (2 diffs)
• psphotTestSourceOutput.c (added)

trunk/psphot/src/Makefile.am

@@ -56 +56 @@
         psphotDeblendSatstars.c  \
         psphotMosaicSubimage.c   \
+        psphotMakeResiduals.c    \
+        psphotTestSourceOutput.c \
         psphotAddNoise.c
 

trunk/psphot/src/psphot.c

@@ -18 +18 @@
     // load input data (config and images (signal, noise, mask)
     if (!psphotParseCamera (config)) {
-        psErrorStackPrint(stderr, "Error setting up the camera");
+        psErrorStackPrint(stderr, "Error setting up the camera\n");
         exit (psphotGetExitStatus());
     }
@@ -24 +24 @@
     // call psphot for each readout
     if (!psphotImageLoop (config)) {
-        psErrorStackPrint(stderr, "Error in the psphot image loop");
+        psErrorStackPrint(stderr, "Error in the psphot image loop\n");
         exit (psphotGetExitStatus());
     }

trunk/psphot/src/psphot.h

@@ -21 +21 @@
 bool            psphotDefineFiles (pmConfig *config, pmFPAfile *input);
 
+
 // XXX test functions
 bool            psphotTestPSF (pmReadout *readout, psArray *sources, psMetadata *recipe);
 bool            pmPSFtestModel (psArray *sources, char *modelName, float RADIUS, bool poissonErrors, psPolynomial2D *psfTrendMask);
-
+bool psphotTestSourceOutput (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf);
 psArray        *psphotFakeSources ();
 
@@ -104 +105 @@
 bool            psphotDeblendSatstars (psArray *sources, psMetadata *recipe);
 
+bool            psphotMakeResiduals (psArray *sources, psMetadata *recipe, pmPSF *psf);
+
 #endif

trunk/psphot/src/psphotChoosePSF.c

@@ -221 +221 @@
     }
 
+    // build a PSF residual image
+    if (!psphotMakeResiduals (try->sources, recipe, try->psf)) {
+        psError(PSPHOT_ERR_PSF, false, "Unable to construct residual table for PSF");
+        return NULL;
+    }
+
     // XXX test dump of psf star data and psf-subtracted image
     if (psTraceGetLevel("psphot.psfstars") > 5) { 

trunk/psphot/src/psphotGuessModels.c

@@ -55 +55 @@
     // set the source PSF model
     source->modelPSF = modelPSF;
+    source->modelPSF->residuals = psf->residuals;
   }
   psLogMsg ("psphot.models", 4, "built models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot"));

trunk/psphot/src/psphotReadout.c

@@ -64 +64 @@
     }
 
+    // psArray *bounds = psphotGetBounds ();
+    // psArray *sources = psphotBoundsToSources ();
+
     // construct sources and measure basic stats
     psArray *sources = psphotSourceStats (readout, recipe, peaks);
@@ -106 +109 @@
     psphotGuessModels (readout, sources, recipe, psf);
 
+    // XXX test output of models 
+    // psphotTestSourceOutput (readout, sources, recipe, psf);
+
     if (dump) psphotSaveImage (NULL, readout->image,  "image.v0.fits");