Changeset 26477

Timestamp:

Dec 22, 2009, 2:39:53 PM (16 years ago)

Author:

bills

Message:

Add version information to headers. In streaksremove write the astrometry
to the header in the same place regardless if we have to do a fit or not.
Print error message if fit to astrometry fails.

Location:

trunk/magic/remove/src

Files:

• isdestreaked.c (modified) (1 diff)
• streaksVersion.c (modified) (4 diffs)
• streaksastrom.c (modified) (1 diff)
• streakscompare.c (modified) (1 diff)
• streaksio.c (modified) (2 diffs)
• streaksrelease.c (modified) (1 diff)
• streaksremove.c (modified) (8 diffs)
• streaksremove.h (modified) (2 diffs)
• streaksreplace.c (modified) (1 diff)

trunk/magic/remove/src/isdestreaked.c

@@ -1 +1 @@
 #include "streaksremove.h"
+
+char *streaksProgram = "isdestreaked";
 
 int

trunk/magic/remove/src/streaksVersion.c

@@ -38 +38 @@
     psString source = streaksSource();    // Source
 
-    psStringPrepend(&version, "streaks ");
+    psStringPrepend(&version, "%s ", streaksProgram);
     psStringAppend(&version, " from %s, built %s, %s", source, __DATE__, __TIME__);
     psFree(source);
@@ -58 +58 @@
     psString source = streaksSource();   // Software source
 
-    psStringPrepend(&version, "streaks version: ");
-    psStringPrepend(&source, "streaks source: ");
+    psStringPrepend(&version, "%s version: ", streaksProgram);
+    psStringPrepend(&source, "%s source: ", streaksProgram);
 
     psMetadataAddStr(header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, NULL, version);
@@ -78 +78 @@
     psFree(time);
     psString history = NULL;               // History string
-    psStringAppend(&history, "streaks at %s", timeString);
+    psStringAppend(&history, "%s at %s", streaksProgram, timeString);
     psFree(timeString);
     psMetadataAddStr(header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, NULL, history);
@@ -95 +95 @@
     psString timeString = psTimeToISO(time); // The time in an ISO string
     psFree(time);
-    psLogMsg("streaks", PS_LOG_INFO, "streaks at %s", timeString);
+    psLogMsg("streaks", PS_LOG_INFO, "%s at %s", streaksProgram, timeString);
     psFree(timeString);
 

trunk/magic/remove/src/streaksastrom.c

@@ -379 +379 @@
 {
     if (!pmAstromLinearizeTransforms((pmFPA *) astrom->fpa, (pmChip *) astrom->chip)) {
-        // streaksExit("linear fit to astrometry failed\n", PS_EXIT_UNKNOWN_ERROR);
-        psError(PS_ERR_UNKNOWN, false, "linear fit to astrometry failed ignoring");
+        psErrorStackPrint(stderr, "linear fit to astrometry failed. ignoring\n");
         return false;
     }

trunk/magic/remove/src/streakscompare.c

@@ -1 +1 @@
 #include "streaksremove.h"
+
+char *streaksProgram = "streakscompare";
 
 static pmConfig * parseArguments(int, char **);

trunk/magic/remove/src/streaksio.c

@@ -404 +404 @@
 addDestreakKeyword(psMetadata *header)
 {
+    streaksVersionHeaderFull(header);
     psMetadataAddBool(header, PS_LIST_TAIL, "PSDESTRK", PS_META_REPLACE,
         "Have streaks been removed from image?", true);
@@ -411 +412 @@
 addRecoveryKeyword(psMetadata *header)
 {
+    streaksVersionHeaderFull(header);
     psMetadataAddBool(header, PS_LIST_TAIL, "PSRECOVR", PS_META_REPLACE,
         "Does this image contain excised streak pixels?", true);

trunk/magic/remove/src/streaksrelease.c

@@ -4 +4 @@
 static bool readAndCopyToOutput(streakFiles *sf, bool exciseAll);
 static void writeImages(streakFiles *sf, bool exciseImageCube);
+
+char *streaksProgram = "streaksrelease";
 
 int

trunk/magic/remove/src/streaksremove.c

@@ -20 +20 @@
 static long censorPixels(streakFiles *sfiles, psImage * pixels, bool checkNonDiffedPixels, psU16 maskStreak);
 
+char *streaksProgram = "streaksremove";
+
 // Note: For clarity the flow of this program is in main().
 // There is not a lot of error checking is done in main.
@@ -109 +111 @@
     psF64 cs_t = 0;
     psF64 wi_t = 0;
+    psF64 ua_t = 0;
     // Iterate through each component of the input (except for raw images there is only one)
     do {
@@ -182 +185 @@
             // chip processed files with the data calcuated by psastro at the camera stage
             // (actually we use a linear approximation)
+            psTimerStart("UPDATE_ASTROMETRY");
             updateAstrometry(sfiles);
+            ua_t += psTimerClear("UPDATE_ASTROMETRY");
+            psMetadataAddF32(sfiles->stats, PS_LIST_TAIL, "UPDATE_ASTROMETRY", PS_META_REPLACE, "", ua_t);
+            psLogMsg("streaksremove", PS_LOG_INFO, "time to update astrometry: %f\n", ua_t);
         }
 
@@ -544 +551 @@
 updateAstrometry(streakFiles *sf)
 {
-    // XXX: why do I check this here? Shouldn't it be just around the call to linearizeTransforms?
     if (sf->bilevelAstrometry) {
-
         if (!linearizeTransforms(sf->astrom)) {
-            // fit failed, leave the astrometry unchanged
+            // fit failed, leave the transform in the file unchanged
             return;
         }
-
-        if (!pmAstromWriteWCS(sf->outImage->header, sf->inAstrom->fpa, sf->chip, 0.001)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to update astrometry for extension %d", sf->extnum);
-            streaksExit("", PS_EXIT_UNKNOWN_ERROR);
-        }
-        if (sf->outMask) {
-            pmAstromWriteWCS(sf->outMask->header, sf->inAstrom->fpa, sf->chip, 0.001);
-        }
-        if (sf->outWeight) {
-            pmAstromWriteWCS(sf->outWeight->header, sf->inAstrom->fpa, sf->chip, 0.001);
-        }
+    }
+    if (!pmAstromWriteWCS(sf->outImage->header, sf->inAstrom->fpa, sf->chip, 0.001)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to update astrometry for extension %d", sf->extnum);
+        streaksExit("", PS_EXIT_UNKNOWN_ERROR);
+    }
+    if (sf->outMask) {
+        pmAstromWriteWCS(sf->outMask->header, sf->inAstrom->fpa, sf->chip, 0.001);
+    }
+    if (sf->outWeight) {
+        pmAstromWriteWCS(sf->outWeight->header, sf->inAstrom->fpa, sf->chip, 0.001);
     }
 }
@@ -579 +583 @@
 readAndCopyToOutput(streakFiles *sf, bool exciseAll)
 {
-    bool    updateAstrometry = false;
     if (sf->inImage->pmfile) {
         // image data from pmFPAfile (diff or warp file)
@@ -597 +600 @@
         streaksExit("", PS_EXIT_UNKNOWN_ERROR);
     }
-    // For the chip level files, copy the WCS from the astrometry file to the header
-    // XXX: do we want to do this for raw images as well?
-    if (sf->stage == IPP_STAGE_CHIP) {
-        if (!sf->bilevelAstrometry) {
-            updateAstrometry = true;
-            if (!pmAstromWriteWCS(sf->inImage->header, sf->inAstrom->fpa, sf->chip, 0.001)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to update astrometry for extension %d", sf->extnum);
-                streaksExit("", PS_EXIT_UNKNOWN_ERROR);
-            }
-        }
-    }
     sf->outImage->header =  psMemIncrRefCounter(sf->inImage->header);
     if (sf->recImage) {
@@ -640 +632 @@
             }
             addDestreakKeyword(sf->outMask->header);
-            if (updateAstrometry) {
-                pmAstromWriteWCS(sf->outMask->header, sf->inAstrom->fpa, sf->chip, 0.001);
-            }
             // Note: we don't excise the mask pixels even if exciseAll is true.
             setupImageRefs(sf->outMask, sf->recMask, sf->inMask, sf->extnum, false);
@@ -675 +664 @@
         }
         addDestreakKeyword(sf->outWeight->header);
-        if (updateAstrometry) {
-            pmAstromWriteWCS(sf->inWeight->header, sf->inAstrom->fpa, sf->chip, 0.001);
-        }
         setupImageRefs(sf->outWeight, sf->recWeight, sf->inWeight, sf->extnum, exciseAll);
 

trunk/magic/remove/src/streaksremove.h

@@ -33 +33 @@
     int         yParity;
     double      exciseValue;
+    psString    program;
 } sFile;
 
+// used for error messages
+extern char * streaksProgram;
 
 typedef enum {
@@ -96 +99 @@
 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))
 #define USE_SUPPLIED_ASTROM(_stage) CHIP_LEVEL_INPUT(_stage)

trunk/magic/remove/src/streaksreplace.c

@@ -5 +5 @@
 static void writeImages(streakFiles *sf, bool exciseImageCube);
 static bool readAndCopyToOutput(streakFiles *sf, bool restoreImageCube);
+
+char *streaksProgram = "streaksreplace";
 
 int main(int argc, char *argv[])