Changeset 35118 for trunk/ppBackground/src/ppBackgroundArguments.c

Timestamp:

Feb 7, 2013, 1:40:20 PM (13 years ago)

Author:

bills

Message:

Changes to the chip backround and warp background stages.
In chip background stage

Apply an auxillary mask selected for now from hard coded location.
Read input variance and include it in the output data products

In warp background stage

Read and write variance images
Get smf from alternate camRun. For now using a hard coded label
eventually from the warpBackgroundRun

File:

• trunk/ppBackground/src/ppBackgroundArguments.c (modified) (3 diffs)

trunk/ppBackground/src/ppBackgroundArguments.c

@@ -49 +49 @@
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-image", 0, "Filename of image (required)", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-mask", 0, "Filename of mask", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-variance", 0, "Filename of variance image", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-auxmask", 0, "Filename of auxiliary mask", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-stats", 0, "Output statistics file", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-dumpconfig", 0, "Output configuration file", NULL);
@@ -59 +61 @@
     data->imageName = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-image"));
     data->maskName = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-mask"));
+    data->varianceName = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-variance"));
+    data->auxMaskName = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-auxmask"));
     data->outRoot = psStringCopy(argv[1]);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "OUTPUT", 0, "Output root name", data->outRoot);
@@ -64 +68 @@
     psTrace("ppBackground", 1, "Done reading command-line arguments\n");
 
-    if (!data->patternName && !data->backgroundName) {
-        psError(PPBACKGROUND_ERR_CONFIG, true, "Must specify at least one of -pattern and -background");
+    if (!data->patternName && !data->backgroundName && !data->auxMaskName) {
+        psError(PPBACKGROUND_ERR_CONFIG, true, "Must specify at least one of -pattern and -background -auxmask");
         return false;
     }