Changeset 27840 for branches/simtest_nebulous_branches/magic/remove/src/streaksremove.h

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• magic (modified) (1 prop)
• magic/remove (modified) (1 prop)
• magic/remove/src (modified) (1 prop)
• magic/remove/src/streaksremove.h (modified) (4 diffs)

branches/simtest_nebulous_branches/magic

@@ -1 +1 @@
 magic
 ssa-core-cpp
-Makefile
 Makefile.bak

@@ -1 +1 @@
 magic
 ssa-core-cpp
-Makefile
 Makefile.bak

branches/simtest_nebulous_branches/magic/remove/src

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

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

branches/simtest_nebulous_branches/magic/remove/src/streaksremove.h

@@ -33 +33 @@
     int         yParity;
     double      exciseValue;
+    psString    program;
 } sFile;
 
-
-typedef enum {
-    IPP_STAGE_NONE = 0,
-    IPP_STAGE_RAW,
-    IPP_STAGE_CHIP,
-    IPP_STAGE_WARP,
-    IPP_STAGE_DIFF
-} ippStage;
-
+// used for error messages
+extern char * streaksProgram;
 
 typedef struct {
@@ -64 +58 @@
     sFile *inSources;
     sFile *outSources;
+    psMetadata *stats;
+    FILE *statsFile;
     psString class_id;
     pmFPAfile  *inAstrom;
@@ -71 +67 @@
     pmChip  *chip;  // current chip
     pmCell  *cell;  // current cell
-    psImage *warpedPixels;
+    psImage *diffedPixels;
     psVector    *tiles;
     double  transparentStreaks;
     psString    program_name;
+    psU32   maskStreak;
+    psU32   maskMask;
 } streakFiles;
 
@@ -84 +82 @@
 // can't declare this in streaksastrom due to header file ordering
 extern void cellToChip(double *xChip, double *yChip, strkAstrom *astrom, double xCell, double yCell);
-extern void cellToChipInt(int *xChip, int *yChip, strkAstrom *astrom, int xCell, int yCell);
+extern void cellToChipInt(unsigned int *xChip, unsigned int *yChip, strkAstrom *astrom, int xCell, int yCell);
 
-extern bool computeWarpedPixels(streakFiles *sf);
+extern bool computeDiffedPixels(streakFiles *sf);
 extern void streaksExit(psString, int);
 extern ippStage parseStage(psString);
 extern psString pathToDirectory(char *path);
 extern void setStreakFiles( streakFiles *);
+
+extern bool streaksVersionHeaderFull(psMetadata *header);
+extern psString streaksVersionLong(void);
 
 #define CHIP_LEVEL_INPUT(_stage) ((_stage == IPP_STAGE_RAW) || (_stage == IPP_STAGE_CHIP))

@@ -1 +1 @@
 magic
 ssa-core-cpp
-Makefile
 Makefile.bak

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