Changeset 20520

Timestamp:

Nov 3, 2008, 4:38:50 PM (18 years ago)

Author:

bills

Message:

take the diffed skycells as arguments. Compute the overlap in image
coordinates to use in masking out non-warped pixels;

Location:

trunk/magic/remove/src

Files:

• Makefile.simple (modified) (1 diff)
• streaks.h (modified) (2 diffs)
• streaksastrom.c (modified) (2 diffs)
• streaksastrom.h (modified) (3 diffs)
• streaksremove.c (modified) (3 diffs)
• warpedpixels.c (added)

trunk/magic/remove/src/Makefile.simple

@@ -5 +5 @@
     streaksastrom.o \
     streaksextern.o \
+    warpedpixels.o \
     Line.o
 

trunk/magic/remove/src/streaks.h

@@ -64 +64 @@
     pmChip  *chip;  // current chip
     pmCell  *cell;  // current cell
+    psImage *warpedPixels;
     psVector    *tiles;
     float   recoveryImageValue;
@@ -73 +74 @@
     int numCols, int numRows);
 
+extern void computeWarpedPixels(streakFiles *sf);
+extern void streaksremoveExit(psString, int);
+
 #define CHIP_LEVEL_INPUT(_stage) ((_stage == IPP_STAGE_RAW) || (_stage == IPP_STAGE_CHIP))
 #define USE_SUPPLIED_ASTROM(_stage) CHIP_LEVEL_INPUT(_stage)

trunk/magic/remove/src/streaksastrom.c

@@ -39 +39 @@
             return false;
         }
-    } else {
+    } else if (md) {
         // The metadata is the raw header
         // Assumes GPC1
@@ -63 +63 @@
             return false;
         }
+    } else {
+        // no metadata regular cell
+        cell_x0 = 0;
+        cell_y0 = 0;
+        xParityCell = 1;
+        yParityCell = 1;
     }
 

trunk/magic/remove/src/streaksastrom.h

@@ -4 +4 @@
 // Structure that encapsulates Astrometry
 // Note: this file should have no dependence on ipp data types
+// XXX: we might be able to remove this restrction. Paul S has
+// used some of our datatypes in his code
+//
 typedef struct {
     // opaque pointers to psModules types
@@ -19 +22 @@
 
 
+#ifndef notdef
 // There must be some well known type lying around that we
 // can use for this
@@ -25 +29 @@
     double  y;
 } strkPt;
+#else
+// TODO: remove this typedef
+typedef psPlane strkPt;
+#endif
 
 extern bool skyToCell(strkPt *, strkAstrom *astrom, double ra, double dec);

trunk/magic/remove/src/streaksremove.c

@@ -259 +259 @@
     }
 
-    // got get the astrometry
+    // read in the astrometry
     astrometry_read(sf);
 }
@@ -312 +312 @@
     }
     setupAstromFromFPA(sf);
+    if (CHIP_LEVEL_INPUT(sf->stage)) {
+        computeWarpedPixels(sf);
+    }
      
     psElemType tileType;                // Type corresponding to "long"
@@ -498 +501 @@
     
     
+    if (!pmConfigFileSetsMD(config->arguments, &argc, argv, "SKYCELLS", "-skycell", "-skycelllist")) { ;
+        if (CHIP_LEVEL_INPUT(stage)) {
+            psError(PS_ERR_UNKNOWN, true, "-skycelllist is required for raw and chip stages\n");
+            return NULL;
+        }
+    }
+
     if (!pmConfigFileSetsMD(config->arguments, &argc, argv, "ASTROM", "-astrom", NULL)) { ;
         if (CHIP_LEVEL_INPUT(stage)) {