Changeset 26259 for trunk/psastro/src/psastroMosaicSetMatch.c

Timestamp:

Nov 22, 2009, 2:57:41 PM (16 years ago)

Author:

eugene

Message:

various fixes to psastro:

1) added bootstrap resampling to zero point error analysis
2) added iterative clump removal from refstars and rawstars
3) added unique reference match option
4) some improved visualizations
5) improved mosaic iterations

File:

• trunk/psastro/src/psastroMosaicSetMatch.c (modified) (3 diffs)

trunk/psastro/src/psastroMosaicSetMatch.c

@@ -26 +26 @@
     double RADIUS = psMetadataLookupF32 (&status, recipe, radiusWord);
     if (!status) {
-        psError(PS_ERR_IO, false, "Failed to lookup matching radius: %s", radiusWord);
-        psFree (view);
-        return false;
+        psAbort("Failed to lookup matching radius: %s", radiusWord);
+    }
+
+    int uniqIter = psMetadataLookupS32 (&status, recipe, "PSASTRO.MOSAIC.UNIQ.ITER");
+    if (!status) {
+        psAbort("Failed to lookup matching PSASTRO.MOSAIC.UNIQ.ITER");
     }
 
@@ -58 +61 @@
 
                 // select the raw objects for this readout
-                psArray *rawstars = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.RAWSTARS");
+                psArray *rawstars = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.RAWSTARS.SUBSET");
                 if (rawstars == NULL) { continue; }
 
                 // select the raw objects for this readout
-                psArray *refstars = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.REFSTARS");
+                psArray *refstars = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.REFSTARS.SUBSET");
                 if (refstars == NULL) { continue; }
                 psTrace ("psastro", 4, "Trying %ld refstars\n", refstars->n);
@@ -68 +71 @@
                 psArray *matches = pmAstromRadiusMatchChip (rawstars, refstars, RADIUS);
                 psTrace ("psastro", 4, "Matched %ld refstars\n", matches->n);
+
+                if (iteration >= uniqIter) {
+                    psArray *unique = pmAstromRadiusMatchUniq (rawstars, refstars, matches);
+                    if (!unique) {
+                        psLogMsg ("psastro", 3, "failed to generate a uniq set of matched sources\n");
+                        return false;
+                    }
+                    psFree (matches);
+                    matches = unique;
+                }
 
                 pmAstromVisualPlotMosaicMatches(rawstars, refstars, matches, iteration, recipe);