Changeset 17339

Timestamp:

Apr 6, 2008, 10:14:40 AM (18 years ago)

Author:

eugene

Message:

split ExtendedSources into ExtendedSourceAnalysis and ExtendedSourceFits

File:

• branches/eam_branch_20080324/psphot/src/psphotReadout.c (modified) (4 diffs)

branches/eam_branch_20080324/psphot/src/psphotReadout.c

@@ -117 +117 @@
     psphotFitSourcesLinear (readout, sources, recipe, psf, FALSE);
 
-    // XXX test the CR/EXT measurement
-    // XXX we need to call this here and after the second pass: option for starting number?
+    // identify CRs and extended sources
     psphotSourceSize (readout, sources, recipe, 0);
     if (!strcasecmp (breakPt, "ENSEMBLE")) {
@@ -127 +126 @@
     psphotBlendFit (readout, sources, recipe, psf);
 
-    // replace all sources (make this part of psphotFitSourcesLinear?)
+    // replace all sources
     psphotReplaceAll (sources, recipe);
 
     // linear fit to include all sources
     psphotFitSourcesLinear (readout, sources, recipe, psf, TRUE);
+
+    // if we only do one pass, skip to extended source analysis
     if (!strcasecmp (breakPt, "PASS1")) {
-        goto finish;
+        goto pass1finish;
     }
 
@@ -145 +146 @@
     psphotAddNoise (readout, sources, recipe);
 
+    // find fainter sources (pass 2)
     detections = psphotFindDetections (detections, readout, recipe);
 
-    // remove noise for subtracted objects
+    // remove noise for subtracted objects (ie, return to normal noise level)
     psphotSubNoise (readout, sources, recipe);
 
@@ -172 +174 @@
     psphotFitSourcesLinear (readout, sources, recipe, psf, TRUE);
 
+pass1finish:
+
     // measure source size for the remaining sources
     psphotSourceSize (readout, sources, recipe, 0);
 
-    psphotExtendedSources (readout, sources, recipe);
+    psphotExtendedSourceAnalysis (readout, sources, recipe);
+
+    psphotSaveImage (NULL, readout->image, "image.x0.fits");
+
+    psphotExtendedSourceFits (readout, sources, recipe);
 
 finish: