Changeset 12523 for trunk/pswarp/src/pswarpDataLoad.c

Timestamp:

Mar 21, 2007, 12:09:22 PM (19 years ago)

Author:

eugene

Message:

fpa field is now determined by the header and/or the chip regions; pixel scale is not needed for readBilevelMosaic, etc; fixed trimsec errors on input/output; fixed errors on map boundaries

File:

• trunk/pswarp/src/pswarpDataLoad.c (modified) (3 diffs)

trunk/pswarp/src/pswarpDataLoad.c

@@ -9 +9 @@
 bool pswarpDataLoad (pmConfig *config) {
 
-    bool status;
     pmChip *chip;
     pmCell *cell;
     pmReadout *readout;
     pmFPAview *view;
-
-    // select the current recipe
-    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, PSASTRO_RECIPE);
-    if (!recipe) {
-        psError(PSWARP_ERR_CONFIG, false, "Can't find PSASTRO recipe needed for pixel scale!\n");
-        return false;
-    }
-
-    // physical pixel scale in microns per pixel
-    double pixelScale = psMetadataLookupF32 (&status, recipe, "PSASTRO.PIXEL.SCALE");
-    if (!status) {
-        psError(PS_ERR_IO, false, "Failed to lookup pixel scale"); 
-        return false; 
-    } 
 
     // select the input data sources
@@ -61 +46 @@
     view = pmFPAviewAlloc (0);
 
+    // XXX need to read only the headers for the skycell
+    // XXX these pmAstromReadBilevel functions seem to be broken
+
     // find the FPA phu
-    // XXX wrap the test below into a function
-    // XXX need to read only the headers for the skycell
-    // XXX need to optionally load the astrometry datafile
     bool bilevelAstrometry = false;
     pmHDU *phu = pmFPAviewThisPHU (view, astrom->fpa);
     if (phu) {
-      char *ctype = psMetadataLookupStr (NULL, phu->header, "CTYPE1");
-      if (ctype) {
-        bilevelAstrometry = !strcmp (&ctype[4], "-DIS");
-      }
+        char *ctype = psMetadataLookupStr (NULL, phu->header, "CTYPE1");
+        if (ctype) {
+            bilevelAstrometry = !strcmp (&ctype[4], "-DIS");
+        }
     }
     if (bilevelAstrometry) {
-      pmAstromReadBilevelMosaic (input->fpa, phu->header, pixelScale);
+        pmAstromReadBilevelMosaic (input->fpa, phu->header);
     } 
 
@@ -88 +73 @@
         pmHDU *hdu = pmFPAviewThisHDU (view, astrom->fpa);
         if (bilevelAstrometry) {
-          pmAstromReadBilevelChip (chip, hdu->header); 
+            pmAstromReadBilevelChip (chip, hdu->header); 
         } else {
-          pmAstromReadWCS (input->fpa, chip, hdu->header, pixelScale);
+            // we use a default FPA pixel scale of 1.0
+            pmAstromReadWCS (input->fpa, chip, hdu->header, 1.0);
         }