Changeset 24716

Timestamp:

Jul 8, 2009, 10:07:36 AM (17 years ago)

Author:

bills

Message:

Don't fail if astrometry can't be linearized. Just leave the values in the header unchanged.

Location:

trunk/magic/remove/src

Files:

• streaksastrom.c (modified) (1 diff)
• streaksastrom.h (modified) (1 diff)
• streaksremove.c (modified) (1 diff)

trunk/magic/remove/src/streaksastrom.c

@@ -377 +377 @@
 }
 
-void
+bool
 linearizeTransforms(strkAstrom *astrom)
 {
     if (!pmAstromLinearizeTransforms((pmFPA *) astrom->fpa, (pmChip *) astrom->chip)) {
-        streaksExit("linear fit to astrometry failed\n", PS_EXIT_UNKNOWN_ERROR);
-    }
-}
+        // streaksExit("linear fit to astrometry failed\n", PS_EXIT_UNKNOWN_ERROR);
+        psError(PS_ERR_UNKNOWN, false, "linear fit to astrometry failed ignoring");
+        return false;
+    }
+    return true;
+}

trunk/magic/remove/src/streaksastrom.h

@@ -30 +30 @@
 extern bool skyToCell(strkPt *, strkAstrom *astrom, double ra, double dec);
 extern bool cellToSky(strkPt *, strkAstrom *astrom, double x, double y);
-extern void linearizeTransforms(strkAstrom *astrom);
+extern bool linearizeTransforms(strkAstrom *astrom);
 
 extern bool SkyToLocal(strkPt *outPt, strkAstrom *astrom, double ra, double dec);

trunk/magic/remove/src/streaksremove.c

@@ -483 +483 @@
     if (sf->bilevelAstrometry) {
 
-        linearizeTransforms(sf->astrom);
+        if (!linearizeTransforms(sf->astrom)) {
+            // fit failed, leave the astrometry unchanged
+            return;
+        }
 
         if (!pmAstromWriteWCS(sf->outImage->header, sf->inAstrom->fpa, sf->chip, 0.001)) {