Changeset 14892

Timestamp:

Sep 19, 2007, 12:04:37 PM (19 years ago)

Author:

Paul Price

Message:

Using newly defined functions that define files based on other files, rather than on an FPA. The FPA doesn't carry the format, while the file does. This was required in order to get psphot to work on a warped image in pswarp --- it didn't know the format, so was attempting to set it to the default which was for the detector camera, not the skycell camera.

File:

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

trunk/psphot/src/psphotDefineFiles.c

@@ -16 +16 @@
 
     // the output sources are carried on the input->fpa structures
-    pmFPAfile *outsources = pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.OUTPUT");
+    pmFPAfile *outsources = pmFPAfileDefineOutputFromFile (config, input, "PSPHOT.OUTPUT");
     if (!outsources) {
         psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.OUTPUT");
@@ -27 +27 @@
     if (!psMetadataLookupBool (NULL, recipe, "SAVE.OUTPUT")) {
         pmFPAfileActivate (config->files, false, "PSPHOT.OUTPUT");
-        outsources->save = false;
+        outsources->save = false;
     }
 
     // optionally save the residual image
     if (psMetadataLookupBool(NULL, recipe, "SAVE.RESID")) {
-        pmFPAfile *output = pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.RESID");
-        if (!output) {
+        pmFPAfile *output = pmFPAfileDefineOutputFromFile (config, input, "PSPHOT.RESID");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.RESID");
             return false;
         }
-        output->save = true;
+        output->save = true;
     }
     // optionally save the background model (small FITS image)
@@ -43 +43 @@
         int DX = psMetadataLookupS32 (&status, recipe, "BACKGROUND.XBIN");
         int DY = psMetadataLookupS32 (&status, recipe, "BACKGROUND.YBIN");
-        pmFPAfile *output = pmFPAfileDefineFromFPA (config, input->fpa, DX, DY, "PSPHOT.BACKMDL");
-        if (!output) {
+        pmFPAfile *output = pmFPAfileDefineFromFile (config, input, DX, DY, "PSPHOT.BACKMDL");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.BACKMDL");
             return false;
         }
-        output->save = true;
+        output->save = true;
     }
     // optionally save the background model's standard deviation (small FITS image)
@@ -54 +54 @@
         int DX = psMetadataLookupS32 (&status, recipe, "BACKGROUND.XBIN");
         int DY = psMetadataLookupS32 (&status, recipe, "BACKGROUND.YBIN");
-        pmFPAfile *output = pmFPAfileDefineFromFPA (config, input->fpa, DX, DY, "PSPHOT.BACKMDL.STDEV");
-        if (!output) {
+        pmFPAfile *output = pmFPAfileDefineFromFile (config, input, DX, DY, "PSPHOT.BACKMDL.STDEV");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.BACKMDL.STDEV");
             return false;
         }
-        output->save = true;
+        output->save = true;
     }
     // optionally save the full background image
     if (psMetadataLookupBool(NULL, recipe, "SAVE.BACKGND")) {
-        pmFPAfile *output = pmFPAfileDefineFromFPA (config, input->fpa,  1,  1, "PSPHOT.BACKGND");
-        if (!output) {
+        pmFPAfile *output = pmFPAfileDefineFromFile (config, input,  1,  1, "PSPHOT.BACKGND");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.BACKGND");
             return false;
         }
-        output->save = true;
+        output->save = true;
     }
     // optionally save the background-subtracted image
     if (psMetadataLookupBool(NULL, recipe, "SAVE.BACKSUB")) {
-        pmFPAfile *output = pmFPAfileDefineFromFPA (config, input->fpa,  1,  1, "PSPHOT.BACKSUB");
-        if (!output) {
+        pmFPAfile *output = pmFPAfileDefineFromFile (config, input,  1,  1, "PSPHOT.BACKSUB");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.");
             return false;
         }
-        output->save = true;
+        output->save = true;
     }
     // optionally save the PSF Model
     if (psMetadataLookupBool(NULL, recipe, "SAVE.PSF")) {
-        pmFPAfile *output = pmFPAfileDefineOutput (config, input->fpa, "PSPHOT.PSF.SAVE");
-        if (!output) {
+        pmFPAfile *output = pmFPAfileDefineOutputFromFile (config, input, "PSPHOT.PSF.SAVE");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for PSPHOT.PSF.SAVE");
             return false;
         }
-        output->save = true;
+        output->save = true;
     }
 
@@ -92 +92 @@
     // allow specific plots only
     if (psMetadataLookupBool(NULL, recipe, "SAVE.PLOTS")) {
-        pmFPAfile *output = NULL;
-        output = pmFPAfileDefineOutput (config, input->fpa, "SOURCE.PLOT.MOMENTS");
-        if (!output) {
+        pmFPAfile *output = NULL;
+        output = pmFPAfileDefineOutputFromFile (config, input, "SOURCE.PLOT.MOMENTS");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for SOURCE.PLOT.MOMENTS");
             return false;
         }
-        output->save = true;
-        output = pmFPAfileDefineOutput (config, input->fpa, "SOURCE.PLOT.PSFMODEL");
-        if (!output) {
+        output->save = true;
+        output = pmFPAfileDefineOutputFromFile (config, input, "SOURCE.PLOT.PSFMODEL");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for SOURCE.PLOT.PSFMODEL");
             return false;
         }
-        output->save = true;
-        output = pmFPAfileDefineOutput (config, input->fpa, "SOURCE.PLOT.APRESID");
-        if (!output) {
+        output->save = true;
+        output = pmFPAfileDefineOutputFromFile (config, input, "SOURCE.PLOT.APRESID");
+        if (!output) {
             psError(PSPHOT_ERR_CONFIG, false, "Cannot find a rule for SOURCE.PLOT.APRESID");
             return false;
         }
-        output->save = true;
+        output->save = true;
     }