Changeset 23352 for branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarpArguments.c

Timestamp:

Mar 17, 2009, 12:08:50 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• pswarp/src/pswarpArguments.c (modified) (4 diffs)

branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarpArguments.c

@@ -41 +41 @@
         if ((arg = psArgumentGet(argc, argv, "-psphot-visual"))) {
             psArgumentRemove(arg, &argc, argv);
-            psphotSetVisual(true);
+            pmVisualSetVisual(true);
         }
     }
@@ -87 +87 @@
 
 
-    if (!pmConfigFileSetsMD (config->arguments, &argc, argv, "INPUT", "-file", "-list")) {
-        psError(PSWARP_ERR_ARGUMENTS, true, "Missing -file (input) or -list (input)");
-        return NULL;
-    }
-
-    // the mask and variance entries are optional (build from gain?)
-    pmConfigFileSetsMD (config->arguments, &argc, argv, "MASK",   "-mask",   "-masklist");
+    pmConfigFileSetsMD (config->arguments, &argc, argv, "INPUT", "-file", "-list");
+    pmConfigFileSetsMD (config->arguments, &argc, argv, "MASK", "-mask", "-masklist");
     pmConfigFileSetsMD (config->arguments, &argc, argv, "VARIANCE", "-variance", "-variancelist");
 
@@ -105 +100 @@
 
     // output position is fixed
-    psMetadataAddStr (config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "", argv[1]);
+    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "", argv[1]);
 
     // skycell position is fixed
     array = psArrayAlloc(1);
-    array->data[0] = psStringCopy (argv[2]);
-    status = psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "SKYCELL", PS_DATA_ARRAY, "", array);
-    psFree (array);
+    array->data[0] = psStringCopy(argv[2]);
+    status = psMetadataAddPtr(config->arguments, PS_LIST_TAIL, "SKYCELL", PS_DATA_ARRAY, "", array);
+    psFree(array);
 
     psTrace("pswarp", 1, "Done with pswarpArguments...\n");
-    return (config);
+    return config;
 }
 
@@ -204 +199 @@
     psTrace("pswarp", 1, "Done with pswarpArguments...\n");
 
-    // Dump configuration, now that's it's settled
-    psString dump_file =  psMetadataLookupStr(&status, config->arguments, "DUMP_CONFIG");
-    if (dump_file) {
-        const char *skyCamera = psMetadataLookupStr(NULL, config->arguments,
-                                                    "SKYCELL.CAMERA");  ///< Name of camera for skycell
-        pmConfigCamerasCull(config, skyCamera);
-        pmConfigRecipesCull(config, "PSWARP,PPSTATS,PSPHOT,MASKS");
-
-        pmFPAfile *input = psMetadataLookupPtr(NULL, config->files, "PSWARP.INPUT"); // Input file
-        pmConfigDump(config, input->fpa, dump_file);
-    }
-
     return (config);
 }