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

Timestamp:

May 8, 2013, 4:41:42 PM (13 years ago)

Author:

eugene

Message:

warping of background model appears to work

File:

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

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

@@ -11 +11 @@
 # include "pswarp.h"
 
+bool pswarpGenerateOutputCell (pmChip *chip, pmCell *cell, pmCell *refcell, float xBin, float yBin);
+
 // load the astrometry header info and generate the tranformations 
 bool pswarpDefineLayout (pmConfig *config) {
@@ -31 +33 @@
         return false;
     }
+
+    // if a background model is supplied and the output is requested, then 
+    // this will exist.  if not, skip related features 
+    pmFPAfile *bkgModel = psMetadataLookupPtr(&status, config->files, "PSWARP.OUTPUT.BKGMODEL");
 
     // chips are not processed unless we have determined they overlap the inputs
@@ -54 +60 @@
             astrom = input;
         }
+        if (astrom->camera != input->camera) {
+            // XXX this may cause an error for output / skycell
+            psError(PSWARP_ERR_DATA, true, "Input camera and astrometry camera do not match.");
+            return false;
+        }
         if (!pswarpLoadAstrometry (input, astrom, config)) {
             psError(PSWARP_ERR_CONFIG, false, "problem loading input astrometry\n");
@@ -81 +92 @@
     pmFPAview *view = pmFPAviewAlloc(0);
 
+    // check input astrometry mode
+    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
+    // the only explanation I have is that 1) I need to have the binning factors for the input image, but 
+    // 2) at this point I don't yet have the input background models loaded and 3) the source
+    // for the binning factor of the input and output background models is different
+    // (header->CCDSUMi for input, recipe / pmFPAfile.xbin.ybin for the other)
+
+    // 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);
+        }
+    }
 
     pmChip *chip;
@@ -95 +128 @@
             pmCell *refcell = pmFPAviewThisCell(view, skycell->fpa); ///< Target cell
 
-            // we've got the output astrom header
-            pmHDU *hdu = pmHDUFromCell(refcell); ///< HDU for source
-            if (!hdu || !hdu->header) {
-                psError(PM_ERR_PROG, false, "Unable to find header for sky cell.");
+            if (!pswarpGenerateOutputCell (chip, cell, refcell, output->xBin, output->yBin)){
+                psError(PSWARP_ERR_DATA, false, "failed to generate output cell");
                 psFree(view);
                 return false;
             }
-            int numCols = psMetadataLookupS32(&status, hdu->header, "NAXIS1"); ///< Number of columns
-            int numRows = psMetadataLookupS32(&status, 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;
+
+            if (bkgModel) {
+                pmChip *bkgChip = pmFPAviewThisChip(view, bkgModel->fpa); ///< Target cell
+                pmCell *bkgCell = pmFPAviewThisCell(view, bkgModel->fpa); ///< Target cell
+                if (!pswarpGenerateOutputCell (bkgChip, bkgCell, refcell, bkgModel->xBin, bkgModel->yBin)) {
+                    psError(PSWARP_ERR_DATA, false, "failed to generate output cell");
+                    psFree(view);
+                    return false;
+                }
+                if (!pswarpModifyChipAstrom (config, view, bkgChip, skycell, bilevelAstrometry, bkgModel->xBin, bkgModel->yBin)) {
+                    psError(PSWARP_ERR_DATA, false, "problem with output astrometry");
+                    psFree(view);
+                    return false;
+                }
             }
-                
-            // generate the pixels for output->fpa
-            pmReadout *readout = pmReadoutAlloc(cell); ///< output readout
-            readout->image = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-
-            psImageInit(readout->image, NAN);
-            psFree(readout);                // Drop reference
-                
-            // copy the image concepts from the skycell 
-            bool status = false;
-            psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.XBIN");
-            psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.YBIN");
-            psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.XSIZE");
-            psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.YSIZE");
-            psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.XPARITY");
-            psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.YPARITY");
-            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;
-
-            // 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);
         }
     }
@@ -143 +154 @@
 }
 
-// Lists of file rules used at different stages
-# include "pswarpFileNames.h"
-
-static int Nout = 0;
-
-// XX function for tests
-bool pswarpDumpOutput (pmConfig *config) {
-
-    pmFPAfile *output = psMetadataLookupPtr(NULL, config->files, "PSWARP.OUTPUT");
-    if (!output) {
-        psError(PSWARP_ERR_CONFIG, false, "Can't find output data!\n");
-        return false;
-    }
-
-    pswarpFileActivation(config, detectorFiles, false);
-    pswarpFileActivation(config, photFiles, false);
-    pswarpFileActivation(config, independentFiles, false);
-    pswarpFileActivation(config, skycellFiles, false);
-    pmFPAfileActivate(config->files, true, "PSWARP.OUTPUT");
-
-    pmFPAview *view = pmFPAviewAlloc(0);
-
-    pmChip *chip;
-    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; }
-
-        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; }
-
-            // process each of the readouts
-            pmReadout *readout;
-            while ((readout = pmFPAviewNextReadout(view, output->fpa, 1)) != NULL) {
-                if (!readout->data_exists) {
-                    continue;
-                }
-
-                char name[64];
-                snprintf (name, 64, "dumpwarp.%02d.fits", Nout);
-                Nout ++;
+bool pswarpGenerateOutputCell (pmChip *chip, pmCell *cell, pmCell *refcell, float xBin, float yBin) {
+
+    bool status = false;
+
+    // we've got the output astrom header
+    pmHDU *hdu = pmHDUFromCell(refcell); ///< HDU for source
+    if (!hdu || !hdu->header) {
+        psError(PM_ERR_PROG, false, "Unable to find header for sky cell.");
+        return false;
+    }
+    int numCols = psMetadataLookupS32(&status, hdu->header, "NAXIS1") / xBin; ///< Number of output columns
+    int numRows = psMetadataLookupS32(&status, hdu->header, "NAXIS2") / yBin; ///< Number of output rows
+    if ((numCols == 0) || (numRows == 0)) {
+        psError(PSWARP_ERR_DATA, false, "output cell has invalid dimensions %d x %d", numCols, numRows);
+        return false;
+    }
                 
-                psphotSaveImage (NULL, readout->image, name);
-            }
-        }
-        if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
-            psError(psErrorCodeLast(), false, "Unable to write files.");
-            goto DONE;
-        }
-    }
-    if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
-        psError(psErrorCodeLast(), false, "Unable to write files.");
-        goto DONE;
-    }
-    psFree(view);
-
-DONE:
-
-    pswarpFileActivation(config, detectorFiles, true);
-    pmFPAfileActivate(config->files, false, "PSWARP.ASTROM");
+    // generate the pixels for output->fpa
+    pmReadout *readout = pmReadoutAlloc(cell); ///< output readout
+    readout->image = psImageAlloc(numCols, numRows, PS_TYPE_F32);
+
+    psImageInit(readout->image, NAN);
+    psFree(readout);                // Drop reference
+                
+    // copy the image concepts from the skycell 
+    psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.XBIN");
+    psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.YBIN");
+    psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.XSIZE");
+    psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.YSIZE");
+    psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.XPARITY");
+    psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.YPARITY");
+    psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.X0");
+    psMetadataItemSupplement(&status, cell->concepts, refcell->concepts, "CELL.Y0");
+
+    chip->data_exists = true;
+    chip->file_exists = true;
+    chip->process     = true;
+
+    cell->data_exists = true;
+    cell->file_exists = true;
+    cell->process     = true;
+
+    // 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);
     return true;
-}    
-
+}