Changeset 30749

Timestamp:

Feb 24, 2011, 9:04:26 AM (15 years ago)

Author:

eugene

Message:

add macro to get internal vs I/O readout; add feature to mask objects in the background model and re-run model (disabled for now); add optional 3rd pass to psphotReadout for extended sources (disabled for now)

Location:

branches/eam_branches/ipp-20110213/psphot/src

Files:

• Makefile.am (modified) (1 diff)
• psphot.h (modified) (2 diffs)
• psphotMaskBackground.c (added)
• psphotModelBackground.c (modified) (2 diffs)
• psphotOutput.c (modified) (1 diff)
• psphotReadout.c (modified) (2 diffs)
• psphotSubtractBackground.c (modified) (2 diffs)
• psphotVisual.c (modified) (2 diffs)

branches/eam_branches/ipp-20110213/psphot/src/Makefile.am

@@ -129 +129 @@
         psphotReadoutMinimal.c         \
         psphotModelBackground.c        \
+        psphotMaskBackground.c         \
         psphotSubtractBackground.c     \
         psphotFindDetections.c         \

branches/eam_branches/ipp-20110213/psphot/src/psphot.h

@@ -12 +12 @@
 
 #define PSPHOT_RECIPE_PSF_FAKE_ALLOW "PSF.FAKE.ALLOW" // Name for recipe component permitting fake PSFs
+
+# define READOUT_OR_INTERNAL(VIEW,FILE)((FILE)->mode == PM_FPA_MODE_INTERNAL) ? (FILE)->readout : pmFPAviewThisReadout((VIEW), (FILE)->fpa)
 
 // top-level psphot functions
@@ -52 +54 @@
 bool            psphotModelBackground (pmConfig *config, const pmFPAview *view, const char *filerule);
 bool            psphotModelBackgroundReadoutFileIndex (pmConfig *config, const pmFPAview *view, const char *filerule, int index);
+
+bool            psphotMaskBackground (pmConfig *config, const pmFPAview *view, const char *filerule);
+bool            psphotMaskBackgroundReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe);
 
 bool            psphotSubtractBackground (pmConfig *config, const pmFPAview *view, const char *filerule);

branches/eam_branches/ipp-20110213/psphot/src/psphotModelBackground.c

@@ -58 +58 @@
     psImageMaskType maskVal = psMetadataLookupImageMask(&status, recipe, "MASK.PSPHOT"); // Mask value for bad pixels
     assert (maskVal);
+
+    // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
+    psImageMaskType markVal = psMetadataLookupImageMask(&status, recipe, "MARK.PSPHOT"); // Mask value for bad pixels
+    assert (markVal);
+
+    // apply both MASK and MARK to make background model
+    maskVal |= markVal;
 
     psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS);
@@ -308 +315 @@
     }
 
+    if (psTraceGetLevel("psphot") > 5) {
+        char name[256];
+        sprintf (name, "backfill.%02d.fits", npass);
+        psphotSaveImage (NULL, model, name);
+        sprintf (name, "backfist.%02d.fits", npass);
+        psphotSaveImage (NULL, modelStdev, name);
+    }
+
     psLogMsg ("psphot", PS_LOG_INFO, "built background image: %f sec\n", psTimerMark ("psphot.background"));
 

branches/eam_branches/ipp-20110213/psphot/src/psphotOutput.c

@@ -29 +29 @@
 }
 
-pmReadout *psphotSelectBackground (pmConfig *config,
-                                   const pmFPAview *view) {
+pmReadout *psphotSelectBackground (pmConfig *config, const pmFPAview *view) {
 
     bool status;
-    pmReadout *background;
+    
 
     pmFPAfile *file = psMetadataLookupPtr (&status, config->files, "PSPHOT.BACKMDL");
     if (!file) return NULL;
-    if (file->mode == PM_FPA_MODE_INTERNAL) {
-        background = file->readout;
-    } else {
-        background = pmFPAviewThisReadout (view, file->fpa);
-    }
+
+    pmReadout *background = READOUT_OR_INTERNAL(view, file);
     return background;
 }
 
-pmReadout *psphotSelectBackgroundStdev (pmConfig *config,
-                                        const pmFPAview *view) {
+pmReadout *psphotSelectBackgroundStdev (pmConfig *config, const pmFPAview *view) {
 
     bool status;
-    pmReadout *background;
 
     pmFPAfile *file = psMetadataLookupPtr (&status, config->files, "PSPHOT.BACKMDL.STDEV");
     if (!file) return NULL;
-    if (file->mode == PM_FPA_MODE_INTERNAL) {
-        background = file->readout;
-    } else {
-        background = pmFPAviewThisReadout (view, file->fpa);
-    }
+
+    pmReadout *background = READOUT_OR_INTERNAL(view, file);
     return background;
 }

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

@@ -52 +52 @@
     }
 
+# if (0)
+    // XXX test to mask outliers, not very helpful
+    // mask the high values in the image (with MARK)
+    if (!psphotMaskBackground (config, view, filerule)) {
+        return psphotReadoutCleanup (config, view, filerule);
+    }
+
+    // generate a background model (median, smoothed image)
+    if (!psphotModelBackground (config, view, filerule)) {
+        return psphotReadoutCleanup (config, view, filerule);
+    }
+# endif
+
     if (!psphotSubtractBackground (config, view, filerule)) {
         return psphotReadoutCleanup (config, view, filerule);
@@ -157 +170 @@
     // NOTE: possibly re-measure background model here with objects subtracted / or masked
 
-    // add noise for subtracted objects
-    psphotAddNoise (config, view, filerule); // pass 1 (detections->allSources)
-
-    // find fainter sources
-    // NOTE: finds new peaks and new footprints, OLD and FULL set are saved on detections
-    psphotFindDetections (config, view, filerule, false); // pass 2 (detections->peaks, detections->footprints)
-
-    // remove noise for subtracted objects (ie, return to normal noise level)
-    // NOTE: this needs to operate only on the OLD sources
-    psphotSubNoise (config, view, filerule); // pass 1 (detections->allSources)
-
-    // define new sources based on only the new peaks
-    // NOTE: new sources are saved on detections->newSources
-    psphotSourceStats (config, view, filerule, false); // pass 2 (detections->newSources)
-
-    // set source type
-    // NOTE: apply only to detections->newSources
-    if (!psphotRoughClass (config, view, filerule)) { // pass 2 (detections->newSources)
-        psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
-        return psphotReadoutCleanup (config, view, filerule);
-    }
-
-    // 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)
-    psphotReplaceAllSources (config, view, filerule); // pass 2
-
-    // merge the newly selected sources into the existing list
-    // NOTE: merge OLD and NEW
-    // XXX check on free of sources...
-    psphotMergeSources (config, view, filerule); // (detections->newSources + detections->allSources -> detections->allSources)
-
-    // NOTE: apply to ALL sources
-    psphotFitSourcesLinear (config, view, filerule, true); // pass 3 (detections->allSources)
+    // NOTE: this block performs the 2nd pass low-significance PSF detection stage
+    { 
+        // add noise for subtracted objects
+        psphotAddNoise (config, view, filerule); // pass 1 (detections->allSources)
+
+        // find fainter sources
+        // NOTE: finds new peaks and new footprints, OLD and FULL set are saved on detections
+        psphotFindDetections (config, view, filerule, false); // pass 2 (detections->peaks, detections->footprints)
+
+        // remove noise for subtracted objects (ie, return to normal noise level)
+        // NOTE: this needs to operate only on the OLD sources
+        psphotSubNoise (config, view, filerule); // pass 1 (detections->allSources)
+
+        // define new sources based on only the new peaks
+        // NOTE: new sources are saved on detections->newSources
+        psphotSourceStats (config, view, filerule, false); // pass 2 (detections->newSources)
+
+        // set source type
+        // NOTE: apply only to detections->newSources
+        if (!psphotRoughClass (config, view, filerule)) { // pass 2 (detections->newSources)
+            psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
+            return psphotReadoutCleanup (config, view, filerule);
+        }
+
+        // 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)
+        psphotReplaceAllSources (config, view, filerule); // pass 2
+
+        // merge the newly selected sources into the existing list
+        // NOTE: merge OLD and NEW
+        // XXX check on free of sources...
+        psphotMergeSources (config, view, filerule); // (detections->newSources + detections->allSources -> detections->allSources)
+
+        // NOTE: apply to ALL sources
+        psphotFitSourcesLinear (config, view, filerule, true); // pass 3 (detections->allSources)
+    }
+
+    // NOTE: this block performs the 2nd pass low-significance EXT detection stage (smooth or rebin by NxN times PSF size)
+    if (0) { 
+        // add noise for subtracted objects
+        psphotAddNoise (config, view, filerule); // pass 1 (detections->allSources)
+
+        // find fainter sources
+        // NOTE: finds new peaks and new footprints, OLD and FULL set are saved on detections
+        psphotFindDetections (config, view, filerule, false); // pass 2 (detections->peaks, detections->footprints)
+
+        // remove noise for subtracted objects (ie, return to normal noise level)
+        // NOTE: this needs to operate only on the OLD sources
+        psphotSubNoise (config, view, filerule); // pass 1 (detections->allSources)
+
+        // define new sources based on only the new peaks
+        // NOTE: new sources are saved on detections->newSources
+        psphotSourceStats (config, view, filerule, false); // pass 2 (detections->newSources)
+
+        // set source type
+        // NOTE: apply only to detections->newSources
+        if (!psphotRoughClass (config, view, filerule)) { // pass 2 (detections->newSources)
+            psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
+            return psphotReadoutCleanup (config, view, filerule);
+        }
+
+        // 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)
+        psphotReplaceAllSources (config, view, filerule); // pass 2
+
+        // merge the newly selected sources into the existing list
+        // NOTE: merge OLD and NEW
+        // XXX check on free of sources...
+        psphotMergeSources (config, view, filerule); // (detections->newSources + detections->allSources -> detections->allSources)
+
+        // NOTE: apply to ALL sources
+        psphotFitSourcesLinear (config, view, filerule, true); // pass 3 (detections->allSources)
+    }
 
 pass1finish:

branches/eam_branches/ipp-20110213/psphot/src/psphotSubtractBackground.c

@@ -24 +24 @@
     assert (modelFile);
 
-    pmReadout *model = NULL;
-    if (modelFile->mode == PM_FPA_MODE_INTERNAL) {
-        model = modelFile->readout;
-    } else {
-        model = pmFPAviewThisReadout (view, modelFile->fpa);
-    }
+    pmReadout *model = READOUT_OR_INTERNAL(view, modelFile);
     assert (model);
 
@@ -44 +39 @@
     if (file) {
         // we are using PSPHOT.BACKGND as an I/O file: select readout or create
-        if (file->mode == PM_FPA_MODE_INTERNAL) {
-            background = file->readout;
-        } else {
-            background = pmFPAviewThisReadout (view, file->fpa);
-        }
+        background = READOUT_OR_INTERNAL(view, file);
         if (background == NULL) {
             // readout does not yet exist: create from input

branches/eam_branches/ipp-20110213/psphot/src/psphotVisual.c

@@ -293 +293 @@
 bool psphotVisualShowBackground (pmConfig *config, const pmFPAview *view, pmReadout *readout) {
 
-    pmReadout *backgnd;
-
     if (!pmVisualTestLevel("psphot.image.backgnd", 2)) return true;
 
@@ -303 +301 @@
     pmFPAfile *file = psMetadataLookupPtr (&status, config->files, "PSPHOT.BACKGND");
 
-    if (file->mode == PM_FPA_MODE_INTERNAL) {
-        backgnd = file->readout;
-    } else {
-        backgnd = pmFPAviewThisReadout (view, file->fpa);
-    }
+    pmReadout *backgnd = READOUT_OR_INTERNAL(view, file);
 
     psphotVisualScaleImage (kapa, backgnd->image, readout->mask, "backgnd", 2);