Changeset 30447 for branches/eam_branches/ipp-20101205/magic/remove/src/streaksio.c

Timestamp:

Jan 31, 2011, 2:52:18 PM (15 years ago)

Author:

eugene

Message:

merging changes from trunk

File:

• branches/eam_branches/ipp-20101205/magic/remove/src/streaksio.c (modified) (19 diffs)

branches/eam_branches/ipp-20101205/magic/remove/src/streaksio.c

@@ -42 +42 @@
     sf->class_id = psMetadataLookupStr(&status, config->arguments, "CLASS_ID");
 
-    sf->inImage = sFileOpen(config, stage, "INPUT", NULL, true);
+    sf->inImage = sFileOpen(config, stage, "INPUT", NULL, true, false);
     sf->nHDU = sf->inImage->nHDU;
 
@@ -48 +48 @@
     // The names of the temporary and recovery files are taken from the input
     char *inputBasename = basename(sf->inImage->name);
-    sf->outImage = sFileOpen(config, stage, "OUTPUT", inputBasename, true);
+    sf->outImage = sFileOpen(config, stage, "OUTPUT", inputBasename, true, true);
 
     if (remove) {
         // XXX: the recovery file should be required if stage is raw and the replace flag is set
         // that is if the input raw image is to be destroyed
-        sf->recImage = sFileOpen(config, stage, "RECOVERY", inputBasename, false);
-    } else {
-        sf->recImage = sFileOpen(config, stage, "RECOVERY.IMAGE", NULL, true);
-    }
-
-    sf->inMask = sFileOpen(config, stage, "INPUT.MASK", NULL, false);
+        sf->recImage = sFileOpen(config, stage, "RECOVERY", inputBasename, false, false);
+    } else {
+        sf->recImage = sFileOpen(config, stage, "RECOVERY.IMAGE", NULL, true, false);
+    }
+
+    sf->inMask = sFileOpen(config, stage, "INPUT.MASK", NULL, false, false);
     if (sf->inMask && (sf->stage != IPP_STAGE_RAW)) {
         inputBasename = basename(sf->inMask->name);
-        sf->outMask = sFileOpen(config, stage, "OUTPUT", inputBasename, true);
+        sf->outMask = sFileOpen(config, stage, "OUTPUT", inputBasename, true, true);
         if (remove) {
-            sf->recMask = sFileOpen(config, stage, "RECOVERY", inputBasename, false);
+            sf->recMask = sFileOpen(config, stage, "RECOVERY", inputBasename, false, false);
         } else {
-            sf->recMask = sFileOpen(config, stage, "RECOVERY.MASK", NULL, true);
+            sf->recMask = sFileOpen(config, stage, "RECOVERY.MASK", NULL, true, false);
         }
     }
@@ -73 +73 @@
     // If it doesn't exist, we didn't have a camera mask
     if (remove && sf->inMask && (stage == IPP_STAGE_CHIP)) {
-        sf->inChMask = sFileOpen(config, stage, "INPUT.CHMASK", NULL, false);
+        sf->inChMask = sFileOpen(config, stage, "INPUT.CHMASK", NULL, false, false);
         if (sf->inChMask) {
             inputBasename = basename(sf->inChMask->name);
-            sf->outChMask = sFileOpen(config, stage, "OUTPUT", inputBasename, true);
-            sf->recChMask = sFileOpen(config, stage, "RECOVERY", inputBasename, false);
-        }
-    }
-
-    sf->inWeight = sFileOpen(config, stage, "INPUT.WEIGHT", NULL, false);
+            sf->outChMask = sFileOpen(config, stage, "OUTPUT", inputBasename, true, true);
+            sf->recChMask = sFileOpen(config, stage, "RECOVERY", inputBasename, false, false);
+        }
+    }
+
+    sf->inWeight = sFileOpen(config, stage, "INPUT.WEIGHT", NULL, false, false);
     if (sf->inWeight) {
         inputBasename = basename(sf->inWeight->name);
-        sf->outWeight = sFileOpen(config, stage, "OUTPUT", inputBasename, true);
+        sf->outWeight = sFileOpen(config, stage, "OUTPUT", inputBasename, true, true);
         if (remove) {
-            sf->recWeight = sFileOpen(config, stage, "RECOVERY", inputBasename, false);
+            sf->recWeight = sFileOpen(config, stage, "RECOVERY", inputBasename, false, false);
         } else {
-            sf->recWeight = sFileOpen(config, stage, "RECOVERY.WEIGHT", NULL, true);
+            sf->recWeight = sFileOpen(config, stage, "RECOVERY.WEIGHT", NULL, true, false);
         }
     }
     if (remove) {
-        sf->inSources = sFileOpen(config, stage, "SOURCES", NULL, false);
+        sf->inSources = sFileOpen(config, stage, "SOURCES", NULL, false, false);
         if (sf->inSources) {
             inputBasename = basename(sf->inSources->name);
-            sf->outSources = sFileOpen(config, stage, "OUTPUT", inputBasename, true);
+            sf->outSources = sFileOpen(config, stage, "OUTPUT", inputBasename, true, true);
         }
     }
@@ -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;
 }
@@ -138 +128 @@
 {
     freeImages(sf);
+    psFree(sf->stats);
     psFree(sf->diffedPixels);
     psFree(sf->tiles);
@@ -221 +212 @@
 
 static psString
-resolveFilename(pmConfig *config, sFile *sfile, bool create)
+resolveFilename(pmConfig *config, sFile *sfile, bool create, bool checkIfDestreaked)
 {
     sfile->inNebulous = IN_NEBULOUS(sfile->name);
@@ -232 +223 @@
             // instance. It will get created below in pmConfigConvertFilename
             if ((sfile->resolved_name = nebFind(server, sfile->name)) != NULL) {
-                if (!nebFileIsDestreaked(sfile)) {
+                if (checkIfDestreaked && !nebFileIsDestreaked(sfile)) {
                     psError(PS_ERR_IO, false, "attempting to delete file that has not been destreaked %s", sfile->name);
                     return NULL;
@@ -247 +238 @@
 
 sFile *sFileOpen(pmConfig *config, ippStage stage, psString fileSelect,
-    psString outputFilename, bool required)
+    psString outputFilename, bool required, bool checkIfDestreaked)
 {
     bool status;
@@ -322 +313 @@
     // and the file is to be opened for writing
     if (outputFilename) {
+        sfile->write = true;
         psStringAppend(&sfile->name, "%s%s", name, outputFilename);
-        sfile->resolved_name = resolveFilename(config, sfile, true);
+        sfile->resolved_name = resolveFilename(config, sfile, true, checkIfDestreaked);
         if (!sfile->resolved_name) {
             psError(PS_ERR_IO, false, "Failed to resolve filename for %s", sfile->name);
@@ -335 +327 @@
     } else {
         sfile->name = psStringCopy(name);
-        sfile->resolved_name = resolveFilename(config, sfile, false);
+        sfile->resolved_name = resolveFilename(config, sfile, false, false);
         if (!sfile->resolved_name) {
             psError(PS_ERR_IO, false, "Failed to resolve name for %s", sfile->name);
@@ -402 +394 @@
 
 void
-addDestreakKeyword(psMetadata *header)
+addDestreakKeyword(psMetadata *header, bool value)
 {
     psMetadataAddBool(header, PS_LIST_TAIL, "PSDESTRK", PS_META_REPLACE,
-        "Have streaks been removed from image?", true);
+        "Have streaks been removed from image?", value);
 }
 
@@ -416 +408 @@
 
 void
-copyPHU(streakFiles *sfiles, bool remove)
+copyPHU(streakFiles *sfiles, bool remove, bool destreak)
 {
     psAssert(sfiles->stage == IPP_STAGE_RAW, "copyPHU should only be used for raw stage");
@@ -433 +425 @@
 
     // add keyword indicating that streaks have been removed
-    addDestreakKeyword(imageHeader);
+    addDestreakKeyword(imageHeader, destreak);
 
     if (!psFitsWriteBlank(sfiles->outImage->fits, imageHeader, NULL)) {
@@ -463 +455 @@
         }
         // add keyword indicating that streaks have been removed
-        addDestreakKeyword(maskHeader);
+        addDestreakKeyword(maskHeader, destreak);
         if (!psFitsWriteBlank(sfiles->outMask->fits, maskHeader, NULL)) {
             psError(PS_ERR_IO, false, "failed to write primary header to %s",
@@ -493 +485 @@
 
         // add keyword indicating that streaks have been removed
-        addDestreakKeyword(weightHeader);
+        addDestreakKeyword(weightHeader, destreak);
         if (!psFitsWriteBlank(sfiles->outWeight->fits, weightHeader, NULL)) {
             psError(PS_ERR_IO, false, "failed to write primary header to %s",
@@ -683 +675 @@
     psVector *tiles)
 {
-    if (!sfile) {
+    if (!sfile || !sfile->write) {
         return;
     }
@@ -861 +853 @@
         streaksExit("", PS_EXIT_DATA_ERROR);
     }
+    sfile->fits = NULL;
     psFree(sfile->header);
     sfile->header = NULL;
@@ -1198 +1191 @@
                                 weight->data.F32[y][x] = NAN;
                             }
+                        } else if (weightType == PS_TYPE_F64) {
+                            double weightVal = weight->data.F64[y][x];
+                            if (!isnan(weightVal)) {
+                                ++nandWeights;
+                                weight->data.F64[y][x] = NAN;
+                            }
                         } else if(weightType == PS_TYPE_S16) {
                             double weightVal = weight->data.S16[y][x];
@@ -1249 +1248 @@
         psMetadataAddU16(in->header, PS_LIST_TAIL, "ZBLANK", 0, "", 32767);
     } else if (in->image->type.type == PS_TYPE_F32) {
+        in->exciseValue = NAN;
+    } else if (in->image->type.type == PS_TYPE_F64) {
         in->exciseValue = NAN;
     } else {