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

Timestamp:

Apr 26, 2013, 9:07:23 AM (13 years ago)

Author:

eugene

Message:

major mods to allow multichip output

File:

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

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

@@ -128 +128 @@
 
     // The output skycell
-    pmFPAfile *output = pmFPAfileDefineSkycell(config, NULL, "PSWARP.OUTPUT");
+    // XXX The output needs to be in a more generic format, not just skycell.
+    // I need to understand how badly things depend on SKYCELL being a special format
+    // (is it just pswarp, or is it everything downstream as well??)
+    // XXX for a test, generate a generic output (based on output target astrometry)
+    // XXX pmFPAfile *output = pmFPAfileDefineSkycell(config, NULL, "PSWARP.OUTPUT");
+    pmFPAfile *output = pmFPAfileDefineOutputForFormat(config, NULL, "PSWARP.OUTPUT", skycell->cameraName, skycell->formatName);
     if (!output) {
         psError(psErrorCodeLast(), false, "Failed to build FPA from PSWARP.OUTPUT");
@@ -135 +140 @@
     output->save = true;
 
+    // XXX for a test, skip these
+# if (0)
     pmFPAfile *outMask = pmFPAfileDefineSkycell(config, output->fpa, "PSWARP.OUTPUT.MASK");
     if (!outMask) {
@@ -159 +166 @@
         outSources->save = true;
     }
+# endif
 
     if (inBackground && psMetadataLookupBool(&mdok, recipe, "BACKGROUND.MODEL")) {
@@ -172 +180 @@
     }
     
-    if (psMetadataLookupBool(&mdok, recipe, "PSF")) {
+    /// XXX TEST 
+    if (false && psMetadataLookupBool(&mdok, recipe, "PSF")) {
         // This file, PSPHOT.INPUT, is just used as a carrier; output files (eg, PSPHOT.RESID) are defined by
         // psphotDefineFiles