Changeset 32157 for branches/eam_branches/ipp-20110710/psphot/src/psphotSourceFits.c

Timestamp:

Aug 21, 2011, 10:44:17 AM (15 years ago)

Author:

eugene

Message:

distinguish window used for moment calculation and window used for model fitting more clearly; re-generate the cached model after PCM fitting using new function (instead of caching the fit models); add function to set window which shrinks as well as expands as needed

Location:

branches/eam_branches/ipp-20110710/psphot/src

Files:

• . (modified) (1 prop)
• psphotSourceFits.c (modified) (2 diffs)

branches/eam_branches/ipp-20110710/psphot/src

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest

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

@@ -511 +511 @@
 }
 
-# define TIMING 0
+# define TIMING 1
 
 pmModel *psphotFitPCM (pmReadout *readout, pmSource *source, pmSourceFitOptions *fitOptions, pmModelType modelType, psImageMaskType maskVal, psImageMaskType markVal, int psfSize) {
@@ -583 +583 @@
 
     if (TIMING) {
-        fprintf (stderr, "psphotFitPCM : nIter: %2d, radius: %6.1f, npix: %5d, t1: %6.4f, t2: %6.4f, t4: %6.4f, t5: %6.4f\n", model->nIter, model->fitRadius, model->nPix, t1, t2, t4, t5);
+        int nPixBig = source->pixels->numCols * source->pixels->numRows;
+        fprintf (stderr, "psphotFitPCM : nIter: %2d, radius: %6.1f, npix: %5d of %5d, t1: %6.4f, t2: %6.4f, t4: %6.4f, t5: %6.4f\n", model->nIter, model->fitRadius, model->nPix, nPixBig, t1, t2, t4, t5);
     }
 

@@ -22 +22 @@
 psphotMakePSF
 psphotStack
+psphotModelTest