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

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

@@ -25 +25 @@
         astrom = input;
     }
-    if (!pswarpLoadAstrometry (config, input, astrom)) {
+    if (!pswarpLoadAstrometry (input, astrom, config)) {
         psError(PSWARP_ERR_CONFIG, false, "problem loading input astrometry\n");
         return false;
@@ -41 +41 @@
         return false;
     }
-    if (!pswarpLoadAstrometry (config, output, skycell)) {
+    if (!pswarpLoadAstrometry (output, skycell, config)) {
         psError(PSWARP_ERR_CONFIG, false, "problem loading output astrometry\n");
         return false;
@@ -50 +50 @@
 
     // find the R,D center for the skycell, use for common projection
-    psProjection *frame = pswarpLocalFrame (output->fpa);
+    psProjection *frame = pswarpLocalFrame (skycell->fpa);
 
     // generate Lmin,max, Mmin,max for both datasets
+    fprintf (stderr, "srcBounds:\n");
+    // pswarpBounds *srcBounds = pswarpMakeBounds (astrom->fpa, frame);
     pswarpBounds *srcBounds = pswarpMakeBounds (input->fpa, frame);
-    pswarpBounds *tgtBounds = pswarpMakeBounds (output->fpa, frame);
+
+    fprintf (stderr, "srcBounds:\n");
+    pswarpBounds *tgtBounds = pswarpMakeBounds (skycell->fpa, frame);
+
     pswarpFindOverlap (output->fpa, srcBounds, tgtBounds);
 
+    // XXX the loop below generates the output pixels. should this be deferred until 
+    // we actually need them?
     // Generate the output chips (pixels on output->fpa, concepts from skycell->fpa)
     pmFPAview *view = pmFPAviewAlloc(0);
@@ -63 +70 @@
     while ((chip = pmFPAviewNextChip (view, output->fpa, 1)) != NULL) {
         psTrace ("pswarp", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
-        if (!chip->process || !chip->file_exists) { continue; }
+        if (!chip->process) { continue; }
         pmCell *cell;
         while ((cell = pmFPAviewNextCell (view, output->fpa, 1)) != NULL) {
             psTrace ("pswarp", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
-            if (!cell->process || !cell->file_exists) { continue; }
+            if (!cell->process) { continue; }
+
+            pmCell *refcell = pmFPAviewThisCell(view, skycell->fpa); ///< Target cell
 
             // we've got the output astrom header
-            pmHDU *hdu = pmHDUFromCell(cell); ///< HDU for source
+            pmHDU *hdu = pmHDUFromCell(refcell); ///< HDU for source
             if (!hdu || !hdu->header) {
                 psError(PM_ERR_PROG, false, "Unable to find header for sky cell.");
@@ -92 +101 @@
             // copy the image concepts from the skycell 
             bool status = false;
-            pmCell *refcell = pmFPAviewThisCell(view, skycell->fpa); ///< Target cell
             psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.XBIN");
             psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.YBIN");
@@ -101 +109 @@
             psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.X0");
             psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.Y0");
+
+            chip->data_exists = true;
+            chip->file_exists = true;
+            cell->data_exists = true;
+            cell->file_exists = true;
+
+# if (0)
+            // ******* this chunk comes from pswarpLoop, but should be done when the output chip is generated
+            pmHDU *outHDU = pmHDUFromCell (cell);           ///< HDU for the output warped image
+            outHDU->header = psMetadataCopy(outHDU->header, hdu->header);
+            pswarpVersionHeader(outHDU->header);
+# endif
         }
     }