Changeset 13528 for trunk/psphot/src

Timestamp:

May 25, 2007, 5:09:20 PM (19 years ago)

Author:

eugene

Message:

changed the pmFPAfileDefine functions to not require an input status value

Location:

trunk/psphot/src

Files:

• psphotDefineFiles.c (modified) (3 diffs)
• psphotParseCamera.c (modified) (1 diff)

trunk/psphot/src/psphotDefineFiles.c

@@ -75 +75 @@
 
     // optionally save output plots
+    // allow specific plots only
     if (psMetadataLookupBool(NULL, recipe, "SAVE.PLOTS")) {
         if (!pmFPAfileDefineOutput (config, input->fpa, "SOURCE.PLOT.MOMENTS")) {
-            psTrace ("psphot", 3, "Cannot find a rule for SOURCE.PLOT.MOMENTS");
+            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for SOURCE.PLOT.MOMENTS");
+            return false;
         }
         if (!pmFPAfileDefineOutput (config, input->fpa, "SOURCE.PLOT.PSFMODEL")) {
-            psTrace ("psphot", 3, "Cannot find a rule for SOURCE.PLOT.PSFMODEL");
+            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for SOURCE.PLOT.PSFMODEL");
+            return false;
         }
         if (!pmFPAfileDefineOutput (config, input->fpa, "SOURCE.PLOT.APRESID")) {
-            psTrace ("psphot", 3, "Cannot find a rule for SOURCE.PLOT.APRESID");
+            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for SOURCE.PLOT.APRESID");
+            return false;
         }
     }
 
     if (psMetadataLookupPtr(NULL, config->arguments, "SRC")) {
-        status = false;
-        pmFPAfileDefineFromArgs (&status, config, "PSPHOT.INPUT.CMF", "SRC");
-        if (!status) {
+        if (!pmFPAfileDefineFromArgs (&status, config, "PSPHOT.INPUT.CMF", "SRC")) {
             psError(PSPHOT_ERR_CONFIG, false, "Failed to find/build PSPHOT.INPUT.CMF");
             return status;
@@ -97 +99 @@
 
     if (psMetadataLookupPtr(NULL, config->arguments, "PSPHOT.PSF")) {
-        status = false;
         pmFPAfileBindFromArgs(&status, input, config, "PSPHOT.PSF.LOAD", "PSPHOT.PSF");
-//        pmFPAfileDefineFromArgs (&status, config, "PSPHOT.PSF.LOAD", "PSPHOT.PSF");
         if (!status) {
             psError(PSPHOT_ERR_CONFIG, false, "Failed to find/build PSPHOT.PSF.LOAD");
@@ -111 +111 @@
     return true;
 }
-
-    // if we have requested PSPHOT.SRC, attempt to resolve it
-    // this is a list of input sources, stored in a psphot output format file
-    // XXX this was disabled after the switch to CHIP-mosaicked images.  It needs to be tested
-    // before it is added back into the code.
-# if (0)
-    // optionally load the PSF Model and/or fixed stars
-    // XXX add this back in later
-    // pmFPAfileBindFromArgs (NULL, input, config, "PSPHOT.PSF", "PSF");
-# endif
-

trunk/psphot/src/psphotParseCamera.c

@@ -17 +17 @@
     // if MASK or WEIGHT was supplied on command line, bind files to 'load'
     // the mask and weight will be mosaicked with the image
-    pmFPAfileBindFromArgs (NULL, load, config, "PSPHOT.MASK",   "MASK");
-    pmFPAfileBindFromArgs (NULL, load, config, "PSPHOT.WEIGHT", "WEIGHT");
+    pmFPAfileBindFromArgs (&status, load, config, "PSPHOT.MASK",   "MASK");
+    if (!status) {
+        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        return NULL;
+    }
+
+    pmFPAfileBindFromArgs (&status, load, config, "PSPHOT.WEIGHT", "WEIGHT");
+    if (!status) {
+        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        return NULL;
+    }
 
     // the psphot analysis is performed on chips