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

Timestamp:

May 7, 2013, 12:01:01 PM (13 years ago)

Author:

eugene

Message:

pswarp can now take an input.mdc file with multiple input images listed to generate a warp for a collection

File:

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

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

@@ -14 +14 @@
 bool pswarpDefineLayout (pmConfig *config) {
 
-    // place input astrometry transformations in 'input'
-    pmFPAfile *input = psMetadataLookupPtr(NULL, config->files, "PSWARP.INPUT");
-    if (!input) {
-        psError(PSWARP_ERR_CONFIG, false, "Can't find input data!\n");
-        return false;
-    }
-    // input astrometry may be embedded in 'input' or supplied separately
-    pmFPAfile *astrom = psMetadataLookupPtr(NULL, config->files, "PSWARP.ASTROM");
-    if (!astrom) {
-        astrom = input;
-    }
-    if (!pswarpLoadAstrometry (input, astrom, config)) {
-        psError(PSWARP_ERR_CONFIG, false, "problem loading input astrometry\n");
-        return false;
-    }
-
-    pmFPAfile *output = psMetadataLookupPtr(NULL, config->files, "PSWARP.OUTPUT");
+    bool status = false;
+
+    pmFPAfile *output = psMetadataLookupPtr(&status, config->files, "PSWARP.OUTPUT");
     if (!output) {
         psError(PSWARP_ERR_CONFIG, false, "Can't find output data!\n");
@@ -36 +22 @@
     }
     // select the input data sources
-    pmFPAfile *skycell = psMetadataLookupPtr (NULL, config->files, "PSWARP.SKYCELL");
+    pmFPAfile *skycell = psMetadataLookupPtr (&status, config->files, "PSWARP.SKYCELL");
     if (!skycell) {
         psError(PSWARP_ERR_CONFIG, false, "Can't find skycell data!\n");
@@ -46 +32 @@
     }
 
-    // given the input data, determine which output elements should be generated
-    // and generate the appropriate images
-
-    // find the R,D center for the skycell, use for common projection
-    psProjection *frame = pswarpLocalFrame (skycell->fpa);
-
-    // generate Lmin,max, Mmin,max for both datasets
-    pswarpBounds *srcBounds = pswarpMakeBounds (input->fpa, frame);
-    pswarpBounds *tgtBounds = pswarpMakeBounds (skycell->fpa, frame);
-
-    // find the output (tgt) chips which overlap the input (src) chips
-    pswarpFindOverlap (input->fpa, output->fpa, srcBounds, tgtBounds);
+    // chips are not processed unless we have determined they overlap the inputs
+    pmFPAExcludeChips (output->fpa);
+
+    int nInputs = psMetadataLookupS32(&status, config->arguments, "NUM_INPUTS");
+    if (!status) {
+        psError(PSWARP_ERR_DATA, true, "number of inputs is not defined (programming error)");
+        return false;
+    }
+
+    for (int i = 0; i < nInputs; i++) {
+        // place input astrometry transformations in 'input'
+        pmFPAfile *input = pmFPAfileSelectSingle(config->files, "PSWARP.INPUT", i);
+        if (!input) {
+            psError(PSWARP_ERR_CONFIG, false, "Can't find input data!\n");
+            return false;
+        }
+
+        // input astrometry may be embedded in 'input' or supplied separately
+        pmFPAfile *astrom = pmFPAfileSelectSingle(config->files, "PSWARP.ASTROM", i);
+        if (!astrom) {
+            astrom = input;
+        }
+        if (!pswarpLoadAstrometry (input, astrom, config)) {
+            psError(PSWARP_ERR_CONFIG, false, "problem loading input astrometry\n");
+            return false;
+        }
+
+        // given the input data, determine which output elements should be generated
+        // and generate the appropriate images
+
+        // find the R,D center for the skycell, use for common projection
+        psProjection *frame = pswarpLocalFrame (skycell->fpa);
+
+        // generate Lmin,max, Mmin,max for both datasets
+        pswarpBounds *srcBounds = pswarpMakeBounds (input->fpa, frame);
+        pswarpBounds *tgtBounds = pswarpMakeBounds (skycell->fpa, frame);
+
+        // find the output (tgt) chips which overlap the input (src) chips
+        pswarpFindOverlap (input->fpa, output->fpa, srcBounds, tgtBounds);
+        psFree (srcBounds);
+        psFree (tgtBounds);
+    }
 
     // The loop below generates the output pixels. XXX Should this be deferred until we
@@ -86 +102 @@
                 return false;
             }
-            int numCols = psMetadataLookupS32(NULL, hdu->header, "NAXIS1"); ///< Number of columns
-            int numRows = psMetadataLookupS32(NULL, hdu->header, "NAXIS2"); ///< Number of rows
+            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);
@@ -97 +113 @@
             pmReadout *readout = pmReadoutAlloc(cell); ///< output readout
             readout->image = psImageAlloc(numCols, numRows, PS_TYPE_F32);
+
             psImageInit(readout->image, NAN);
             psFree(readout);                // Drop reference
@@ -129 +146 @@
 # include "pswarpFileNames.h"
 
+static int Nout = 0;
+
 // XX function for tests
 bool pswarpDumpOutput (pmConfig *config) {
@@ -144 +163 @@
     pmFPAfileActivate(config->files, true, "PSWARP.OUTPUT");
 
+    pmFPAview *view = pmFPAviewAlloc(0);
+
     pmChip *chip;
-    pmFPAview *view = pmFPAviewAlloc(0);
-    if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
-        psError(psErrorCodeLast(), false, "Unable to read files.");
-        goto DONE;
-    }
     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 (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
-            psError(psErrorCodeLast(), false, "Unable to read files.");
-            goto DONE;
-        }
+
         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 (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE) ||
-                !pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
-                psError(psErrorCodeLast(), false, "Unable to read files.");
-                goto DONE;
+
+            // 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 ++;
+                
+                psphotSaveImage (NULL, readout->image, name);
             }
         }