Changeset 30315

Timestamp:

Jan 20, 2011, 10:25:37 AM (15 years ago)

Author:

bills

Message:

Various changes to make the handling of recovery images (saved exised pixels) work.

Location:

trunk/magic/remove/src

Files:

• streaksVersion.c (modified) (1 diff)
• streakscompare.c (modified) (1 diff)
• streaksio.c (modified) (15 diffs)
• streaksio.h (modified) (3 diffs)
• streaksrelease.c (modified) (1 diff)
• streaksremove.c (modified) (6 diffs)
• streaksremove.h (modified) (1 diff)
• streaksreplace.c (modified) (4 diffs)

trunk/magic/remove/src/streaksVersion.c

@@ -58 +58 @@
     psString source = streaksSource();   // Software source
 
-    psMetadataAddStr(header, PS_LIST_TAIL, "STREAK_V", 0, NULL, source);
+    psMetadataAddStr(header, PS_LIST_TAIL, "STREAK_V", PS_META_REPLACE, NULL, source);
     
     psStringPrepend(&version, "%s version: ", streaksProgram);

trunk/magic/remove/src/streakscompare.c

@@ -18 +18 @@
     ippStage stage = psMetadataLookupS32(&status, config->arguments, "STAGE");
 
-    sFile *file1 = sFileOpen(config, stage, "INPUT1", NULL, true);
-    sFile *file2 = sFileOpen(config, stage, "INPUT2", NULL, true);
+    sFile *file1 = sFileOpen(config, stage, "INPUT1", NULL, true, false);
+    sFile *file2 = sFileOpen(config, stage, "INPUT2", NULL, true, false);
 
     int ncomponents;

trunk/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);
         }
     }
@@ -212 +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);
@@ -223 +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;
@@ -238 +238 @@
 
 sFile *sFileOpen(pmConfig *config, ippStage stage, psString fileSelect,
-    psString outputFilename, bool required)
+    psString outputFilename, bool required, bool checkIfDestreaked)
 {
     bool status;
@@ -313 +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);
@@ -326 +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);
@@ -393 +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);
 }
 
@@ -407 +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");
@@ -424 +425 @@
 
     // add keyword indicating that streaks have been removed
-    addDestreakKeyword(imageHeader);
+    addDestreakKeyword(imageHeader, destreak);
 
     if (!psFitsWriteBlank(sfiles->outImage->fits, imageHeader, NULL)) {
@@ -454 +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",
@@ -484 +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",
@@ -674 +675 @@
     psVector *tiles)
 {
-    if (!sfile) {
+    if (!sfile || !sfile->write) {
         return;
     }
@@ -1242 +1243 @@
     } 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 {
         psError(PS_ERR_PROGRAMMING, true, "unexpected image type found: %d\n", in->image->type.type);

trunk/magic/remove/src/streaksio.h

@@ -5 +5 @@
 
 sFile *sFileOpen(pmConfig *config, ippStage stage, psString fileSelect,
-    psString outputFilename, bool required);
+    psString outputFilename, bool required, bool checkIfDestreaked);
 
 void closeImages(streakFiles *sfiles);
@@ -12 +12 @@
 
 void readImage(sFile *sfile, int extnum, ippStage stage, bool isMask);
-void copyPHU(streakFiles *sfiles, bool remove);
+void copyPHU(streakFiles *sfiles, bool remove, bool destreaked);
 void copyTable(sFile *out, sFile *in, int extnum);
 void copyFitsOptions(sFile *out, sFile *rec, sFile *in, psVector *tiles);
@@ -24 +24 @@
 void readImageFrom_pmFile(streakFiles *sf);
 
-void addDestreakKeyword(psMetadata *);
+void addDestreakKeyword(psMetadata *, bool value);
 void addRecoveryKeyword(psMetadata *);
 

trunk/magic/remove/src/streaksrelease.c

@@ -24 +24 @@
     if (sfiles->stage == IPP_STAGE_RAW) {
         // copy PHU to output files
-        copyPHU(sfiles, true);
+        copyPHU(sfiles, false, true);
 
         // advance to the first image extension

trunk/magic/remove/src/streaksremove.c

@@ -93 +93 @@
         // Raw files have a phu and multiple extensions, one per chip
         // Since this is a raw file, copy it's PHU to output files
-        copyPHU(sfiles, true);
+        copyPHU(sfiles, true, true);
 
         // advance to the first image extension
@@ -617 +617 @@
         addRecoveryKeyword(sf->recImage->header);
     }
-    addDestreakKeyword(sf->outImage->header);
+    addDestreakKeyword(sf->outImage->header, true);
 
     if (!SFILE_IS_IMAGE(sf->inImage)) {
@@ -643 +643 @@
                 addRecoveryKeyword(sf->recMask->header);
             }
-            addDestreakKeyword(sf->outMask->header);
+            addDestreakKeyword(sf->outMask->header, true);
             // Note: we don't excise the mask pixels even if exciseAll is true.
             setupImageRefs(sf->outMask, sf->recMask, sf->inMask, sf->extnum, false);
@@ -675 +675 @@
             addRecoveryKeyword(sf->recWeight->header);
         }
-        addDestreakKeyword(sf->outWeight->header);
+        addDestreakKeyword(sf->outWeight->header, true);
         setupImageRefs(sf->outWeight, sf->recWeight, sf->inWeight, sf->extnum, exciseAll);
 
@@ -916 +916 @@
             streaksExit("", PS_EXIT_DATA_ERROR);
         }
-        addDestreakKeyword(header);
+        addDestreakKeyword(header, true);
 
         if (!psFitsWriteBlank(out->fits, header, extname)) {
@@ -977 +977 @@
         psArrayRealloc(outTable, j);
 
-        addDestreakKeyword(header);
+        addDestreakKeyword(header, true);
         if (psArrayLength(outTable) > 0) {
             printf("Censored %d sources\n", numCensored);

trunk/magic/remove/src/streaksremove.h

@@ -18 +18 @@
     psString    name;
     bool        inNebulous;
+    bool        write;
     psFits      *fits;
     int         nHDU;

trunk/magic/remove/src/streaksreplace.c

@@ -36 +36 @@
     if (sfiles->stage == IPP_STAGE_RAW) {
         // copy PHU to output files
-        copyPHU(sfiles, false);
+        copyPHU(sfiles, false, false);
 
         // advance to the first image extension
@@ -296 +296 @@
 
     sf->outImage->header = (psMetadata*) psMemIncrRefCounter(sf->inImage->header);
+    addDestreakKeyword(sf->outImage->header, false);
 
     if (!SFILE_IS_IMAGE(sf->inImage)) {
@@ -317 +318 @@
         readImage(sf->recMask, sf->extnum, sf->stage, true);
         sf->outMask->header = (psMetadata*) psMemIncrRefCounter(sf->inMask->header);
+        
+        addDestreakKeyword(sf->outMask->header, false);
 
         // XXX: TODO
@@ -329 +332 @@
 
         sf->outWeight->header = (psMetadata*) psMemIncrRefCounter(sf->inWeight->header);
+        addDestreakKeyword(sf->outWeight->header, false);
         setupImageRefs(sf->outMask, NULL, sf->inMask, sf->extnum, false);