Changeset 35413 for branches/eam_branches/ipp-20130307/pswarp/src/pswarpDefine.c

Timestamp:

Apr 19, 2013, 3:42:02 PM (13 years ago)

Author:

eugene

Message:

merged from trunk

Location:

branches/eam_branches/ipp-20130307

Files:

• . (modified) (1 prop)
• pswarp/src/pswarpDefine.c (modified) (1 diff)

branches/eam_branches/ipp-20130307/pswarp/src/pswarpDefine.c

@@ -38 +38 @@
     }
     
-    // open the full skycell file; no need to defer different depths. only load the header data
-    pmFPAview *view = pmFPAviewAlloc (0);
-    pmFPAfileOpen (skycell, view, config);
+    // Read the output astrometry
+    // XXX this section loops over the input skycell to load the header info
+    {
+        pmFPAview *view = pmFPAviewAlloc(0);
 
-    // Read header and create target
-    {
-        if (!pmFPAReadHeaderSet(skycell->fpa, skycell->fits, config)) {
-            psError(psErrorCodeLast(), false, "Unable to read headers for skycell.");
-            psFree(view);
-            return false;
-        }
-        view->chip = 0;
-        view->cell = 0;
-        view->readout = 0;
-        pmCell *source = pmFPAfileThisCell(config->files, view, "PSWARP.SKYCELL"); ///< Source cell
-        pmHDU *hdu = pmHDUFromCell(source); ///< HDU for source
-        if (!hdu || !hdu->header) {
-            psError(PM_ERR_PROG, false, "Unable to find header for sky cell.");
-            psFree(view);
-            return false;
-        }
-        int numCols = psMetadataLookupS32(NULL, hdu->header, "NAXIS1"); ///< Number of columns
-        int numRows = psMetadataLookupS32(NULL, hdu->header, "NAXIS2"); ///< Number of rows
-        if ((numCols == 0) || (numRows == 0)) {
-            psError(PSWARP_ERR_DATA, false, "skycell has invalid dimensions %d x %d", numCols, numRows);
-            psFree(view);
-            return false;
-        }
+        pmChip *chip;
+        if (!pmFPAfileRead (skycell, view, config)) {
+            psError(PS_ERR_IO, false, "failed READ at FPA %s", skycell->name);
+            psFree(view);
+            return false;
+        }
+        while ((chip = pmFPAviewNextChip (view, skycell->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 (!pmFPAfileRead (skycell, view, config)) {
+                psError(psErrorCodeLast(), false, "failed READ at CHIP %s", skycell->name);
+                psFree(view);
+                return false;
+            }
+            pmCell *cell;
+            while ((cell = pmFPAviewNextCell (view, skycell->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 (!pmFPAfileRead (skycell, view, config)) {
+                    psError(psErrorCodeLast(), false, "failed READ at CELL %s", skycell->name);
+                    psFree(view);
+                    return false;
+                }
+                if (!pmFPAfileClose(skycell, view)) {
+                    psError(psErrorCodeLast(), false, "failed CLOSE at CELL %s", skycell->name);
+                    psFree (view);
+                    return false;
+                }
 
-        pmCell *target = pmFPAviewThisCell(view, output->fpa); ///< Target cell
-        pmReadout *readout = pmReadoutAlloc(target); ///< Target readout
-        readout->image = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-        psImageInit(readout->image, NAN);
-        psFree(readout);                // Drop reference
-
-        bool status = false;
-        psMetadataItemSupplement(&status, target->concepts, source->concepts, "CELL.XBIN");
-        psMetadataItemSupplement(&status, target->concepts, source->concepts, "CELL.YBIN");
-        psMetadataItemSupplement(&status, target->concepts, source->concepts, "CELL.XSIZE");
-        psMetadataItemSupplement(&status, target->concepts, source->concepts, "CELL.YSIZE");
-        psMetadataItemSupplement(&status, target->concepts, source->concepts, "CELL.XPARITY");
-        psMetadataItemSupplement(&status, target->concepts, source->concepts, "CELL.YPARITY");
-        psMetadataItemSupplement(&status, target->concepts, source->concepts, "CELL.X0");
-        psMetadataItemSupplement(&status, target->concepts, source->concepts, "CELL.Y0");
+                // we've got the output astrom header
+                pmHDU *hdu = pmHDUFromCell(cell); ///< HDU for source
+                if (!hdu || !hdu->header) {
+                    psError(PM_ERR_PROG, false, "Unable to find header for sky cell.");
+                    psFree(view);
+                    return false;
+                }
+                int numCols = psMetadataLookupS32(NULL, hdu->header, "NAXIS1"); ///< Number of columns
+                int numRows = psMetadataLookupS32(NULL, hdu->header, "NAXIS2"); ///< Number of rows
+                if ((numCols == 0) || (numRows == 0)) {
+                    psError(PSWARP_ERR_DATA, false, "skycell has invalid dimensions %d x %d", numCols, numRows);
+                    psFree(view);
+                    return false;
+                }
+                
+                // XXX generate the output pixels
+                pmCell *target = pmFPAviewThisCell(view, output->fpa); ///< Target cell
+                pmReadout *readout = pmReadoutAlloc(target); ///< Target readout
+                readout->image = psImageAlloc(numCols, numRows, PS_TYPE_F32);
+                psImageInit(readout->image, NAN);
+                psFree(readout);                // Drop reference
+                
+                bool status = false;
+                psMetadataItemSupplement(&status, target->concepts, cell->concepts, "CELL.XBIN");
+                psMetadataItemSupplement(&status, target->concepts, cell->concepts, "CELL.YBIN");
+                psMetadataItemSupplement(&status, target->concepts, cell->concepts, "CELL.XSIZE");
+                psMetadataItemSupplement(&status, target->concepts, cell->concepts, "CELL.YSIZE");
+                psMetadataItemSupplement(&status, target->concepts, cell->concepts, "CELL.XPARITY");
+                psMetadataItemSupplement(&status, target->concepts, cell->concepts, "CELL.YPARITY");
+                psMetadataItemSupplement(&status, target->concepts, cell->concepts, "CELL.X0");
+                psMetadataItemSupplement(&status, target->concepts, cell->concepts, "CELL.Y0");
+            }
+            if (!pmFPAfileClose(skycell, view)) {
+                psError(psErrorCodeLast(), false, "failed CLOSE at CHIP %s", skycell->name);
+                psFree (view);
+                return false;
+            }
+        }
+        if (!pmFPAfileClose(skycell, view)) {
+            psError(psErrorCodeLast(), false, "failed CLOSE at FPA %s", skycell->name);
+            psFree (view);
+            return false;
+        }
+        psFree(view);
     }
 
-    // XXX this is not a sufficient test
+    // the section below converts the header astrometry info (in skycell) to the pmFPA
+    // astrometry structures, saving them on the output fpa structure.
+
+    // XXX this block should be modified to loop over all chips
+
+    pmFPAview *view = pmFPAviewAlloc (0);
     view->chip = 0;
     view->cell = 0;