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

Timestamp:

Jun 4, 2006, 7:02:16 AM (20 years ago)

Author:

eugene

Message:

substantial updates

File:

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

trunk/psastro/src/psastroMosaicAstrom.c

@@ -20 +20 @@
     }
 
-    double plateScale = psMetadataLookupF32 (&status, recipe, "PSASTRO.PLATE.SCALE");
-    if (!status) plateScale = 1.0;
+    int order = psMetadataLookupF32 (&status, recipe, "PSASTRO.DISTORTION.ORDER");
+    if (!status) order = 3.0;
 
     pmFPA *fpa = input->fpa;
 
-    psastroMosaicGetRefstars (fpa, refs, recipe);
+    // XXX test point
+    if (0) { 
+        pmChip *chip = fpa->chips->data[10];
+        pmCell *cell = chip->cells->data[0];
+        pmReadout *readout = cell->readouts->data[0];
+        psArray *refstars = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.REFSTARS");
+        pmAstromObj *ref = refstars->data[0];
+        fprintf (stderr, "test 1: %f %f  %f %f  %f %f\n", ref->chip->x, ref->chip->y, ref->FP->x, ref->FP->y, ref->sky->r, ref->sky->d);
+    }
+
     psastroMosaicSetMatch (fpa, recipe);
+
+    // XXX no input distortion model yet; existing fpa distortion is identity: replace it
+    psFree (fpa->toTangentPlane);
+    psFree (fpa->fromTangentPlane);
+    fpa->toTangentPlane   = psPlaneDistortIdentity (order);
+    fpa->fromTangentPlane = psPlaneDistortIdentity (order);
 
     grads = psastroMosaicGetGrads (fpa, recipe);
@@ -32 +47 @@
     // fit the measured gradients with the telescope distortion model (3rd order polynomial)
     pmAstromFitDistortion (fpa, grads, recipe);
+    psastroMosaicRescaleChips (fpa);
 
     // apply the new distortion terms up and down
@@ -50 +66 @@
     // re-fit the chips with higher-order fits
     psastroMosaicChipAstrom (fpa, recipe);
-    // psastroMosaicHeaders (fpa);
+    psastroMosaicHeaders (config);
 
     return true;