Changeset 26793 for branches/eam_branches/20091201/psphot/src/psphotMergeSources.c

Timestamp:

Feb 5, 2010, 3:11:11 PM (16 years ago)

Author:

eugene

Message:

bug fixes to psphot APIs

File:

• branches/eam_branches/20091201/psphot/src/psphotMergeSources.c (modified) (11 diffs)

branches/eam_branches/20091201/psphot/src/psphotMergeSources.c

@@ -15 +15 @@
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
-        if (!psphotMergeSourcesReadout (config, view, "PSPHOT.INPUT", i)) {
+        if (!psphotMergeSourcesReadout (config, view, "PSPHOT.INPUT", i)) {
             psError (PSPHOT_ERR_CONFIG, false, "failed to merge sources for PSPHOT.INPUT entry %d", i);
-            return false;
-        }
+            return false;
+        }
     }
     return true;
@@ -43 +43 @@
     // XXX TEST:
     if (detections->allSources) {
-        psphotMaskCosmicRayFootprintCheck(detections->allSources);
+        psphotMaskCosmicRayFootprintCheck(detections->allSources);
     }
     if (detections->newSources) {
-        psphotMaskCosmicRayFootprintCheck(detections->newSources);
+        psphotMaskCosmicRayFootprintCheck(detections->newSources);
     }
 
     if (!detections->allSources) {
-        detections->allSources = psArrayAllocEmpty(newSources->n);
+        detections->allSources = psArrayAllocEmpty(newSources->n);
     }
     psArray *allSources = detections->allSources;
@@ -87 +87 @@
     psAssert (detections, "missing detections?");
 
-    // XXX allSources of newSources?
+    // XXX allSources or newSources?
     psArray *sources = detections->allSources;
     psAssert (sources, "missing sources?");
@@ -96 +96 @@
         if (!readoutCMF) goto loadTXT;
 
-        extCMF = psMetadataLookupPtr (NULL, readoutCMF->analysis, "PSPHOT.DETECTIONS");
-        if (extCMF) {
-            for (int i = 0; i < extCMF->allSources->n; i++) {
-                pmSource *source = extCMF->allSources->data[i];
-                source->mode |= PM_SOURCE_MODE_EXTERNAL;
+        extCMF = psMetadataLookupPtr (NULL, readoutCMF->analysis, "PSPHOT.DETECTIONS");
+        if (extCMF) {
+            for (int i = 0; i < extCMF->allSources->n; i++) {
+                pmSource *source = extCMF->allSources->data[i];
+                source->mode |= PM_SOURCE_MODE_EXTERNAL;
 
                 // the supplied peak flux needs to be re-normalized
@@ -106 +106 @@
                 source->peak->value = 1.0;
 
-                // drop the loaded source modelPSF
-                psFree (source->modelPSF);
-                source->modelPSF = NULL;
-
-                psArrayAdd (detections->allSources, 100, source);
-            }
-        }
+                // drop the loaded source modelPSF
+                psFree (source->modelPSF);
+                source->modelPSF = NULL;
+
+                psArrayAdd (detections->allSources, 100, source);
+            }
+        }
     }
 
@@ -128 +128 @@
                 source->mode |= PM_SOURCE_MODE_EXTERNAL;
 
-                // drop the loaded source modelPSF
-                psFree (source->modelPSF);
-                source->modelPSF = NULL;
-
-                psArrayAdd (detections->allSources, 100, source);
-            }
-        }
+                // drop the loaded source modelPSF
+                psFree (source->modelPSF);
+                source->modelPSF = NULL;
+
+                psArrayAdd (detections->allSources, 100, source);
+            }
+        }
     }
 
@@ -168 +168 @@
     if (!detections) {
         psLogMsg ("psphot", 3, "no psf sources for this readout");
-        return NULL;
+        return NULL;
     }
 
@@ -174 +174 @@
     if (!sources) {
         psLogMsg ("psphot", 3, "no psf sources for this readout");
-        return NULL;
+        return NULL;
     }
 
@@ -212 +212 @@
 
 // generate the detection structure for the supplied array of sources
-// XXX this currently assumes there is a single input file 
+// XXX this currently assumes there is a single input file
 bool psphotDetectionsFromSources (pmConfig *config, const pmFPAview *view, psArray *sources) {
 
@@ -274 +274 @@
     // save detections on the readout->analysis
     if (!psMetadataAddPtr (readout->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_META_REPLACE | PS_DATA_UNKNOWN, "psphot detectinos", detections)) {
-        psError (PSPHOT_ERR_CONFIG, false, "problem saving detections on readout");
-        return false;
+        psError (PSPHOT_ERR_CONFIG, false, "problem saving detections on readout");
+        return false;
     }
     psFree (detections);
@@ -343 +343 @@
 
     if (sources->n) {
-        // the user wants to make the psf from these stars; define them as psf stars:
-        for (int i = 0; i < sources->n; i++) {
-            pmSource *source = sources->data[i];
-            source->mode |= PM_SOURCE_MODE_PSFSTAR;
-        }
-        // force psphotChoosePSF to use all loaded sources
-        psMetadataAddS32 (recipe, PS_LIST_TAIL, "PSF_MAX_NSTARS", PS_META_REPLACE, "max number of sources for PSF model", sources->n);
-
-        // measure stats of externally specified sources
-        if (!psphotSourceStatsUpdate (sources, config, readout)) {
-            psError(PSPHOT_ERR_CONFIG, false, "failure to measure stats of existing sources");
-            return false;
-        }
+        // the user wants to make the psf from these stars; define them as psf stars:
+        for (int i = 0; i < sources->n; i++) {
+            pmSource *source = sources->data[i];
+            source->mode |= PM_SOURCE_MODE_PSFSTAR;
+        }
+        // force psphotChoosePSF to use all loaded sources
+        psMetadataAddS32 (recipe, PS_LIST_TAIL, "PSF_MAX_NSTARS", PS_META_REPLACE, "max number of sources for PSF model", sources->n);
+
+        // measure stats of externally specified sources
+        if (!psphotSourceStatsUpdate (sources, config, readout)) {
+            psError(PSPHOT_ERR_CONFIG, false, "failure to measure stats of existing sources");
+            return false;
+        }
     } else {
 
-        // find the detections (by peak and/or footprint) in the image.
-        if (!psphotFindDetections (config, view, true)) {
-            psError(PSPHOT_ERR_CONFIG, false, "unable to find detections in this image");
-            return psphotReadoutCleanup (config, view);
-        }
-
-        // construct sources and measure basic stats
-        psphotSourceStats (config, view, true);
-
-        // find blended neighbors of very saturated stars
-        psphotDeblendSatstars (config, view);
-
-        // mark blended peaks PS_SOURCE_BLEND
-        if (!psphotBasicDeblend (config, view)) {
-            psLogMsg ("psphot", 3, "failed on deblend analysis");
-            return psphotReadoutCleanup (config, view);
-        }
-
-        // classify sources based on moments, brightness
-        if (!psphotRoughClass (config, view)) {
-            psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
-            return psphotReadoutCleanup (config, view);
-        }
-    }
-
-    return true;
-}
+        // find the detections (by peak and/or footprint) in the image.
+        if (!psphotFindDetections (config, view, true)) {
+            psError(PSPHOT_ERR_CONFIG, false, "unable to find detections in this image");
+            return psphotReadoutCleanup (config, view);
+        }
+
+        // construct sources and measure basic stats
+        psphotSourceStats (config, view, true);
+
+        // find blended neighbors of very saturated stars
+        psphotDeblendSatstars (config, view);
+
+        // mark blended peaks PS_SOURCE_BLEND
+        if (!psphotBasicDeblend (config, view)) {
+            psLogMsg ("psphot", 3, "failed on deblend analysis");
+            return psphotReadoutCleanup (config, view);
+        }
+
+        // classify sources based on moments, brightness
+        if (!psphotRoughClass (config, view)) {
+            psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
+            return psphotReadoutCleanup (config, view);
+        }
+    }
+
+    return true;
+}