Changeset 13705 for trunk/pswarp/src/pswarpDefine.c

Timestamp:

Jun 7, 2007, 2:49:27 PM (19 years ago)

Author:

Paul Price

Message:

Updating to use the automatically generated skycell version of the camera. This means that the output file shares the same file rule as the original camera, not the same file rule as the skycell. This in turn means that we don't have to deal with multiple groups of file rules.

File:

• trunk/pswarp/src/pswarpDefine.c (modified) (7 diffs)

trunk/pswarp/src/pswarpDefine.c

@@ -14 +14 @@
     pmFPAfile *skycell = psMetadataLookupPtr (NULL, config->files, "PSWARP.SKYCELL");
     if (!skycell) {
-        psError(PSWARP_ERR_CONFIG, true, "Can't find skycell data!\n");
+        psError(PSWARP_ERR_CONFIG, false, "Can't find skycell data!\n");
+        return false;
+    }
+    pmFPAfile *output = psMetadataLookupPtr(NULL, config->files, "PSWARP.OUTPUT");
+    if (!output) {
+        psError(PSWARP_ERR_CONFIG, false, "Can't find output data!\n");
+        return false;
+    }
+    pmFPAfile *input = psMetadataLookupPtr(NULL, config->files, "PSWARP.INPUT");
+    if (!input) {
+        psError(PSWARP_ERR_CONFIG, false, "Can't find input data!\n");
         return false;
     }
@@ -24 +34 @@
     // Read header and create target
     {
-        pmFPAReadHeaderSet(skycell->fpa, skycell->fits, config->database);
+        if (!pmFPAReadHeaderSet(skycell->fpa, skycell->fits, config->database)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to read headers for skycell.");
+            psFree(view);
+            return false;
+        }
         view->chip = 0;
         view->cell = 0;
@@ -32 +46 @@
         if (!hdu || !hdu->header) {
             psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find header for sky cell.");
+            psFree(view);
             return false;
         }
@@ -37 +52 @@
         int numRows = psMetadataLookupS32(NULL, hdu->header, "NAXIS2"); // Number of rows
 
-        pmCell *target = pmFPAfileThisCell(config->files, view, "PSWARP.OUTPUT"); // Target cell
+        pmCell *target = pmFPAviewThisCell(view, output->fpa); // Target cell
         pmReadout *readout = pmReadoutAlloc(target); // Target readout
         readout->image = psImageAlloc(numCols, numRows, PS_TYPE_F32);
@@ -54 +69 @@
     // XXX this is not a sufficient test
     view->chip = 0;
-    pmChip *chip = pmFPAviewThisChip (view, skycell->fpa);
-    pmHDU *phu = pmFPAviewThisPHU (view, skycell->fpa);
-    pmHDU *hdu = pmFPAviewThisHDU (view, skycell->fpa);
+    view->cell = 0;
+    view->readout = -1;
+    pmHDU *phu = pmFPAviewThisPHU(view, skycell->fpa); // Skycell PHU
+    pmHDU *hdu = pmFPAviewThisHDU(view, skycell->fpa); // Skycell header
     bool bilevelAstrometry = false;
     if (phu) {
-        char *ctype = psMetadataLookupStr (NULL, phu->header, "CTYPE1");
+        char *ctype = psMetadataLookupStr(NULL, phu->header, "CTYPE1");
         if (ctype) {
-            bilevelAstrometry = !strcmp (&ctype[4], "-DIS");
+            bilevelAstrometry = !strcmp(&ctype[4], "-DIS");
         }
     }
+
+    // We read from the skycell into the output.  i.e., the output receives the desired astrometry.
+    pmChip *outputChip = pmFPAviewThisChip(view, output->fpa); // Chip in the output
     if (bilevelAstrometry) {
-        if (!pmAstromReadBilevelMosaic (skycell->fpa, phu->header)) {
+        if (!pmAstromReadBilevelMosaic(output->fpa, phu->header)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to read bilevel mosaic astrometry for skycell.");
             psFree(view);
             return false;
         }
-        if (!pmAstromReadBilevelChip (chip, hdu->header)) {
+        if (!pmAstromReadBilevelChip(outputChip, hdu->header)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to read bilevel chip astrometry for skycell.");
             psFree(view);
@@ -77 +96 @@
     } else {
         // we use a default FPA pixel scale of 1.0
-        if (!pmAstromReadWCS (skycell->fpa, chip, hdu->header, 1.0)) {
+        if (!pmAstromReadWCS(output->fpa, outputChip, hdu->header, 1.0)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to read WCS astrometry for skycell.");
             psFree(view);
@@ -84 +103 @@
     }
 
-    // construct the output fpa here
-    pmFPAfile *output = psMetadataLookupPtr (NULL, config->files, "PSWARP.OUTPUT");
-    if (!output) {
-        psError(PSWARP_ERR_CONFIG, true, "Can't find output data!\n");
-        return false;
-    }
+    const char *name = psMetadataLookupStr(NULL, input->fpa->concepts, "FPA.NAME"); // Name of FPA
+    view->chip = view->cell = view->readout = -1;
+    pmFPAAddSourceFromView(output->fpa, name, view, output->format);
 
     psFree (view);