Changeset 27838 for branches/tap_branches/psastro/src/psastroFixChips.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• psastro/src/psastroFixChips.c (modified) (3 diffs)

branches/tap_branches/psastro/src/psastroFixChips.c

@@ -248 +248 @@
         badAstrom |= fabs(obsAngle   - refAngle)   > angleTol;
 
-        fprintf (stderr, "chip %d, angle: %f, pixel: %f,%f\n", view->chip, obsAngle - refAngle, obsCoord.x - refCoord.x, obsCoord.y - refCoord.y);
+        fprintf (stderr, "chip %d, angle: %f, pixel: %f,%f  : ", view->chip, obsAngle - refAngle, obsCoord.x - refCoord.x, obsCoord.y - refCoord.y);
+        if (badAstrom) {
+            fprintf (stderr, "BAD ASTROM\n");
+        } else {
+            fprintf (stderr, "GOOD ASTROM\n");
+        }
 
         // XXX for now, just use first readout
@@ -265 +270 @@
         psMetadataAddF32 (updates, PS_LIST_TAIL, "AST_DY", PS_META_REPLACE, "chip y offset wrt model", obsCoord.y - refCoord.y);
         psMetadataAddF32 (updates, PS_LIST_TAIL, "AST_DT", PS_META_REPLACE, "chip rot offset wrt model", obsAngle - refAngle);
+
+        continue;
 
         // for successful chips, save the measured offsets in the header
@@ -319 +326 @@
         }
 
-        psastroUpdateChipToFPA (input->fpa, obsChip, rawstars, refstars);
+        psastroUpdateChipToFPA (input->fpa, obsChip);
 
         // XXX update the header with info to reflect the failure
-        if (!psastroOneChipFit (input->fpa, obsChip, refstars, rawstars, recipe, updates)) {
+        if (!psastroOneChipFit (input->fpa, obsChip, readout, refstars, rawstars, recipe, updates)) {
             readout->data_exists = false;
             psLogMsg ("psastro", 3, "failed to find a solution\n");