Changeset 36161 for branches/eam_branches/ipp-20130904/psphot/src/psphotFullForceArguments.c

Timestamp:

Sep 30, 2013, 5:41:48 AM (13 years ago)

Author:

eugene

Message:

getting psphotFullForce to run (not quite there)

File:

• branches/eam_branches/ipp-20130904/psphot/src/psphotFullForceArguments.c (modified) (2 diffs)

branches/eam_branches/ipp-20130904/psphot/src/psphotFullForceArguments.c

@@ -7 +7 @@
 
     int N;
-    bool status, status1, status2;
+    bool status, status1, status2, status3;
 
     // load config data from default locations
@@ -73 +73 @@
     pmConfigFileSetsMD (config->arguments, &argc, argv, "VARIANCE",   "-variance", "-variancelist");
 
-    // XXX make psf model optional?
-    status = pmConfigFileSetsMD (config->arguments, &argc, argv, "PSPHOT.PSF", "-psf",      "-psflist");
-    if (!status) {
-        psError(PSPHOT_ERR_ARGUMENTS, true, "No psf model is supplied (use -psf)");
-        usage(argv[0], config->arguments, config, PS_EXIT_CONFIG_ERROR);
-    }
-
-    status1 = pmConfigFileSetsMD (config->arguments, &argc, argv, "SRC", "-src", "-srclist");
+    pmConfigFileSetsMD (config->arguments, &argc, argv, "PSPHOT.PSF", "-psf",      "-psflist");
+
+    status1 = pmConfigFileSetsMD (config->arguments, &argc, argv, "SRC",     "-src",     "-srclist");
     status2 = pmConfigFileSetsMD (config->arguments, &argc, argv, "SRCTEXT", "-srctext", "-srctextlist");
+    status3 = pmConfigFileSetsMD (config->arguments, &argc, argv, "FORCE",   "-force",   "-forcelist");
     
-    if (!status1 && !status2) {
-        psError(PSPHOT_ERR_ARGUMENTS, true, "No source list is supplied (use one of -src, -srctext, -srclist, or -srctextlist)");
+    if (!(status1 || status2 || status3)) {
+      // XXX require -force version?
+        psError(PSPHOT_ERR_ARGUMENTS, true, "No source list is supplied (use one of -force, -forcelist, -src, -srctext, -srclist, or -srctextlist)");
         usage(argv[0], config->arguments, config, PS_EXIT_CONFIG_ERROR);
     }