Changeset 35893

Timestamp:

Aug 6, 2013, 10:57:50 AM (13 years ago)

Author:

bills

Message:

add argument to ppstamp to take a metadata config file with keywords to
add to the image fits headers

Location:

trunk/pstamp/src

Files:

• ppstampArguments.c (modified) (2 diffs)
• ppstampMakeStamp.c (modified) (1 diff)
• ppstampOptions.c (modified) (2 diffs)
• ppstampOptions.h (modified) (1 diff)

trunk/pstamp/src/ppstampArguments.c

@@ -26 +26 @@
     fprintf(stderr, "   [-variance var_image] : variance image\n");
     fprintf(stderr, "   [-sources sources]    : sources cmf (ignored for chip stage)\n");
+    fprintf(stderr, "   [-forheader mdcfile   : metadata config file contaiing keywords to add to fits headers\n");
     fprintf(stderr, "   [-stage stage]        : stage of input image (raw, chip, warp, stack, diff)\n");
     fprintf(stderr, "   [-write_jpeg]         : write a JPEG  format of the image stamp\n");
@@ -135 +136 @@
         usage();
     }
+
+    if ((argnum = psArgumentGet(argc, argv, "-forheader"))) {
+        psArgumentRemove(argnum, &argc, argv);
+        if (argnum >= argc) {
+            psError(PSTAMP_ERR_ARGUMENTS, true, "metadata config filename value required with option -forheader");
+            usage();
+        }
+
+        const char *filename = argv[argnum];
+        psArgumentRemove(argnum, &argc, argv);
+
+        unsigned int nFail = 0;
+        options->headerAdditions = psMetadataConfigRead(NULL, &nFail, filename, false);
+        if (nFail || !options->headerAdditions) {
+            psError(PS_ERR_UNKNOWN, false, "failed to read metadata from %s", filename);
+            return false;
+        }
+    }
     
     if ((argnum = psArgumentGet(argc, argv, "-no_censor_masked"))) {

trunk/pstamp/src/ppstampMakeStamp.c

@@ -165 +165 @@
 
     ppstampVersionMetadata(outHDU->header, options);
+
+    // copy any user supplied keywords
+    if (options->headerAdditions) {
+        if (!psMetadataOverlay(outHDU->header, options->headerAdditions)) {
+            psError(PS_ERR_UNKNOWN, false, "Failed to copy header additions to output\n");
+            return false;
+        }
+    }
+
 
     return true;

trunk/pstamp/src/ppstampOptions.c

@@ -10 +10 @@
 {
     psFree(options->chipName);
+    psFree(options->headerAdditions);
 }
 
@@ -30 +31 @@
     options->cellName  = NULL;
     options->stage  = NULL;
+    options->headerAdditions = NULL;
     options->censorMasked = false;
     options->writeJPEG = false;

trunk/pstamp/src/ppstampOptions.h

@@ -12 +12 @@
     psString    cellName;
     psString    stage;
+    psMetadata  *headerAdditions;
     bool        censorMasked;
     bool        writeJPEG;