Changeset 25027 for branches/pap/magic/remove/src/streaksextern.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• magic (modified) (1 prop)
• magic/remove/src (modified) (1 prop)
• magic/remove/src/streaksextern.c (modified) (2 diffs)

branches/pap/magic/remove/src

@@ +1 @@
+isdestreaked
 streaksremove
 streaksreplace
 streakscompare
 streaksrelease
+makefile

@@ +1 @@
+isdestreaked
 streaksremove
 streaksreplace
 streakscompare
 streaksrelease
+makefile

branches/pap/magic/remove/src/streaksextern.c

@@ -34 +34 @@
     int i;
     Line line;
-    StreakPixels *pixels = psArrayAllocEmpty (1024);
+    StreakPixels *pixels = psImageAlloc(numCols, numRows, PS_TYPE_U8);
+    psImageInit(pixels, 0);
     int streaksOnComponent = 0;
+
+    int minX, minY, maxX, maxY;
+
+    // find the chip dimensions in the tangent-plane coordinates (length of hypotenuse)
+    componentBounds (&minX, &minY, &maxX, &maxY, astrom, numCols, numRows);
+
     for (i = 0; i != streaks->size; ++i)
     {
@@ -41 +48 @@
 
         line.width = streaks->list[i].width;
-        if (skyToCell (&line.begin, astrom,
-                       streaks->list[i].ra1, streaks->list[i].dec1) &&
-            skyToCell (&line.end, astrom,
-                       streaks->list[i].ra2, streaks->list[i].dec2) &&
+
+        /* Use tangent plane coordinates to narrow down the ra,dec range of the line closer to
+         * the chip boundaries.  Use these new ra,dec positions to generate the line on the
+         * chip using the full non-linear astrometry */
+           
+        // project the ends of the line using a linear projection centered on the chip center:
+        Line full;
+        SkyToLocal (&full.begin, astrom, streaks->list[i].ra1, streaks->list[i].dec1);
+        SkyToLocal (&full.end,   astrom, streaks->list[i].ra2, streaks->list[i].dec2);
+
+        // clip the line to a square box with diameter = hypotenuse of the chip image centerd
+        // on the chip center in tangent-plane coordinates.  skip the rest of this streak if
+        // the line does not intersect this region
+        if (!LineClipFull (&full, minX, minY, maxX, maxY)) {
+            continue;
+        }
+
+        // convert the end points back into ra, dec pairs:
+        strkPt sky1, sky2;
+        LocalToSky (&sky1, astrom, &full.begin);
+        LocalToSky (&sky2, astrom, &full.end);
+
+        if (skyToCell (&line.begin, astrom, sky1.x, sky1.y) &&
+            skyToCell (&line.end,   astrom, sky2.x, sky2.y) &&
             LineClip (&line, numCols, numRows))
         {
-            PixelsFromLine (pixels, &line);
+            PixelsFromLine (pixels, &line, numCols, numRows);
             streaksOnComponent++;
         }

@@ +1 @@
+isdestreaked
 streaksremove
 streaksreplace
 streakscompare
 streaksrelease
+makefile