Changeset 12536 for trunk/psastro/src/psastroMosaicAstrom.c

Timestamp:

Mar 21, 2007, 9:30:37 PM (19 years ago)

Author:

eugene

Message:

update to new psAstromWCS APIs; drop old files, old functions from psastroUtils.c

File:

• trunk/psastro/src/psastroMosaicAstrom.c (modified) (3 diffs)

trunk/psastro/src/psastroMosaicAstrom.c

@@ -4 +4 @@
 // XXX require this fpa to have multiple chip extensions and a PHU?
 bool psastroMosaicAstrom (pmConfig *config, psArray *refs) {
-
-    bool status;
 
     // select the current recipe
@@ -13 +11 @@
         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
@@ -101 +92 @@
     if (psTraceGetLevel("psastro.dump") > 0) { psastroDumpMatches (fpa, "match.6.dat"); }
 
-    // save WCS and analysis metadata in update header XXX this is still wrong: the pmFPAExtent
-    // function returns the FP dimensions in pixel units relative to the 0,0 corner of chip
-    // 0,0.  I need to have a function which loops over all cells, determines the pixel
-    // dimensions for each cell, converts them to chip pixels, then uses the fpa astrometry
-    // structures to get the total dimensions of the fpa in fpa units.  equivalent to
-    // pmFPAExtent
-    psRegion *region = pmFPAExtent (fpa);
-    region->x0 *= pixelScale;
-    region->x1 *= pixelScale;
-    region->y0 *= pixelScale;
-    region->y1 *= pixelScale;
-
-    // XXX also need to add DATE/TIME info and NAXIS1, NAXIS2
+    // save WCS and analysis metadata in update header.
     psMetadata *updates = psMetadataAlloc();
-    psMetadataAddS32 (updates, PS_LIST_TAIL, "NAXIS1",   PS_META_REPLACE, "fpa dimensions (mm)", region->x1 - region->x0);
-    psMetadataAddS32 (updates, PS_LIST_TAIL, "NAXIS2",   PS_META_REPLACE, "fpa dimensions (mm)", region->y1 - region->y0);
-    psFree (region);
-    
     if (!pmAstromWriteBilevelMosaic (updates, fpa, NONLIN_TOL)) {
         psAbort ("failed to save header terms");