Changeset 31154 for trunk/psphot/src/psphotGuessModels.c

Timestamp:

Apr 4, 2011, 1:12:39 PM (15 years ago)

Author:

eugene

Message:

use the smoothed image for footprint culling; use a more stringent culling for saturated stars; more tweaks to get sat stars to be fitted; various updates to psphotStack; unify psphotImageLoop varients; be a bit careful about number of stars in a PSF clump

Location:

trunk/psphot

Files:

• . (modified) (2 props)
• src/psphotGuessModels.c (modified) (4 diffs)

trunk/psphot

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM

trunk/psphot/src/psphotGuessModels.c

@@ -160 +160 @@
         pmSource *source = sources->data[i];
 
+        if (source->mode & PM_SOURCE_MODE_MOMENTS_FAILURE) {
+            fprintf (stderr, "moment failure\n");
+        }
+
         // this is used to mark sources for which the model is measured. We check later that
         // all are used.
@@ -172 +176 @@
 
         // the guess central intensity comes from the peak:
-        float Io = source->peak->flux;
+        float Io = source->peak->rawFlux;
+        if (!isfinite(Io) && source->moments) {
+          Io = source->moments->Peak;
+        }
 
         // We have two options to get a guess for the object position: the position from the
@@ -178 +185 @@
         // moments
 
-# if (1)
-        bool useMoments = true;
-# else
-        bool useMoments = false;
-        useMoments = (source->mode & PM_SOURCE_MODE_SATSTAR);  // we only want to try if SATSTAR is set, but..
-# endif
-
-        useMoments = (useMoments && source->moments);          // can't if there are no moments
-        useMoments = (useMoments && source->moments->nPixels); // can't if the moments were not measured
-        useMoments = (useMoments && !(source->mode && PM_SOURCE_MODE_MOMENTS_FAILURE)); // can't if the moments failed...
+        bool useMoments = pmSourcePositionUseMoments(source);
 
         float Xo, Yo;
@@ -198 +196 @@
         }
 
+        if (source->mode & PM_SOURCE_MODE_SATSTAR) {
+            fprintf (stderr, "satstar: %f,%f vs %f,%f : %c\n", 
+                     source->moments->Mx, source->moments->My, 
+                     source->peak->xf, source->peak->yf,
+                     (useMoments ? 'T' : 'F'));
+        }
+
         // set PSF parameters for this model (apply 2D shape model to coordinates Xo, Yo)
         pmModel *modelPSF = pmModelFromPSFforXY(psf, Xo, Yo, Io);

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM