Changeset 35539 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpParseCamera.c

Timestamp:

May 9, 2013, 10:00:41 AM (13 years ago)

Author:

eugene

Message:

add source for output, output.bkgmodel, and psphotInput in psphotParseCamera; do not activate PSPHOT.INPUT; if a background model is not supplied do not attempt to generate one; generate the metadata for the output bkgmodel

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarpParseCamera.c (modified) (5 diffs)

branches/eam_branches/ipp-20130419/pswarp/src/pswarpParseCamera.c

@@ -76 +76 @@
     }
     output->save = true;
+    pmFPAAddSourceFromFormat(output->fpa, output->format); // ** builds the HDUs, is this OK?
 
     pmFPAfile *outMask = useInputCamera ?
@@ -116 +117 @@
             pmFPAfileDefineSkycell(config, NULL, "PSWARP.OUTPUT.BKGMODEL"):
             pmFPAfileDefineOutputForFormat(config, NULL, "PSWARP.OUTPUT.BKGMODEL", skycell->cameraName, skycell->formatName);
+        if (!outBackground) {
+            psError(psErrorCodeLast(), false, "Failed to build FPA from PSWARP.OUTPUT.BKGMODEL");
+            return false;
+        }
         outBackground->xBin = psMetadataLookupS32(&status, recipe, "BKG.XGRID");
         outBackground->yBin = psMetadataLookupS32(&status, recipe, "BKG.YGRID");
-        
-        if (!outBackground) {
-            psError(psErrorCodeLast(), false, "Failed to build FPA from PSWARP.OUTPUT.BKGMODEL");
-            return false;
-        }
         outBackground->save = true;
+        pmFPAAddSourceFromFormat(outBackground->fpa, outBackground->format); // ** builds the HDUs, is this OK?
     }
 
@@ -136 +137 @@
         }
         psphotInput->src = psMemIncrRefCounter(output->fpa);
+        pmFPAAddSourceFromFormat(psphotInput->fpa, psphotInput->format); // ** builds the HDUs, is this OK?
 
         // specify the number of psphot input images (psphotReadout loops over all input images)
@@ -232 +234 @@
         foundBackground = true;
     } else {
+      // cannot do the background model if an input is not supplied.
+      psMetadataAddBool (config->arguments, PS_LIST_TAIL, "BACKGROUND.MODEL", PS_META_REPLACE, "no input background supplied", false);
       psLogMsg("pswarp", PS_LOG_INFO, "No background models supplied");
     }
@@ -329 +333 @@
             psLogMsg("pswarp", PS_LOG_INFO, "No variance supplied");
         }
+
+        // XXX for now we do not have an option to supply a background model set in multi input mode
+        psMetadataAddBool (config->arguments, PS_LIST_TAIL, "BACKGROUND.MODEL", PS_META_REPLACE, "no input background supplied", false);
     }