Changeset 26870 for branches/eam_branches/20091201/magic/remove/src/streaksio.c

Timestamp:

Feb 10, 2010, 4:13:14 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/20091201/magic/remove

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/streaksio.c (modified) (8 diffs)

branches/eam_branches/20091201/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/eam_branches/20091201/magic/remove/src/streaksio.c

@@ -121 +121 @@
     sf->transparentStreaks = psMetadataLookupF64(&status, config->arguments, "TRANSPARENT_STREAKS");
 
+    sf->stats = psMetadataAlloc();
+    psString statsFileName= psMetadataLookupStr(&status, config->arguments, "STATS");
+    if (statsFileName) {
+        sf->statsFile = fopen(statsFileName, "w");
+        if (!sf->statsFile) {
+            psError(PS_ERR_IO, true, "failed to open stats file %s", statsFileName);
+            streaksExit("", PS_EXIT_CONFIG_ERROR);
+        }
+    }
+
     return sf;
 }
@@ -128 +138 @@
 {
     freeImages(sf);
-    psFree(sf->warpedPixels);
+    psFree(sf->diffedPixels);
     psFree(sf->tiles);
     psFree(sf->view);
@@ -800 +810 @@
         return;
     }
+    streaksVersionHeaderFull(sfile->header);
     if (!psFitsWriteImage(sfile->fits, sfile->header, sfile->image, 0, extname)) {
         psError(PS_ERR_IO, false, "failed to write image to %s extnum: %d",
@@ -817 +828 @@
         return;
     }
+    streaksVersionHeaderFull(sfile->header);
     if (!psFitsWriteImageCube(sfile->fits, sfile->header, imagecube, extname)) {
         psError(PS_ERR_IO, false, "failed to write image to %s extnum: %d",
@@ -851 +863 @@
     sfile->header = NULL;
     psFree(sfile->image);
-    sfile->header = NULL;
+    sfile->image = NULL;
     psFree(sfile->imagecube);
-    sfile->header = NULL;
+    sfile->imagecube = NULL;
 }
 
@@ -1181 +1193 @@
 }
 
-void
-strkGetMaskValues(streakFiles *sfiles, psU32 *maskStreak, psU32 *maskMask)
-{
+// Get the mask values that we need.
+// If an input mask file is provided get them from there.
+// Otherwise get them from the recipe MASKS
+void
+strkGetMaskValues(streakFiles *sfiles)
+{
+    if (sfiles->maskStreak) {
+        // already done
+        return;
+    }
     if (sfiles->inMask && sfiles->inMask->header) {
         if (!pmConfigMaskReadHeader(sfiles->config, sfiles->inMask->header)) {
@@ -1196 +1215 @@
         streaksExit("", PS_EXIT_CONFIG_ERROR);
     }
-    *maskStreak = psMetadataLookupU32(&status, masks, "STREAK");
+    sfiles->maskStreak = psMetadataLookupU32(&status, masks, "STREAK");
     if (!status) {
         psError(PM_ERR_CONFIG, false, "failed to lookup mask value for STREAK in recipes\n");
@@ -1212 +1231 @@
         }
     }
-    *maskMask = ~convPoor;
+    sfiles->maskMask = ~convPoor;
 }
 

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