Changeset 26438 for trunk/magic/remove/src/diffedpixels.c

Timestamp:

Dec 16, 2009, 12:22:44 PM (16 years ago)

Author:

bills

Message:

switch to using auto tools

Location:

trunk/magic/remove

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/diffedpixels.c (moved) (moved from trunk/magic/remove/src/warpedpixels.c ) (8 diffs, 1 prop)

trunk/magic/remove/src

@@ -4 +4 @@
 streakscompare
 streaksrelease
-makefile
+Makefile
+Makefile.in
+config.h
+.deps
+streaksVersionDefinitions.h
+config.h.in

@@ -4 +4 @@
 streakscompare
 streaksrelease
-makefile
+Makefile
+Makefile.in
+config.h
+.deps
+streaksVersionDefinitions.h
+config.h.in

trunk/magic/remove/src/diffedpixels.c

@@ -9 +9 @@
 static int xRight(psPlane *pt, int y);
 
+// Examine the set of diff skycells and compute the pixels that were
+// included in difference processing
 bool
-computeWarpedPixels(streakFiles *sf)
+computeDiffedPixels(streakFiles *sf)
 {
     bool status;
@@ -29 +31 @@
     psFree(bounds);
 
-    sf->warpedPixels = psImageAlloc(width, height, PS_TYPE_U8);
-    psImageInit(sf->warpedPixels, 0);
+    sf->diffedPixels = psImageAlloc(width, height, PS_TYPE_U8);
+    psImageInit(sf->diffedPixels, 0);
 
     for (int i=0; i<n; i++) {
@@ -42 +44 @@
     bool writeTouchedPixels = false; // XXX: make this an argument to the program
     if (writeTouchedPixels) {
-        // write out the warped pixels
+        // write out the diffed pixels
         psMetadata * header = psMetadataAlloc();
         if (sf->inAstrom->fpa->toSky->type != PS_PROJ_DIS) {
             pmAstromWriteWCS(header, sf->inAstrom->fpa, sf->chip, 0.001);
         }
-        psFits *fits = psFitsOpen("warpedpixels.fits", "w");
-
-        psFitsWriteImage(fits, header, sf->warpedPixels, 0, NULL);
+        psFits *fits = psFitsOpen("diffedpixels.fits", "w");
+
+        psFitsWriteImage(fits, header, sf->diffedPixels, 0, NULL);
         psFitsClose(fits);
         psFree(header);
@@ -84 +86 @@
     /* now set up our wrapper to the chip astrometry to apply to the whole chip */
     sf->astrom = streakSetAstrometry(sf->astrom, sf->stage, sf->inAstrom->fpa, sf->chip, false, NULL,
-        sf->warpedPixels->numCols, sf->warpedPixels->numRows);
+        sf->diffedPixels->numCols, sf->diffedPixels->numRows);
 
     // convert corners of skycell to sky coordinates
@@ -138 +140 @@
     // Now set the touched pixels
     int ymin = fmax(0, pt[1].y );
-    int ymax = fmin(pt[3].y + 0.5, sf->warpedPixels->numRows - 1);
+    int ymax = fmin(pt[3].y + 0.5, sf->diffedPixels->numRows - 1);
 #if (DEBUG_PRINT > 1)
     printf("\nymin: %d ymax: %d\n", ymin, ymax);
@@ -149 +151 @@
             xleft = 0;
         }
-        if (xleft > sf->warpedPixels->numCols) {
+        if (xleft > sf->diffedPixels->numCols) {
             continue;
         }
@@ -155 +157 @@
             continue;
         }
-        if (xright >= sf->warpedPixels->numCols) {
-            xright = sf->warpedPixels->numCols - 1;
+        if (xright >= sf->diffedPixels->numCols) {
+            xright = sf->diffedPixels->numCols - 1;
         }
 #if (DEBUG_PRINT > 1)
@@ -162 +164 @@
 #endif
 
-        psU8 *rowPixels = sf->warpedPixels->data.U8[y];
+        psU8 *rowPixels = sf->diffedPixels->data.U8[y];
 
         int n = xright - xleft + 1;

@@ -4 +4 @@
 streakscompare
 streaksrelease
-makefile
+Makefile
+Makefile.in
+config.h
+.deps
+streaksVersionDefinitions.h
+config.h.in