Changeset 26168 for branches/eam_branches/20091113

Timestamp:

Nov 17, 2009, 7:59:58 AM (17 years ago)

Author:

eugene

Message:

adding uniq refstar match

Location:

branches/eam_branches/20091113

Files:

• ippconfig/gpc1/psastro.config (modified) (1 diff)
• ippconfig/recipes/psastro.config (modified) (1 diff)
• psastro/src/psastroOneChipFit.c (modified) (3 diffs)

branches/eam_branches/20091113/ippconfig/gpc1/psastro.config

@@ -52 +52 @@
 PSASTRO.MATCH.RADIUS.N7 F32     5
 PSASTRO.MATCH.FIT.NITER S32     8
+
+# for iterations >= N, require a single match per reference
+PSASTRO.MATCH.UNIQ.ITER S32     4 
 
 # XXX Test for taurus

branches/eam_branches/20091113/ippconfig/recipes/psastro.config

@@ -64 +64 @@
 PSASTRO.MATCH.FIT.NITER S32   1
 
+# for iterations >= N, require a single match per reference
+PSASTRO.MATCH.UNIQ.ITER S32     4 
+
 # pmAstromMatchFit
 PSASTRO.CHIP.ORDER     S32      1  # fit order

branches/eam_branches/20091113/psastro/src/psastroOneChipFit.c

@@ -28 +28 @@
     REQUIRED_RECIPE_VALUE (int nIter, "PSASTRO.MATCH.FIT.NITER", S32);
 
+    // for iterations >= uniqIter, require a single match per reference
+    REQUIRED_RECIPE_VALUE (int uniqIter, "PSASTRO.MATCH.UNIQ.ITER", S32);
+
     // correct radius to FP units (physical pixel scale in microns per pixel)
     REQUIRED_RECIPE_VALUE (double pixelScale, "PSASTRO.PIXEL.SCALE", F32);
@@ -61 +64 @@
             return false;
         }
+
+        if (iter >= uniqIter) {
+          if (!pmAstromRadiusMatchUniq (rawstars, refstars, match)) {
+            psLogMsg ("psastro", 3, "failed to generate a uniq find radius-matched sources\n");
+            return false;
+          }
+        }
 
         // modify the order to correspond to the actual number of matched stars:
@@ -101 +111 @@
         }
 
-        // XXX allow statitic to be set by the user
+        // XXX allow statistic to be set by the user
         // fitStats = psStatsAlloc (PS_STAT_CLIPPED_MEAN | PS_STAT_CLIPPED_STDEV);
         fitStats = psStatsAlloc (PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV);