Changeset 26259 for trunk/psastro/src/psastroOneChipGrid.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/psastroOneChipGrid.c (modified) (3 diffs)

trunk/psastro/src/psastroOneChipGrid.c

@@ -31 +31 @@
 
     // generate the bright subset of maxNstar entries (note: rawstars is sorted by S/N)
-    psArray *subset = psArrayAlloc (PS_MIN (maxNstar, rawstars->n));
+    psArray *gridStars = psArrayAlloc (PS_MIN (maxNstar, rawstars->n));
     for (int i = 0; (i < maxNstar) && (i < rawstars->n); i++) {
-        subset->data[i] = psMemIncrRefCounter (rawstars->data[i]);
+        gridStars->data[i] = psMemIncrRefCounter (rawstars->data[i]);
     }
 
-    // XXX set clump scale from recipe
-    psArray *gridStars = psastroRemoveClumps (subset, 150);
-    psFree (subset);
-
-    psArray *refSubset = psastroRemoveClumps (refstars, 150);
-
-    psLogMsg ("psastro", 3, "grid search using %ld raw vs %ld ref stars\n", gridStars->n, refSubset->n);
+    psLogMsg ("psastro", 3, "grid search using %ld raw vs %ld ref stars\n", gridStars->n, refstars->n);
 
     // find initial offset / rotation / scale
-    pmAstromStats *gridStats = pmAstromGridMatch (gridStars, refSubset, recipe);
+    pmAstromStats *gridStats = pmAstromGridMatch (gridStars, refstars, recipe);
     if (gridStats == NULL) {
         psLogMsg ("psastro", 3, "failed to find a grid match solution\n");
         psFree (gridStars);
-        psFree (refSubset);
         return false;
     }
@@ -55 +48 @@
 
     // tweak the position by finding peak of matches stars
-    stats = pmAstromGridTweak (gridStars, refSubset, recipe, gridStats);
+    stats = pmAstromGridTweak (gridStars, refstars, recipe, gridStats);
     if (stats == NULL) {
         psLogMsg ("psastro", 3, "failed to measure tweaked grid solution\n");
         psFree (gridStats);
         psFree (gridStars);
-        psFree (refSubset);
         return false;
     }
@@ -67 +59 @@
     // adjust the chip.toFPA terms only
     pmAstromGridApply (chip->toFPA, stats);
-    psastroUpdateChipToFPA (fpa, chip, rawstars, refstars);
+    psastroUpdateChipToFPA (fpa, chip); // updates PSASTRO.RAWSTARS and PSASTRO.REFSTARS
     psFree (gridStats);
     psFree (gridStars);
-    psFree (refSubset);
     psFree (stats);