Changeset 13413

Timestamp:

May 17, 2007, 12:43:04 PM (19 years ago)

Author:

Paul Price

Message:

Need to set 'status' to false before pmFPAfileDefineFromArgs so that it doesn't immediately return. Gene promises to fix this API soon!

File:

• trunk/psphot/src/psphotDefineFiles.c (modified) (2 diffs)

trunk/psphot/src/psphotDefineFiles.c

@@ -17 +17 @@
     // the output sources are carried on the input->fpa structures
     if (!pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.OUTPUT")) {
-        psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.OUTPUT");
-        return false;
+        psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.OUTPUT");
+        return false;
     }
 
-    // if we are choosing not to save the output detections, mark this file inactive so it will 
+    // if we are choosing not to save the output detections, mark this file inactive so it will
     // not be written, but will keep the detections in memory for other functions (eg, astrometry)
     if (!psMetadataLookupBool (NULL, recipe, "SAVE.OUTPUT")) {
-        pmFPAfileActivate (config->files, false, "PSPHOT.OUTPUT");
+        pmFPAfileActivate (config->files, false, "PSPHOT.OUTPUT");
     }
 
-    // optionally save the residual image 
+    // optionally save the residual image
     if (psMetadataLookupBool(NULL, recipe, "SAVE.RESID")) {
-        if (!pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.RESID")) {
-            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.RESID");
-            return false;
-        }
+        if (!pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.RESID")) {
+            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.RESID");
+            return false;
+        }
     }
     // optionally save the background model (small FITS image)
     if (psMetadataLookupBool(NULL, recipe, "SAVE.BACKMDL")) {
-        int DX = psMetadataLookupS32 (&status, recipe, "BACKGROUND.XBIN");
-        int DY = psMetadataLookupS32 (&status, recipe, "BACKGROUND.YBIN");
-        if (!pmFPAfileDefineFromFPA (config, input->fpa, DX, DY, "PSPHOT.BACKMDL")) {
-            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.BACKMDL");
-            return false;
-        }
+        int DX = psMetadataLookupS32 (&status, recipe, "BACKGROUND.XBIN");
+        int DY = psMetadataLookupS32 (&status, recipe, "BACKGROUND.YBIN");
+        if (!pmFPAfileDefineFromFPA (config, input->fpa, DX, DY, "PSPHOT.BACKMDL")) {
+            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.BACKMDL");
+            return false;
+        }
     }
     // optionally save the background model's standard deviation (small FITS image)
     if (psMetadataLookupBool(NULL, recipe, "SAVE.BACKMDL.STDEV")) {
-        int DX = psMetadataLookupS32 (&status, recipe, "BACKGROUND.XBIN");
-        int DY = psMetadataLookupS32 (&status, recipe, "BACKGROUND.YBIN");
-        if (!pmFPAfileDefineFromFPA (config, input->fpa, DX, DY, "PSPHOT.BACKMDL.STDEV")) {
-            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.BACKMDL.STDEV");
-            return false;
-        }
+        int DX = psMetadataLookupS32 (&status, recipe, "BACKGROUND.XBIN");
+        int DY = psMetadataLookupS32 (&status, recipe, "BACKGROUND.YBIN");
+        if (!pmFPAfileDefineFromFPA (config, input->fpa, DX, DY, "PSPHOT.BACKMDL.STDEV")) {
+            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.BACKMDL.STDEV");
+            return false;
+        }
     }
     // optionally save the full background image
     if (psMetadataLookupBool(NULL, recipe, "SAVE.BACKGND")) {
-        if (!pmFPAfileDefineFromFPA (config, input->fpa,  1,  1, "PSPHOT.BACKGND")) {
-            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.BACKGND");
-            return false;
-        }
+        if (!pmFPAfileDefineFromFPA (config, input->fpa,  1,  1, "PSPHOT.BACKGND")) {
+            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.BACKGND");
+            return false;
+        }
     }
     // optionally save the background-subtracted image
     if (psMetadataLookupBool(NULL, recipe, "SAVE.BACKSUB")) {
-        if (!pmFPAfileDefineFromFPA (config, input->fpa,  1,  1, "PSPHOT.BACKSUB")) {
-            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.");
-            return false;
-        }
+        if (!pmFPAfileDefineFromFPA (config, input->fpa,  1,  1, "PSPHOT.BACKSUB")) {
+            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.");
+            return false;
+        }
     }
     // optionally save the PSF Model
     if (psMetadataLookupBool(NULL, recipe, "SAVE.PSF")) {
-        if (!pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.PSF.SAVE")) {
-            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.PSF.SAVE");
-            return false;
-        }
+        if (!pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.PSF.SAVE")) {
+            psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.PSF.SAVE");
+            return false;
+        }
     }
 
     // optionally save output plots
     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");
-        }
-        if (!pmFPAfileDefineOutput (config, input->fpa, "SOURCE.PLOT.PSFMODEL")) {
-            psTrace ("psphot", 3, "Cannot find a rule for SOURCE.PLOT.PSFMODEL");
-        }
-        if (!pmFPAfileDefineOutput (config, input->fpa, "SOURCE.PLOT.APRESID")) {
-            psTrace ("psphot", 3, "Cannot find a rule for SOURCE.PLOT.APRESID");
-        }
+        if (!pmFPAfileDefineOutput (config, input->fpa, "SOURCE.PLOT.MOMENTS")) {
+            psTrace ("psphot", 3, "Cannot find a rule for SOURCE.PLOT.MOMENTS");
+        }
+        if (!pmFPAfileDefineOutput (config, input->fpa, "SOURCE.PLOT.PSFMODEL")) {
+            psTrace ("psphot", 3, "Cannot find a rule for SOURCE.PLOT.PSFMODEL");
+        }
+        if (!pmFPAfileDefineOutput (config, input->fpa, "SOURCE.PLOT.APRESID")) {
+            psTrace ("psphot", 3, "Cannot find a rule for SOURCE.PLOT.APRESID");
+        }
     }
 
-    if (psMetadataLookupPtr(NULL, config->arguments, "SRC")) { 
-        pmFPAfileDefineFromArgs (&status, config, "PSPHOT.INPUT.CMF", "SRC");
-        if (!status) {
-            psError(PSPHOT_ERR_CONFIG, false, "Failed to find/build PSPHOT.INPUT.CMF");
-            return status;
-        }
+    if (psMetadataLookupPtr(NULL, config->arguments, "SRC")) {
+        status = false;
+        pmFPAfileDefineFromArgs (&status, config, "PSPHOT.INPUT.CMF", "SRC");
+        if (!status) {
+            psError(PSPHOT_ERR_CONFIG, false, "Failed to find/build PSPHOT.INPUT.CMF");
+            return status;
+        }
     }
 
-    if (psMetadataLookupPtr(NULL, config->arguments, "PSF")) { 
-        pmFPAfileDefineFromArgs (&status, config, "PSPHOT.PSF.LOAD", "PSF");
-        if (!status) {
-            psError(PSPHOT_ERR_CONFIG, false, "Failed to find/build PSPHOT.SRC");
-            return status;
-        }
+    if (psMetadataLookupPtr(NULL, config->arguments, "PSPHOT.PSF")) {
+        status = false;
+        pmFPAfileDefineFromArgs (&status, config, "PSPHOT.PSF.LOAD", "PSPHOT.PSF");
+        if (!status) {
+            psError(PSPHOT_ERR_CONFIG, false, "Failed to find/build PSPHOT.SRC");
+            return status;
+        }
     }
 
@@ -109 +111 @@
 }
 
-    // if we have requested PSPHOT.SRC, attempt to resolve it 
+    // 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)    
+# if (0)
     // optionally load the PSF Model and/or fixed stars
     // XXX add this back in later