Changeset 35539 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpDefineLayout.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/pswarpDefineLayout.c (modified) (2 diffs)

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

@@ -95 +95 @@
     bool bilevelAstrometry = psMetadataLookupBool (NULL, skycell->fpa->analysis, "ASTROMETRY.BILEVEL");
     
-    // generate the output hdu and contents bits
-    pmFPAAddSourceFromFormat(output->fpa, output->format);
-
     // XXX this is a bit muddled : we are setting up the astrometry elements for the output
     // background model here instead of in pswarpLoadAstrometry, where it would be more natural
@@ -106 +103 @@
 
     // if we have an output background model, generate hdu, etc and supply astrometry
-    if (bkgModel) {
-        pmFPAAddSourceFromFormat(bkgModel->fpa, bkgModel->format);
-
-        if (bilevelAstrometry) {
-            // top-level elements of the bkgModel astrometry
-            bkgModel->fpa->toTPA   = psMemIncrRefCounter (skycell->fpa->toTPA);
-            bkgModel->fpa->fromTPA = psMemIncrRefCounter (skycell->fpa->fromTPA);
-            bkgModel->fpa->toSky   = psMemIncrRefCounter (skycell->fpa->toSky);
-        }
+    if (bkgModel && bilevelAstrometry) {
+        // top-level elements of the bkgModel astrometry
+        bkgModel->fpa->toTPA   = psMemIncrRefCounter (skycell->fpa->toTPA);
+        bkgModel->fpa->fromTPA = psMemIncrRefCounter (skycell->fpa->fromTPA);
+        bkgModel->fpa->toSky   = psMemIncrRefCounter (skycell->fpa->toSky);
     }