Changeset 10880 for trunk/psastro/src/psastroMosaicAstrom.c

Timestamp:

Jan 2, 2007, 3:26:52 PM (20 years ago)

Author:

eugene

Message:

fixed mosaic analysis; cleaned up test code (some in traces, some removed), general output cleanups

File:

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

trunk/psastro/src/psastroMosaicAstrom.c

@@ -4 +4 @@
 // XXX require this fpa to have multiple chip extensions and a PHU?
 bool psastroMosaicAstrom (pmConfig *config, psArray *refs) {
-
-    bool status;
-    psArray *gradients = NULL;
 
     // select the current recipe
@@ -29 +26 @@
 
     // given the existing per-chip astrometry, determine matches between raw and ref stars
+    // is this needed? yes, if we didn't do SingleChip astrometry first
     psastroMosaicSetMatch (fpa, recipe, 0);
+    if (psTraceGetLevel("psastro.dump") > 0) { psastroDumpMatches (fpa, "match.0.dat"); }
 
     // fitted chips will follow the local plate-scale, hiding the distortion
@@ -35 +34 @@
     // then recalculate raw and ref positions
     psastroMosaicCommonScale (fpa, recipe);
-    psastroMosaicSetAstrom (fpa);
+    if (psTraceGetLevel("psastro.dump") > 0) { psastroDumpMatches (fpa, "match.1.dat"); }
 
-    gradients = psastroMosaicGradients (fpa, recipe);
+    // fit the distortion by fitting its gradient
+    // apply the new distortion terms up and down
+    // refit the per-chip terms with linear fits only
+    psastroMosaicGradients (fpa, recipe);
+    if (psTraceGetLevel("psastro.dump") > 0) { psastroDumpMatches (fpa, "match.2.dat"); }
 
-    // allocate mosaic-level polynomial transformation and set masks needed by DVO
-    int order = psMetadataLookupF32 (&status, recipe, "PSASTRO.MOSAIC.ORDER");
-    if (!status) {
-        psError(PSASTRO_ERR_UNKNOWN, false, "failed to find single-chip fit order\n");
-        return false;
-    }
-    psFree (fpa->toTPA);
-    fpa->toTPA = psPlaneTransformAlloc (order, order);
-    for (int i = 0; i <= fpa->toTPA->x->nX; i++) {
-        for (int j = 0; j <= fpa->toTPA->x->nY; j++) {
-            if (i + j > order) {
-                fpa->toTPA->x->mask[i][j] = 1;
-                fpa->toTPA->y->mask[i][j] = 1;
-            }
-        }
-    }
+    psastroMosaicChipAstrom (fpa, recipe, false);
+    if (psTraceGetLevel("psastro.dump") > 0) { psastroDumpMatches (fpa, "match.3.dat"); }
 
-    // fit the measured gradients with the telescope distortion model (polynomial order based on toTPA)
-    pmAstromFitDistortion (fpa, gradients, recipe);
-    psFree (gradients);
-
-    // apply the new distortion terms up and down
     // re-perform the match with a slightly tighter circle
-    // XXX modify match radius
-    // XXX set chip.order to 1
-    psastroMosaicSetAstrom_tmp (fpa);
     psastroMosaicSetMatch (fpa, recipe, 1);
-    psastroMosaicChipAstrom (fpa, recipe, 1);
 
     // do a second pass on the distortion with improved chip positions and rotations
-    // XXX do we need to iterate with this step until the distortions don't change? 
     psastroMosaicCommonScale (fpa, recipe);
-    gradients = psastroMosaicGradients (fpa, recipe);
-    pmAstromFitDistortion (fpa, gradients, recipe);
-    psFree (gradients);
+    psastroMosaicGradients (fpa, recipe);
+    psastroMosaicChipAstrom (fpa, recipe, false);
+    psastroMosaicSetMatch (fpa, recipe, 1);
     
     // now fit the chips under the common distortion with higher-order terms
-    // XXX modify match radius
-    // XXX set chip.order to NORDER
-    psastroMosaicSetAstrom (fpa);
-    psastroMosaicSetMatch (fpa, recipe, 2);
-    psastroMosaicChipAstrom (fpa, recipe, 2);
+    // first, re-perform the match with a slightly tighter circle
+    psastroMosaicChipAstrom (fpa, recipe, true);
 
     // save WCS and analysis metadata in update header
-    // XXX need to add global summary statistics
     psMetadata *updates = psMetadataAlloc();
     pmAstromWriteBilevelMosaic (updates, fpa, NONLIN_TOL);
-    psMetadataAdd (fpa->analysis, PS_LIST_TAIL, "PSASTRO.HEADER",  PS_DATA_METADATA, "psastro header stats", updates);
+    psMetadataAddMetadata (fpa->analysis, PS_LIST_TAIL, "PSASTRO.HEADER",  PS_META_REPLACE, "psastro header stats", updates);
     psFree (updates);
 
     // update the headers based on the results
+    // XXX need to add global summary statistics
     // psastroMosaicHeaders (config);