Changeset 32924 for branches/eam_branches/ipp-20111122/psphot

Timestamp:

Dec 11, 2011, 1:42:35 PM (15 years ago)

Author:

eugene

Message:

fix forced photometry of matched objects (psf model only) : needed to generate a guess model, which meant re-working psphotGuessModels to apply to only the unguessed objects in the allSources detections, not the newSources, so they could be applied to the matched objects

Location:

branches/eam_branches/ipp-20111122/psphot/src

Files:

• psphotFitSourcesLinear.c (modified) (1 diff)
• psphotForcedReadout.c (modified) (1 diff)
• psphotGuessModels.c (modified) (2 diffs)
• psphotReadout.c (modified) (5 diffs)
• psphotReadoutFindPSF.c (modified) (2 diffs)
• psphotReadoutForcedKnownSources.c (modified) (1 diff)
• psphotReadoutKnownSources.c (modified) (1 diff)
• psphotReadoutMinimal.c (modified) (1 diff)
• psphotSourceMatch.c (modified) (1 diff)
• psphotStackMatchPSFsNext.c (modified) (1 diff)
• psphotStackReadout.c (modified) (4 diffs)

branches/eam_branches/ipp-20111122/psphot/src/psphotFitSourcesLinear.c

@@ -137 +137 @@
         // psAssert (source->peak, "source without peak??");
         // psAssert (source->peak->footprint, "peak without footprint??");
+
+        // XXX TEST
+        if (source->mode2 & PM_SOURCE_MODE2_MATCHED) {
+            fprintf (stderr, "forced photometry on supplied source\n");
+        }
 
         // turn this bit off and turn it on again if we pass this test

branches/eam_branches/ipp-20111122/psphot/src/psphotForcedReadout.c

@@ -55 +55 @@
     psphotLoadExtSources (config, view, filerule);
 
-    // construct an initial model for each object, set the radius to fitRadius, set circular fit mask
+    // Construct an initial model for each object, set the radius to fitRadius, set circular
+    // fit mask.  NOTE: only applied to sources without guess models
     psphotGuessModels (config, view, filerule);
 

branches/eam_branches/ipp-20111122/psphot/src/psphotGuessModels.c

@@ -46 +46 @@
     psAssert (detections, "missing detections?");
 
-    psArray *sources = detections->newSources;
+    psArray *sources = detections->allSources;
     psAssert (sources, "missing sources?");
 
@@ -160 +160 @@
         pmSource *source = sources->data[i];
 
+        // do not redo sources already guessed
+        if (source->tmpFlags & PM_SOURCE_TMPF_MODEL_GUESS) continue;
+
         // this is used to mark sources for which the model is measured. We check later that
         // all are used.

branches/eam_branches/ipp-20111122/psphot/src/psphotReadout.c

@@ -127 +127 @@
     // psphotLoadExtSources (config, view, filerule); // pass 1
 
-    // construct an initial model for each object, set the radius to fitRadius, set circular
-    // fit mask (detections->newSources)
-    psphotGuessModels (config, view, filerule); // pass 1
-
     // merge the newly selected sources into the existing list
     // NOTE: merge OLD and NEW
     psphotMergeSources (config, view, filerule);
+
+    // Construct an initial model for each object, set the radius to fitRadius, set circular
+    // fit mask.  NOTE: only applied to sources without guess models
+    psphotGuessModels (config, view, filerule); // pass 1
 
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
@@ -193 +193 @@
         }
 
-        // create full input models, set the radius to fitRadius, set circular fit mask
-        // NOTE: apply only to detections->newSources
-        psphotGuessModels (config, view, filerule); // pass 2 (detections->newSources)
-
         // replace all sources so fit below applies to all at once
         // NOTE: apply only to OLD sources (which have been subtracted)
@@ -205 +201 @@
         // XXX check on free of sources...
         psphotMergeSources (config, view, filerule); // (detections->newSources + detections->allSources -> detections->allSources)
+
+        // Construct an initial model for each object, set the radius to fitRadius, set circular
+        // fit mask.  NOTE: only applied to sources without guess models
+        psphotGuessModels (config, view, filerule); // pass 1
 
         // NOTE: apply to ALL sources
@@ -234 +234 @@
         }
 
-        // create full input models, set the radius to fitRadius, set circular fit mask
-        // NOTE: apply only to detections->newSources
-        psphotGuessModels (config, view, filerule); // pass 2 (detections->newSources)
-
         // replace all sources so fit below applies to all at once
         // NOTE: apply only to OLD sources (which have been subtracted)
@@ -247 +243 @@
         psphotMergeSources (config, view, filerule); // (detections->newSources + detections->allSources -> detections->allSources)
 
+        // Construct an initial model for each object, set the radius to fitRadius, set circular
+        // fit mask.  NOTE: only applied to sources without guess models
+        psphotGuessModels (config, view, filerule); // pass 1
+
         // NOTE: apply to ALL sources
         psphotFitSourcesLinear (config, view, filerule, true); // pass 3 (detections->allSources)

branches/eam_branches/ipp-20111122/psphot/src/psphotReadoutFindPSF.c

@@ -54 +54 @@
     }
 
+    // merge the newly selected sources into the existing list
+    // NOTE: merge OLD and NEW
+    psphotMergeSources (config, view, filerule); 
+
 # if 0
     // XXX if we want to determine the aperture residual correction here, we either
@@ -61 +65 @@
     psphotGuessModels (config, view, filerule);
 # endif
-
-    // merge the newly selected sources into the existing list
-    // NOTE: merge OLD and NEW
-    psphotMergeSources (config, view, filerule); 
 
 # if 0

branches/eam_branches/ipp-20111122/psphot/src/psphotReadoutForcedKnownSources.c

@@ -36 +36 @@
     }
 
-    // construct an initial model for each object
-    psphotGuessModels (config, view, filerule);
-
     // merge the newly selected sources into the existing list
     // NOTE: merge OLD and NEW
     psphotMergeSources (config, view, filerule); 
+
+    // Construct an initial model for each object, set the radius to fitRadius, set circular
+    // fit mask.  NOTE: only applied to sources without guess models
+    psphotGuessModels (config, view, filerule);
 
     // linear PSF fit to source peaks

branches/eam_branches/ipp-20111122/psphot/src/psphotReadoutKnownSources.c

@@ -48 +48 @@
     }
 
-    // construct an initial model for each object
-    psphotGuessModels (config, view, filerule);
-
     // merge the newly selected sources into the existing list
     // NOTE: merge OLD and NEW
     psphotMergeSources (config, view, filerule); 
+
+    // Construct an initial model for each object, set the radius to fitRadius, set circular
+    // fit mask.  NOTE: only applied to sources without guess models
+    psphotGuessModels (config, view, filerule);
 
     // linear PSF fit to source peaks

branches/eam_branches/ipp-20111122/psphot/src/psphotReadoutMinimal.c

@@ -59 +59 @@
     }
 
-    // construct an initial model for each object
-    psphotGuessModels (config, view, filerule);
-
     // merge the newly selected sources into the existing list
     psphotMergeSources (config, view, filerule);
+
+    // Construct an initial model for each object, set the radius to fitRadius, set circular
+    // fit mask.  NOTE: only applied to sources without guess models
+    psphotGuessModels (config, view, filerule);
 
     // linear PSF fit to source peaks

branches/eam_branches/ipp-20111122/psphot/src/psphotSourceMatch.c

@@ -261 +261 @@
             source->imageID = index;
             source->mode2 |= PM_SOURCE_MODE2_MATCHED; // source is generated based on another image
+            source->type = PM_SOURCE_TYPE_STAR; // until we know more, assume a PSF fit
 
             // add the peak

branches/eam_branches/ipp-20111122/psphot/src/psphotStackMatchPSFsNext.c

@@ -51 +51 @@
 
     bool status = false;
+
+    psTimerStart ("psphot.smooth");
 
     // find the currently selected readout

branches/eam_branches/ipp-20111122/psphot/src/psphotStackReadout.c

@@ -160 +160 @@
     }
 
-    // construct an initial model for each object, set the radius to fitRadius, set circular fit mask
-    psphotGuessModels (config, view, STACK_SRC);
-
     // merge the newly selected sources into the existing list
     // NOTE: merge OLD and NEW
     psphotMergeSources (config, view, STACK_SRC);
+
+    // Construct an initial model for each object, set the radius to fitRadius, set circular
+    // fit mask.  NOTE: only applied to sources without guess models
+    psphotGuessModels (config, view, STACK_SRC);
 
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
@@ -248 +249 @@
         }
 
-        // create full input models, set the radius to fitRadius, set circular fit mask
-        // NOTE: apply only to detections->newSources
-        psphotGuessModels (config, view, STACK_SRC); // pass 2 (detections->newSources)
-
         // replace all sources so fit below applies to all at once
         // NOTE: apply only to OLD sources (which have been subtracted)
@@ -260 +257 @@
         // XXX check on free of sources...
         psphotMergeSources (config, view, STACK_SRC); // (detections->newSources + detections->allSources -> detections->allSources)
+
+        // Construct an initial model for each object, set the radius to fitRadius, set circular
+        // fit mask.  NOTE: only applied to sources without guess models
+        psphotGuessModels (config, view, STACK_SRC);
     }
 
@@ -269 +270 @@
     objects = psphotMatchSources (config, view, STACK_SRC);
     psMemDump("matchsources");
+
+    // Construct an initial model for each object, set the radius to fitRadius, set circular
+    // fit mask.  NOTE: only applied to sources without guess models
+    psphotGuessModels (config, view, STACK_SRC);
 
     psphotStackObjectsUnifyPosition (objects);