Changeset 35512 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpDefineLayout.c

Timestamp:

May 5, 2013, 2:20:46 PM (13 years ago)

Author:

eugene

Message:

stats is basically working now

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarpDefineLayout.c (modified) (2 diffs)

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

@@ -53 +53 @@
 
     // generate Lmin,max, Mmin,max for both datasets
-    fprintf (stderr, "srcBounds:\n");
-    // pswarpBounds *srcBounds = pswarpMakeBounds (astrom->fpa, frame);
     pswarpBounds *srcBounds = pswarpMakeBounds (input->fpa, frame);
-
-    fprintf (stderr, "srcBounds:\n");
     pswarpBounds *tgtBounds = pswarpMakeBounds (skycell->fpa, frame);
 
-    pswarpFindOverlap (output->fpa, srcBounds, tgtBounds);
+    // find the output (tgt) chips which overlap the input (src) chips
+    pswarpFindOverlap (input->fpa, output->fpa, srcBounds, tgtBounds);
 
-    // XXX the loop below generates the output pixels. should this be deferred until 
-    // we actually need them?
+    // The loop below generates the output pixels. XXX 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);
+
+    // generate the output hdu and contents bits
+    pmFPAAddSourceFromFormat(output->fpa, output->format);
 
     pmChip *chip;
@@ -115 +116 @@
             cell->file_exists = true;
 
-# if (0)
-            // ******* this chunk comes from pswarpLoop, but should be done when the output chip is generated
+            // copy the basic headers across from astrom ref to output
             pmHDU *outHDU = pmHDUFromCell (cell);           ///< HDU for the output warped image
             outHDU->header = psMetadataCopy(outHDU->header, hdu->header);
             pswarpVersionHeader(outHDU->header);
-# endif
         }
     }
-
-    // XXX not sure what this does...
-    pmFPAviewReset (view);
-    pmFPAAddSourceFromView(output->fpa, view, output->format);
-
     psFree (view);
     return true;