Changeset 20803

Timestamp:

Nov 19, 2008, 3:27:03 PM (17 years ago)

Author:

eugene

Message:

import visualizations; increase number of stars needed

File:

• trunk/psastro/src/psastroMosaicOneChip.c (modified) (9 diffs)

trunk/psastro/src/psastroMosaicOneChip.c

@@ -5 +5 @@
   if (!status) { \
    psError(PSASTRO_ERR_CONFIG, false, MESSAGE); \
-   return false; } 
+   return false; }
 
 bool psastroMosaicOneChip (pmChip *chip, pmReadout *readout, psMetadata *recipe, psMetadata *updates, int iteration) {
@@ -29 +29 @@
 
     // correct radius to FP units (physical pixel scale in microns per pixel)
-    REQUIRED_RECIPE_VALUE (double pixelScale, "PSASTRO.PIXEL.SCALE", F32, "Failed to lookup pixel scale"); 
+    REQUIRED_RECIPE_VALUE (double pixelScale, "PSASTRO.PIXEL.SCALE", F32, "Failed to lookup pixel scale");
 
     // allowed limits for valid solutions
@@ -42 +42 @@
     int order = psMetadataLookupS32 (&status, recipe, orderWord);
     if (!status || (order == -1)) {
-        order = defaultOrder;
+        order = defaultOrder;
     }
 
     // modify the order to correspond to the actual number of matched stars:
-    if ((match->n < 15) && (order >= 3)) order = 2;
-    if ((match->n < 11) && (order >= 2)) order = 1;
-    if ((match->n <  8) && (order >= 1)) order = 0;
+    if ((match->n < 17) && (order >= 3)) order = 2;
+    if ((match->n < 13) && (order >= 2)) order = 1;
+    if ((match->n <  9) && (order >= 1)) order = 0;
     if ((match->n <  3) || (order < 0) || (order > 3)) {
-        psLogMsg ("psastro", 3, "insufficient stars (%ld) or invalid order (%d)", match->n, order); 
-        return false; 
-    } 
+        psLogMsg ("psastro", 3, "insufficient stars (%ld) or invalid order (%d)", match->n, order);
+        return false;
+    }
 
     psLogMsg ("psastro", PS_LOG_DETAIL, "mosaic fit chip order %d", order);
@@ -60 +60 @@
     // coefficients frozen to the current values
     if (order == 0) {
-        // set FIT mask for all higher order terms of the existing solution
-        // any existing SET masks will be retained.
-        for (int i = 0; i <= chip->toFPA->x->nX; i++) {
-            for (int j = 0; j <= chip->toFPA->x->nY; j++) {
-                if (i + j > 0) {
-                    chip->toFPA->x->coeffMask[i][j] |= PS_POLY_MASK_FIT;
-                    chip->toFPA->y->coeffMask[i][j] |= PS_POLY_MASK_FIT;
-                }
-            }
-        }
+        // set FIT mask for all higher order terms of the existing solution
+        // any existing SET masks will be retained.
+        for (int i = 0; i <= chip->toFPA->x->nX; i++) {
+            for (int j = 0; j <= chip->toFPA->x->nY; j++) {
+                if (i + j > 0) {
+                    chip->toFPA->x->coeffMask[i][j] |= PS_POLY_MASK_FIT;
+                    chip->toFPA->y->coeffMask[i][j] |= PS_POLY_MASK_FIT;
+                }
+            }
+        }
     } else {
-        psFree (chip->toFPA);
-        chip->toFPA = psPlaneTransformAlloc (order, order);
-        for (int i = 0; i <= chip->toFPA->x->nX; i++) {
-            for (int j = 0; j <= chip->toFPA->x->nY; j++) {
-                if (i + j > order) {
-                    chip->toFPA->x->coeffMask[i][j] = PS_POLY_MASK_SET;
-                    chip->toFPA->y->coeffMask[i][j] = PS_POLY_MASK_SET;
-                }
-            }
-        }
+        psFree (chip->toFPA);
+        chip->toFPA = psPlaneTransformAlloc (order, order);
+        for (int i = 0; i <= chip->toFPA->x->nX; i++) {
+            for (int j = 0; j <= chip->toFPA->x->nY; j++) {
+                if (i + j > order) {
+                    chip->toFPA->x->coeffMask[i][j] = PS_POLY_MASK_SET;
+                    chip->toFPA->y->coeffMask[i][j] = PS_POLY_MASK_SET;
+                }
+            }
+        }
     }
 
@@ -87 +87 @@
     psStats *fitStats = NULL;
 //    if (order == 0) {
-//      fitStats = psStatsAlloc (PS_STAT_CLIPPED_MEAN | PS_STAT_CLIPPED_STDEV);
-//      fitStats->clipSigma = psMetadataLookupF32 (&status, recipe, "PSASTRO.MOSAIC.CHIP.NSIGMA");
-//      fitStats->clipIter = psMetadataLookupS32 (&status, recipe, "PSASTRO.MOSAIC.CHIP.NITER");
+//      fitStats = psStatsAlloc (PS_STAT_CLIPPED_MEAN | PS_STAT_CLIPPED_STDEV);
+//      fitStats->clipSigma = psMetadataLookupF32 (&status, recipe, "PSASTRO.MOSAIC.CHIP.NSIGMA");
+//      fitStats->clipIter = psMetadataLookupS32 (&status, recipe, "PSASTRO.MOSAIC.CHIP.NITER");
 //    } else {
-        fitStats = psStatsAlloc (PS_STAT_CLIPPED_MEAN | PS_STAT_CLIPPED_STDEV);
-        fitStats->clipSigma = psMetadataLookupF32 (&status, recipe, "PSASTRO.MOSAIC.CHIP.NSIGMA");
-        fitStats->clipIter = psMetadataLookupS32 (&status, recipe, "PSASTRO.MOSAIC.CHIP.NITER");
+        fitStats = psStatsAlloc (PS_STAT_CLIPPED_MEAN | PS_STAT_CLIPPED_STDEV);
+        fitStats->clipSigma = psMetadataLookupF32 (&status, recipe, "PSASTRO.MOSAIC.CHIP.NSIGMA");
+        fitStats->clipIter = psMetadataLookupS32 (&status, recipe, "PSASTRO.MOSAIC.CHIP.NITER");
 //    }
 
@@ -99 +99 @@
     pmAstromFitResults *results = pmAstromMatchFit (chip->toFPA, rawstars, refstars, match, fitStats);
     if (!results) {
-        psError(PSASTRO_ERR_DATA, false, "failed to perform the matched fit\n");
-        return false;
+        psError(PSASTRO_ERR_DATA, false, "failed to perform the matched fit\n");
+        return false;
     }
 
@@ -124 +124 @@
     psLogMsg ("psastro", PS_LOG_INFO, "astrometry solution: error: %f arcsec, Nstars: %d", astError, astNstar);
     if ((maxError > 0) && (astError > maxError)) {
-        psLogMsg("psastro", PS_LOG_INFO, "residual error is too large, failed to find a solution: %f > %f", astError, maxError);
-        validSolution = false;
+        psLogMsg("psastro", PS_LOG_INFO, "residual error is too large, failed to find a solution: %f > %f", astError, maxError);
+        validSolution = false;
     }
     if (astNstar < minNstar) {
-        psLogMsg("psastro", PS_LOG_INFO, "solution uses too few stars: %d < %d", astNstar, minNstar);
-        validSolution = false;
+        psLogMsg("psastro", PS_LOG_INFO, "solution uses too few stars: %d < %d", astNstar, minNstar);
+        validSolution = false;
     }
 
@@ -136 +136 @@
     psMetadataAddF32 (updates, PS_LIST_TAIL, "CERROR",   PS_META_REPLACE, "astrometry error (arcsec)", astError);
     if (validSolution) {
-        psMetadataAddF32 (updates, PS_LIST_TAIL, "CPRECISE", PS_META_REPLACE, "astrometry precision (arcsec)", astError/sqrt(astNstar));
-        psMetadataAddS32 (updates, PS_LIST_TAIL, "NASTRO",   PS_META_REPLACE, "number of astrometry stars", astNstar);
+        psMetadataAddF32 (updates, PS_LIST_TAIL, "CPRECISE", PS_META_REPLACE, "astrometry precision (arcsec)", astError/sqrt(astNstar));
+        psMetadataAddS32 (updates, PS_LIST_TAIL, "NASTRO",   PS_META_REPLACE, "number of astrometry stars", astNstar);
     } else {
-        psMetadataAddF32 (updates, PS_LIST_TAIL, "CPRECISE", PS_META_REPLACE, "astrometry precision (arcsec)", 0.0);
-        psMetadataAddS32 (updates, PS_LIST_TAIL, "NASTRO",   PS_META_REPLACE, "number of astrometry stars", 0);
+        psMetadataAddF32 (updates, PS_LIST_TAIL, "CPRECISE", PS_META_REPLACE, "astrometry precision (arcsec)", 0.0);
+        psMetadataAddS32 (updates, PS_LIST_TAIL, "NASTRO",   PS_META_REPLACE, "number of astrometry stars", 0);
     }
     psMetadataAddF32 (updates, PS_LIST_TAIL, "EQUINOX",  PS_META_REPLACE, "", 2000.0); // XXX this is bogus: should be defined based on equinox of refstars
@@ -147 +147 @@
     psastroUpdateChipToFPA (fpa, chip, rawstars, refstars);
 
+    //plot results
+    psastroVisualPlotMosaicOneChip(rawstars, refstars, match, recipe);
+
     psFree (fitStats);
     psFree (results);