Changeset 34247 for branches/eam_branches/ipp-20120627/psphot/src/psphotStackReadout.c

Timestamp:

Jul 31, 2012, 11:50:18 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotStackReadout.c (modified) (11 diffs)

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

@@ -1 +1 @@
 # include "psphotInternal.h"
+
+static bool psphotStackLoadWCS(pmConfig *config, const pmFPAview *view, const char *filerule);
 
 // we have 3 possible real filesets:
@@ -67 +69 @@
     char *STACK_SRC = useRaw ? STACK_RAW : STACK_CNV;
     char *STACK_DET = STACK_RAW;
+
+    // load WCS 
+    if (!psphotStackLoadWCS(config, view, STACK_SRC)) {
+        psError (PSPHOT_ERR_CONFIG, false, "trouble loading WCS for %s", STACK_SRC);
+        return false;
+    }
 
     // set the photcode for each image
@@ -179 +187 @@
 
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
-    psphotFitSourcesLinear (config, view, STACK_SRC, false);
+    psphotFitSourcesLinear (config, view, STACK_SRC, false, false);
     psphotStackVisualFilerule(config, view, STACK_SRC);
 
@@ -207 +215 @@
     // NOTE : apply to ALL sources (extended + psf)
     // NOTE 2 : this function subtracts the models from the given filerule (SRC), not DET
-    psphotFitSourcesLinear (config, view, STACK_SRC, true); // pass 2 (detections->allSources)
+    psphotFitSourcesLinear (config, view, STACK_SRC, true, false); // pass 2 (detections->allSources)
 
     // NOTE: possibly re-measure background model here with objects subtracted / or masked
@@ -278 +286 @@
     }
 
+    // gcc doesn't like the label to refer to a declaration so we declare this here
+    bool splitLinearFit;
+
 pass1finish:
+
+    splitLinearFit = psMetadataLookupBool(NULL, recipe, "PSPHOT.STACK.SPLIT.LINEAR.FIT");
+    if (splitLinearFit) {
+        psLogMsg ("psphot", 3, "splitting fit of detected and matched soures\n");
+        // Fit the detected sources separately from matched that wea are about to create.
+        // NOTE: apply to ALL sources but only include sources with postitive flux in the fit
+        psphotFitSourcesLinear (config, view, STACK_SRC, true, true); // pass 3 (detections->allSources)
+    }
 
     // generate the objects (objects unify the sources from the different images) NOTE: could
@@ -286 +305 @@
     psMemDump("matchsources");
 
+    // check the source density. If it too high change the number of radial bins
+    // in the recipe.
+    psphotLimitRadialApertures(recipe, objects->n);
+
     // Construct an initial model for each object, set the radius to fitRadius, set circular
     // fit mask.  NOTE: only applied to sources without guess models
@@ -294 +317 @@
     psphotStackObjectsSelectForAnalysis (config, view, STACK_SRC, objects);
 
-    // NOTE: apply to ALL sources
-    psphotFitSourcesLinear (config, view, STACK_SRC, true); // pass 3 (detections->allSources)
+    if (splitLinearFit) {
+        // NOTE: apply to Matched sources. Since the sources that we fit above are subtracted, they will
+        // not be included in this fit.
+        psphotFitSourcesLinear (config, view, STACK_SRC, true, false); // pass 4 (detections->allSources)
+    } else {
+        // Fit all sources together
+        psphotFitSourcesLinear (config, view, STACK_SRC, true, false); // pass 3 (detections->allSources)
+    }
 
     // measure the radial profiles to the sky (only measures new objects)
@@ -344 +373 @@
             }
         }
-        psphotRadialApertures (config, view, STACK_CNV, 0); // XXX entry 0 == unmatched?
+        psphotRadialApertures (config, view, STACK_CNV, 0); // entry 0 == unmatched
         psMemDump("extmeas");
 
+        // mark any inputs that we want to skip the matched apertures for
+        psphotStackSetInputsToSkip(config, view, STACK_OUT, true);
+
         int nRadialEntries = psphotStackMatchPSFsEntries(config, view, STACK_OUT);
-
         for (int entry = 1; entry < nRadialEntries; entry++) {
             // NOTE: entry 0 is the unmatched image set
@@ -359 +390 @@
 
             // this is necessary to get the right normalization for the new models
-            psphotFitSourcesLinear (config, view, STACK_OUT, false);
+            psphotFitSourcesLinear (config, view, STACK_OUT, false, false);
 
             // measure circular, radial apertures (objects sorted by S/N)
-            // entry 0 == unmatched? pass entry + 1?
             psphotRadialApertures (config, view, STACK_OUT, entry); 
 
@@ -373 +403 @@
         }
     }
+    psphotStackSetInputsToSkip(config, view, STACK_OUT, false);
 
     // measure aperture photometry corrections
@@ -413 +444 @@
     // create the exported-metadata and free local data
     return psphotReadoutCleanup (config, view, STACK_SRC);
+}
+
+static bool psphotStackLoadWCS(pmConfig *config, const pmFPAview *view, const char *filerule) {
+
+    int num = psphotFileruleCount(config, filerule);
+
+    for (int i=0; i<num; i++) {
+        pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, i); // File of interest
+        psAssert (file, "missing file?");
+    
+        pmReadout *readout = pmFPAviewThisReadout(view, file->fpa);
+        psAssert (readout, "missing readout?");
+
+        pmHDU *hdu = pmHDUFromReadout(readout);
+        psAssert (hdu, "input missing hdu?");
+
+        if (!pmAstromReadWCS(file->fpa, readout->parent->parent, hdu->header, 1.0)) {
+            psError (PSPHOT_ERR_UNKNOWN, false, "failed to read WCS from header for input %d", i);
+            return false;
+        }
+    }
+    return true;
 }