Changeset 12523 for trunk/pswarp/src/pswarpDefine.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/pswarpDefine.c (modified) (2 diffs)

trunk/pswarp/src/pswarpDefine.c

@@ -4 +4 @@
 bool pswarpDefine (pmConfig *config) {
 
-    bool status;
-    psMetadata *recipe = NULL;
-
-    // load the pixel scale from the PSASTRO recipe
-    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; 
-    } 
-
     // load the PSWARP recipe
-    recipe  = psMetadataLookupPtr (NULL, config->recipes, PSWARP_RECIPE);
+    psMetadata *recipe = psMetadataLookupPtr (NULL, config->recipes, PSWARP_RECIPE);
     if (!recipe) {
         psError(PSWARP_ERR_CONFIG, true, "Can't find PSWARP recipe!\n");
@@ -46 +30 @@
     bool bilevelAstrometry = false;
     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 (skycell->fpa, phu->header, pixelScale);
-      pmAstromReadBilevelChip (chip, hdu->header); 
+        pmAstromReadBilevelMosaic (skycell->fpa, phu->header);
+        pmAstromReadBilevelChip (chip, hdu->header); 
     } else {
-      pmAstromReadWCS (skycell->fpa, chip, hdu->header, pixelScale);
+        // we use a default FPA pixel scale of 1.0
+        pmAstromReadWCS (skycell->fpa, chip, hdu->header, 1.0);
     }